r7065: Move ejs from web_server to lib so it can be shared with smbscript.
authorTim Potter <tpot@samba.org>
Sun, 29 May 2005 03:53:36 +0000 (03:53 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 18:17:11 +0000 (13:17 -0500)
17 files changed:
source/build/smb_build/main.pm
source/lib/ejs/config.h [moved from source/web_server/ejs/config.h with 100% similarity]
source/lib/ejs/config.mk [new file with mode: 0644]
source/lib/ejs/ejs.c [moved from source/web_server/ejs/ejs.c with 99% similarity]
source/lib/ejs/ejs.h [moved from source/web_server/ejs/ejs.h with 98% similarity]
source/lib/ejs/ejsInternal.h [moved from source/web_server/ejs/ejsInternal.h with 99% similarity]
source/lib/ejs/ejsLex.c [moved from source/web_server/ejs/ejsLex.c with 99% similarity]
source/lib/ejs/ejsParser.c [moved from source/web_server/ejs/ejsParser.c with 99% similarity]
source/lib/ejs/ejsProcs.c [moved from source/web_server/ejs/ejsProcs.c with 99% similarity]
source/lib/ejs/miniMpr.c [moved from source/web_server/ejs/miniMpr.c with 99% similarity]
source/lib/ejs/miniMpr.h [moved from source/web_server/ejs/miniMpr.h with 100% similarity]
source/lib/ejs/mprOs.h [moved from source/web_server/ejs/mprOs.h with 99% similarity]
source/lib/ejs/var.c [moved from source/web_server/ejs/var.c with 99% similarity]
source/lib/ejs/var.h [moved from source/web_server/ejs/var.h with 99% similarity]
source/scripting/ejs/smbscript.c
source/web_server/config.mk
source/web_server/esp/esp.h

index 758346b4217191e2ae904cbded37f1238eb261da..98cf9bed6d9fa54d45c5a1607c7fcd390c6a155a 100644 (file)
@@ -37,6 +37,7 @@ sub smb_build_main($)
                "lib/popt/config.mk",
                "lib/cmdline/config.mk",
                "lib/socket_wrapper/config.mk",
+               "lib/ejs/config.mk",
                "param/config.mk",
                "smb_server/config.mk",
                "rpc_server/config.mk",
diff --git a/source/lib/ejs/config.mk b/source/lib/ejs/config.mk
new file mode 100644 (file)
index 0000000..2d436cb
--- /dev/null
@@ -0,0 +1,13 @@
+#######################
+# Start SUBSYSTEM EJS
+[SUBSYSTEM::EJS]
+ADD_OBJ_FILES = \
+               lib/ejs/ejs.o  \
+               lib/ejs/ejsLex.o \
+               lib/ejs/ejsParser.o \
+               lib/ejs/ejsProcs.o \
+               lib/ejs/miniMpr.o \
+               lib/ejs/var.o
+NOPROTO=YES
+# End SUBSYSTEM EJS
+#######################
similarity index 99%
rename from source/web_server/ejs/ejs.c
rename to source/lib/ejs/ejs.c
index 49bb9a6649b2df479272984c69587da0b9bde6c3..41af795370c284e055c498f1a925aed99a5fbe5b 100644 (file)
@@ -35,7 +35,7 @@
  */
 /********************************** Includes **********************************/
 
-#include "web_server/ejs/ejsInternal.h"
+#include "lib/ejs/ejsInternal.h"
 
 #if BLD_FEATURE_EJS
 
similarity index 98%
rename from source/web_server/ejs/ejs.h
rename to source/lib/ejs/ejs.h
index 987810ad064d4b4adcc4132d271d80be13ac860e..79216d4712bbd9bcf995bac54a41d08552561dcf 100644 (file)
@@ -44,8 +44,8 @@
 #ifndef _h_EJS
 #define _h_EJS 1
 
-#include       "web_server/ejs/miniMpr.h"
-#include       "web_server/ejs/var.h"
+#include       "lib/ejs/miniMpr.h"
+#include       "lib/ejs/var.h"
 
 #ifdef __cplusplus
 extern "C" {
similarity index 99%
rename from source/web_server/ejs/ejsInternal.h
rename to source/lib/ejs/ejsInternal.h
index d5d57608120a9eef08f03f2902e68ea8fe4dbddf..4d54c4e8c61eca4e25825dcb8ec7f19465909f74 100644 (file)
@@ -39,7 +39,7 @@
 #ifndef _h_EJS_INTERNAL
 #define _h_EJS_INTERNAL 1
 
-#include               "web_server/ejs/ejs.h"
+#include               "lib/ejs/ejs.h"
 
 /********************************** Defines ***********************************/
 
similarity index 99%
rename from source/web_server/ejs/ejsLex.c
rename to source/lib/ejs/ejsLex.c
index 24e48d5ac36909051ac7b9e321bb6aa36e1e80a0..b0d6483c2adff0a986e7831c59e785090bf7b81d 100644 (file)
@@ -36,7 +36,7 @@
  */
 /********************************** Includes **********************************/
 
-#include       "web_server/ejs/ejsInternal.h"
+#include       "lib/ejs/ejsInternal.h"
 
 #if BLD_FEATURE_EJS
 
similarity index 99%
rename from source/web_server/ejs/ejsParser.c
rename to source/lib/ejs/ejsParser.c
index a7d27fb0c9c7c7a8f7018eb495ba7704e5a3379f..f9335ec0044ccb4a09e44048b7e27a203413e31e 100644 (file)
@@ -35,7 +35,7 @@
 
 /********************************** Includes **********************************/
 
-#include       "web_server/ejs/ejsInternal.h"
+#include       "lib/ejs/ejsInternal.h"
 
 #if BLD_FEATURE_EJS
 
similarity index 99%
rename from source/web_server/ejs/ejsProcs.c
rename to source/lib/ejs/ejsProcs.c
index 163835ed6eb1b3767a1b6ac1e1ff36a96e730851..39df18ef9461d02554161b7c4b042c052a80d7c6 100644 (file)
@@ -34,7 +34,7 @@
  */
 /********************************** Includes **********************************/
 
-#include       "web_server/ejs/ejsInternal.h"
+#include       "lib/ejs/ejsInternal.h"
 
 #if BLD_FEATURE_EJS
 
similarity index 99%
rename from source/web_server/ejs/miniMpr.c
rename to source/lib/ejs/miniMpr.c
index 311f2defebd35c824c39da171232b5757bd905b2..2c6f7bea501b0cf550d2ec4b2829d741ad110df8 100644 (file)
@@ -29,7 +29,7 @@
  *     @end
  */
 
-#include       "web_server/ejs/miniMpr.h"
+#include       "lib/ejs/miniMpr.h"
 
 /************************************ Code ************************************/
 #if !BLD_APPWEB
similarity index 99%
rename from source/web_server/ejs/mprOs.h
rename to source/lib/ejs/mprOs.h
index 5a88f4f8af712b45c63d32221260b9db0080490f..c88a3e3c438321a22ee4c84e26b7950dfefa6233 100644 (file)
@@ -42,7 +42,7 @@ blah blah;
 #ifndef _h_MPR_OS_HDRS
 #define _h_MPR_OS_HDRS 1
 
-#include       "web_server/ejs/config.h"
+#include       "lib/ejs/config.h"
 
 ////////////////////////////////// CPU Families ////////////////////////////////
 //
similarity index 99%
rename from source/web_server/ejs/var.c
rename to source/lib/ejs/var.c
index ca8eb0fb2aca1885e42fce4e99f71faab0b028c5..5df306797d9e64de91aeed5fdd9b0e7f8c84f939 100644 (file)
@@ -44,7 +44,7 @@
 
 /********************************** Includes **********************************/
 
-#include       "web_server/ejs/var.h"
+#include       "lib/ejs/var.h"
 
 /*********************************** Locals ***********************************/
 #if VAR_DEBUG
similarity index 99%
rename from source/web_server/ejs/var.h
rename to source/lib/ejs/var.h
index 2e8fdf6b58d18125be0d0edba60f6b37ce27cd30..1f9ab65aa7fcdc970fb59bfc684bf6e1eb2d39c8 100644 (file)
@@ -56,7 +56,7 @@
 
 /********************************* Includes ***********************************/
 
-#include       "web_server/ejs/miniMpr.h"
+#include       "lib/ejs/miniMpr.h"
 
 /********************************** Defines ***********************************/
 
index 1c823a4d8edaeb1848df2d61a93a6f40825891c4..f1ff03ae49430780f9ea068e6628bcf1325dc31f 100644 (file)
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "web_server/ejs/ejs.h"
+#include "lib/ejs/ejs.h"
 
 void http_exception(const char *reason)
 {
index bcb5bea0fff4582043e3b048d3a15079ace3dc99..00f29101b2055256593493b001bbd9f04b66331b 100644 (file)
@@ -1,19 +1,5 @@
 # web server subsystem
 
-#######################
-# Start SUBSYSTEM EJS
-[SUBSYSTEM::EJS]
-ADD_OBJ_FILES = \
-               web_server/ejs/ejs.o  \
-               web_server/ejs/ejsLex.o \
-               web_server/ejs/ejsParser.o \
-               web_server/ejs/ejsProcs.o \
-               web_server/ejs/miniMpr.o \
-               web_server/ejs/var.o
-NOPROTO=YES
-# End SUBSYSTEM EJS
-#######################
-
 #######################
 # Start SUBSYSTEM ESP
 [SUBSYSTEM::ESP]
index ff4210befa6fa3c48cbe3a2a850b80da073124b9..886174dce890e835b05907bf531f9724b0af71ba 100644 (file)
 #ifndef _h_ESP_h
 #define _h_ESP_h 1
 
-#include       "web_server/ejs/ejs.h"
+#include       "lib/ejs/ejs.h"
 #include       "web_server/esp/espEnv.h"
-#include       "web_server/ejs/var.h"
-#include       "web_server/ejs/miniMpr.h"
+#include       "lib/ejs/var.h"
+#include       "lib/ejs/miniMpr.h"
 
 /*********************************** Defines **********************************/