Remove remaining JavaScript code.

diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 8b1cec46b38da5e1109ce7b490ea4ecfb3156cbb..8ace68fdb2aa45c79542a308d67256d4cc6c6f34 100644 (file)
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -743,7 +743,6 @@ python_dcerpc_security_OBJ_FILES = $(gen_ndrsrcdir)/py_security.o
 $(IDL_HEADER_FILES) $(IDL_NDR_PARSE_H_FILES) $(IDL_NDR_PARSE_C_FILES) \
        $(IDL_NDR_CLIENT_C_FILES) $(IDL_NDR_CLIENT_H_FILES) \
        $(IDL_NDR_SERVER_C_FILES) $(IDL_SWIG_FILES) \
-       $(IDL_NDR_EJS_C_FILES) $(IDL_NDR_EJS_H_FILES) \
        $(IDL_NDR_PY_C_FILES) $(IDL_NDR_PY_H_FILES): idl
 
 idl_full:: $(pidldir)/lib/Parse/Pidl/IDL.pm $(pidldir)/lib/Parse/Pidl/Expr.pm 

diff --git a/source4/scripting/libjs/base.js b/source4/scripting/libjs/base.js
deleted file mode 100644 (file)
index 790dfeb..0000000
--- a/source4/scripting/libjs/base.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-       base js library functions
-       Copyright Andrew Tridgell 2005
-       released under the GNU GPL version 3 or later
-*/
-
-if (global["HAVE_BASE_JS"] != undefined) {
-   return;
-}
-HAVE_BASE_JS=1
-
-/* bring the string functions into the global frame */
-string_init(global);
-
-/*
-  an essential function!
-*/
-function printf()
-{
-       print(vsprintf(arguments));
-}
-
-/*
-  substitute strings of the form ${NAME} in str, replacing
-  with substitutions from subobj
-*/
-function substitute_var(str, subobj)
-{
-       var list = split("${", str);
-       var i;
-       for (i=1;i<list.length;i++) {
-               var list2 = split("}", list[i], 1);
-               if ((list2.length < 2) && (list2[0] + "}" != list[i])) {
-                       return undefined;
-               }
-               var key = list2[0];
-               var val;
-               if (typeof(subobj[key]) == "undefined") {
-                       val = "${" + key + "}";
-               } else if (typeof(subobj[key]) == "string") {
-                       val = subobj[key];
-               } else {
-                       var fn = subobj[key];
-                       val = fn(key);
-               }
-               list2[0] = "" + val;
-               list[i] = join("", list2);
-       }
-       return join("", list);
-}

diff --git a/testprogs/ejs/bugs.js b/testprogs/ejs/bugs.js
deleted file mode 100644 (file)
index 0c1cecb..0000000
--- a/testprogs/ejs/bugs.js
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-       demonstrate some bugs in ejs
-
-       tridge <appweb@tridgell.net>
-*/
-
-
-/****************************************
-demo a bug in constructing arrays
-fix at http://build.samba.org/build.pl?function=diff;tree=samba4;revision=7124
-status: FIXED
-*****************************************/
-function arraybug() {
-        var a;
-
-        println("First with 3 elements");
-        a = new Array("one", "two", "three");
-        printVars(a);
-        assert(a.length == 3);
-        assert(a[0] == "one");
-        assert(a[1] == "two");
-        assert(a[2] == "three");
-
-        println("with a array length");
-        a = new Array(5);
-        printVars(a);
-        assert(a.length == 5);
-
-        println("\nNow with 1 element");
-        a = new Array("one");
-        printVars(a);
-        assert(a.length == 1);
-        assert(a[0] == "one");
-
-        println("ALL OK");
-}
-
-
-/****************************************
-demo a bug in variable arguments
-fix at http://build.samba.org/build.pl?function=diff;tree=samba4;revision=7085
-status: FIXED
-*****************************************/
-function argsbug() {
-        println("we should have been called with 3 arguments");
-        assert(arguments.length == 3);
-        assert(arguments[0] == "one");
-        assert(arguments[1] == "two");
-        assert(arguments[2] == "three");
-}
-
-
-/****************************************
-demo a bug in constructing objects
-no fix available yet
-status: SUBMITTED
-*****************************************/
-function MyObj() {
-        var o = new Object();
-        o.test = 42;
-        return o;
-}
-
-function objbug() {
-        println("the docs say you should use 'new'");
-        var o1 = new MyObj();
-        var o2 = MyObj();
-        printVars(o1);
-        printVars(o2);
-        assert(o1.test == 42);
-        assert(o2.test == 42);
-}
-
-/*
- demo a expression handling bug
- status: FIXED
-*/
-function exprbug() {
-       var a = new Array(10);
-       var i;
-       for (i=0;i<4;i++) {
-               a[1+(i*2)] = i;
-               a[2+(i*2)] = i*2;
-       }
-}
-
-/****************************************
-demo lack of recursion
-fix in http://build.samba.org/build.pl?function=diff;tree=samba4;revision=7127
-status: FIXED
-*****************************************/
-function fibonacci(n) {
-       if (n < 3) {
-               return 1;
-       }
-       return fibonacci(n-1) + fibonacci(n-2);
-}
-
-function recursebug() {
-        println("First 10 fibonacci numbers:");
-        for (i=0;i<10;i++) {
-                println("fibonacci(" + i + ")=" + fibonacci(i));
-        }
-}
-
-/****************************************
-demo lack of function variables inside functions
-status: FIXED IN SAMBA
-*****************************************/
-function callback()
-{
-       return "testing";
-}
-
-function fnbug(c)
-{
-       s = c();
-       assert(s == "testing");
-}
-
-/****************************************
-demo incorrect handling of reserved words in strings
-status: SUBMITTED
-*****************************************/
-function reservedbug()
-{
-       assert("funct" + "ion" == 'function');
-}
-
-
-/****************************************
-demo incorrect handling of boolean functions
-status: SUBMITTED
-*****************************************/
-function no()
-{
-       return false;
-}
-
-function boolbug()
-{
-       assert(false == no());
-       assert(!no());
-}
-
-
-/* run the tests */
-arraybug();
-argsbug("one", "two", "three");
-recursebug();
-exprbug();
-fnbug(callback);
-reservedbug();
-boolbug();
-objbug();

diff --git a/testprogs/ejs/sprintf.js b/testprogs/ejs/sprintf.js
deleted file mode 100755 (executable)
index 6ae8605..0000000
--- a/testprogs/ejs/sprintf.js
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env smbscript
-/*
-       test sprintf function
-*/
-
-string_init(local);
-
-function check_result(s, v)
-{
-       if (s != v) {
-               println("expected '" + v + "' but got '" + s + "'");
-       }
-       assert(s == v);
-}
-
-function xprintf()
-{
-       return "XX{" + vsprintf(arguments) + "}XX";
-}
-
-check_result(sprintf("%d", 7), "7");
-check_result(sprintf("%04d", 42), "0042");
-check_result(sprintf("my string=%7.2s", "foo%7"), "my string=     fo");
-check_result(sprintf("blah=0x%*x", 4, 19), "blah=0x  13");
-check_result(sprintf("blah=0x%0*x", 4, 19), "blah=0x0013");
-check_result(sprintf("blah=%.0f", 1032), "blah=1032");
-check_result(sprintf("%4.2f%%", 72.32), "72.32%");
-
-check_result(xprintf("%4.2f%% and %s", 72.32, "foo"),"XX{72.32% and foo}XX");
-
-println("ALL OK");