svn commit: samba r7065 - in branches/SAMBA_4_0/source:
build/smb_build lib lib/ejs scripting/ejs web_server web_server/esp
tpot at samba.org
tpot at samba.org
Sun May 29 03:53:37 GMT 2005
Author: tpot
Date: 2005-05-29 03:53:36 +0000 (Sun, 29 May 2005)
New Revision: 7065
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7065
Log:
Move ejs from web_server to lib so it can be shared with smbscript.
Added:
branches/SAMBA_4_0/source/lib/ejs/
branches/SAMBA_4_0/source/lib/ejs/config.mk
Removed:
branches/SAMBA_4_0/source/web_server/ejs/
Modified:
branches/SAMBA_4_0/source/build/smb_build/main.pm
branches/SAMBA_4_0/source/lib/ejs/ejs.c
branches/SAMBA_4_0/source/lib/ejs/ejs.h
branches/SAMBA_4_0/source/lib/ejs/ejsInternal.h
branches/SAMBA_4_0/source/lib/ejs/ejsLex.c
branches/SAMBA_4_0/source/lib/ejs/ejsParser.c
branches/SAMBA_4_0/source/lib/ejs/ejsProcs.c
branches/SAMBA_4_0/source/lib/ejs/miniMpr.c
branches/SAMBA_4_0/source/lib/ejs/mprOs.h
branches/SAMBA_4_0/source/lib/ejs/var.c
branches/SAMBA_4_0/source/lib/ejs/var.h
branches/SAMBA_4_0/source/scripting/ejs/smbscript.c
branches/SAMBA_4_0/source/web_server/config.mk
branches/SAMBA_4_0/source/web_server/esp/esp.h
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/main.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/main.pm 2005-05-29 03:29:10 UTC (rev 7064)
+++ branches/SAMBA_4_0/source/build/smb_build/main.pm 2005-05-29 03:53:36 UTC (rev 7065)
@@ -37,6 +37,7 @@
"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",
Copied: branches/SAMBA_4_0/source/lib/ejs (from rev 7062, branches/SAMBA_4_0/source/web_server/ejs)
Added: branches/SAMBA_4_0/source/lib/ejs/config.mk
===================================================================
--- branches/SAMBA_4_0/source/web_server/ejs/config.mk 2005-05-29 00:22:34 UTC (rev 7062)
+++ branches/SAMBA_4_0/source/lib/ejs/config.mk 2005-05-29 03:53:36 UTC (rev 7065)
@@ -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
+#######################
Modified: branches/SAMBA_4_0/source/lib/ejs/ejs.c
===================================================================
--- branches/SAMBA_4_0/source/web_server/ejs/ejs.c 2005-05-29 00:22:34 UTC (rev 7062)
+++ branches/SAMBA_4_0/source/lib/ejs/ejs.c 2005-05-29 03:53:36 UTC (rev 7065)
@@ -35,7 +35,7 @@
*/
/********************************** Includes **********************************/
-#include "web_server/ejs/ejsInternal.h"
+#include "lib/ejs/ejsInternal.h"
#if BLD_FEATURE_EJS
Modified: branches/SAMBA_4_0/source/lib/ejs/ejs.h
===================================================================
--- branches/SAMBA_4_0/source/web_server/ejs/ejs.h 2005-05-29 00:22:34 UTC (rev 7062)
+++ branches/SAMBA_4_0/source/lib/ejs/ejs.h 2005-05-29 03:53:36 UTC (rev 7065)
@@ -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" {
Modified: branches/SAMBA_4_0/source/lib/ejs/ejsInternal.h
===================================================================
--- branches/SAMBA_4_0/source/web_server/ejs/ejsInternal.h 2005-05-29 00:22:34 UTC (rev 7062)
+++ branches/SAMBA_4_0/source/lib/ejs/ejsInternal.h 2005-05-29 03:53:36 UTC (rev 7065)
@@ -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 ***********************************/
Modified: branches/SAMBA_4_0/source/lib/ejs/ejsLex.c
===================================================================
--- branches/SAMBA_4_0/source/web_server/ejs/ejsLex.c 2005-05-29 00:22:34 UTC (rev 7062)
+++ branches/SAMBA_4_0/source/lib/ejs/ejsLex.c 2005-05-29 03:53:36 UTC (rev 7065)
@@ -36,7 +36,7 @@
*/
/********************************** Includes **********************************/
-#include "web_server/ejs/ejsInternal.h"
+#include "lib/ejs/ejsInternal.h"
#if BLD_FEATURE_EJS
Modified: branches/SAMBA_4_0/source/lib/ejs/ejsParser.c
===================================================================
--- branches/SAMBA_4_0/source/web_server/ejs/ejsParser.c 2005-05-29 00:22:34 UTC (rev 7062)
+++ branches/SAMBA_4_0/source/lib/ejs/ejsParser.c 2005-05-29 03:53:36 UTC (rev 7065)
@@ -35,7 +35,7 @@
/********************************** Includes **********************************/
-#include "web_server/ejs/ejsInternal.h"
+#include "lib/ejs/ejsInternal.h"
#if BLD_FEATURE_EJS
Modified: branches/SAMBA_4_0/source/lib/ejs/ejsProcs.c
===================================================================
--- branches/SAMBA_4_0/source/web_server/ejs/ejsProcs.c 2005-05-29 00:22:34 UTC (rev 7062)
+++ branches/SAMBA_4_0/source/lib/ejs/ejsProcs.c 2005-05-29 03:53:36 UTC (rev 7065)
@@ -34,7 +34,7 @@
*/
/********************************** Includes **********************************/
-#include "web_server/ejs/ejsInternal.h"
+#include "lib/ejs/ejsInternal.h"
#if BLD_FEATURE_EJS
Modified: branches/SAMBA_4_0/source/lib/ejs/miniMpr.c
===================================================================
--- branches/SAMBA_4_0/source/web_server/ejs/miniMpr.c 2005-05-29 00:22:34 UTC (rev 7062)
+++ branches/SAMBA_4_0/source/lib/ejs/miniMpr.c 2005-05-29 03:53:36 UTC (rev 7065)
@@ -29,7 +29,7 @@
* @end
*/
-#include "web_server/ejs/miniMpr.h"
+#include "lib/ejs/miniMpr.h"
/************************************ Code ************************************/
#if !BLD_APPWEB
Modified: branches/SAMBA_4_0/source/lib/ejs/mprOs.h
===================================================================
--- branches/SAMBA_4_0/source/web_server/ejs/mprOs.h 2005-05-29 00:22:34 UTC (rev 7062)
+++ branches/SAMBA_4_0/source/lib/ejs/mprOs.h 2005-05-29 03:53:36 UTC (rev 7065)
@@ -42,7 +42,7 @@
#ifndef _h_MPR_OS_HDRS
#define _h_MPR_OS_HDRS 1
-#include "web_server/ejs/config.h"
+#include "lib/ejs/config.h"
////////////////////////////////// CPU Families ////////////////////////////////
//
Modified: branches/SAMBA_4_0/source/lib/ejs/var.c
===================================================================
--- branches/SAMBA_4_0/source/web_server/ejs/var.c 2005-05-29 00:22:34 UTC (rev 7062)
+++ branches/SAMBA_4_0/source/lib/ejs/var.c 2005-05-29 03:53:36 UTC (rev 7065)
@@ -44,7 +44,7 @@
/********************************** Includes **********************************/
-#include "web_server/ejs/var.h"
+#include "lib/ejs/var.h"
/*********************************** Locals ***********************************/
#if VAR_DEBUG
Modified: branches/SAMBA_4_0/source/lib/ejs/var.h
===================================================================
--- branches/SAMBA_4_0/source/web_server/ejs/var.h 2005-05-29 00:22:34 UTC (rev 7062)
+++ branches/SAMBA_4_0/source/lib/ejs/var.h 2005-05-29 03:53:36 UTC (rev 7065)
@@ -56,7 +56,7 @@
/********************************* Includes ***********************************/
-#include "web_server/ejs/miniMpr.h"
+#include "lib/ejs/miniMpr.h"
/********************************** Defines ***********************************/
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbscript.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/smbscript.c 2005-05-29 03:29:10 UTC (rev 7064)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbscript.c 2005-05-29 03:53:36 UTC (rev 7065)
@@ -21,7 +21,7 @@
*/
#include "includes.h"
-#include "web_server/ejs/ejs.h"
+#include "lib/ejs/ejs.h"
void http_exception(const char *reason)
{
Modified: branches/SAMBA_4_0/source/web_server/config.mk
===================================================================
--- branches/SAMBA_4_0/source/web_server/config.mk 2005-05-29 03:29:10 UTC (rev 7064)
+++ branches/SAMBA_4_0/source/web_server/config.mk 2005-05-29 03:53:36 UTC (rev 7065)
@@ -1,20 +1,6 @@
# 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]
ADD_OBJ_FILES = \
Modified: branches/SAMBA_4_0/source/web_server/esp/esp.h
===================================================================
--- branches/SAMBA_4_0/source/web_server/esp/esp.h 2005-05-29 03:29:10 UTC (rev 7064)
+++ branches/SAMBA_4_0/source/web_server/esp/esp.h 2005-05-29 03:53:36 UTC (rev 7065)
@@ -36,10 +36,10 @@
#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 **********************************/
More information about the samba-cvs
mailing list