From f9ff72cbda6b4e59448fd79ef9e12f264d48015f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 11 Jul 2005 00:23:57 +0000 Subject: r8298: - started building a library of js routines in scripting/libjs/ - switched the existing test programs over to using the library - added install of js lib (This used to be commit 2a444dedbe44347268affc6458196f93ca7d372b) --- source4/build/smb_build/makefile.pm | 2 +- source4/script/installswat.sh | 7 ++ source4/script/tests/selftest.sh | 1 + source4/scripting/libjs/base.js | 53 +++++++++++ source4/scripting/libjs/samr.js | 170 ++++++++++++++++++++++++++++++++++++ 5 files changed, 232 insertions(+), 1 deletion(-) create mode 100644 source4/scripting/libjs/base.js create mode 100644 source4/scripting/libjs/samr.js (limited to 'source4') diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index a32a93af0a..2edda7408e 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -696,7 +696,7 @@ installdat: installdirs @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(LIBDIR) $(srcdir) installswat: installdirs - @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir) + @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir) $(DESTDIR)$(LIBDIR) installman: installdirs @$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(MANPAGES) diff --git a/source4/script/installswat.sh b/source4/script/installswat.sh index 1d89c2e86c..05245d8f06 100644 --- a/source4/script/installswat.sh +++ b/source4/script/installswat.sh @@ -2,6 +2,7 @@ SWATDIR=$1 SRCDIR=$2 +LIBDIR=$3 echo Installing swat files in $SWATDIR @@ -26,6 +27,12 @@ installdir scripting/*.ejs scripting/*.esp scripting/*.js installdir style/*.css installdir docs/*.js + +echo "Installing js libs" +cd ../source/scripting || exit 1 +mkdir -p $LIBDIR/js +cp libjs/*.js $LIBDIR/js + cat << EOF ====================================================================== The swat files have been installed. diff --git a/source4/script/tests/selftest.sh b/source4/script/tests/selftest.sh index 2993b0590e..5e94ea13e2 100755 --- a/source4/script/tests/selftest.sh +++ b/source4/script/tests/selftest.sh @@ -68,6 +68,7 @@ cat >$CONFFILE<