move NGScripting to recycler, removed dependencies on it

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@55 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/NGScripting/COPYING b/Recycler/NGScripting/COPYING
similarity index 100%
rename from sope-appserver/NGScripting/COPYING
rename to Recycler/NGScripting/COPYING

diff --git a/sope-appserver/NGScripting/ChangeLog b/Recycler/NGScripting/ChangeLog
similarity index 100%
rename from sope-appserver/NGScripting/ChangeLog
rename to Recycler/NGScripting/ChangeLog

diff --git a/sope-appserver/NGScripting/GNUmakefile b/Recycler/NGScripting/GNUmakefile
similarity index 93%
rename from sope-appserver/NGScripting/GNUmakefile
rename to Recycler/NGScripting/GNUmakefile
index 58febd16c8d8b343270eddf49754b0e4dbd85c7e..9e0664a94e0cc9c60edb39e1bab086079b2c91de 100644 (file)
--- a/sope-appserver/NGScripting/GNUmakefile
+++ b/Recycler/NGScripting/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: GNUmakefile 1 2004-08-20 10:08:27Z znek $
 
 include ../common.make
 

diff --git a/sope-appserver/NGScripting/GNUmakefile.preamble b/Recycler/NGScripting/GNUmakefile.preamble
similarity index 93%
rename from sope-appserver/NGScripting/GNUmakefile.preamble
rename to Recycler/NGScripting/GNUmakefile.preamble
index 75c722097c4558b29f12b0fcb5809db2f91a8b4d..e3b628453383b76f263507f640a7f3416a07248e 100644 (file)
--- a/sope-appserver/NGScripting/GNUmakefile.preamble
+++ b/Recycler/NGScripting/GNUmakefile.preamble
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: GNUmakefile.preamble 22 2004-08-20 22:33:46Z helge $
 
 ADDITIONAL_LIB_DIRS += -L$(GNUSTEP_OBJ_DIR)
 

diff --git a/sope-appserver/NGScripting/NGObjectMappingContext.h b/Recycler/NGScripting/NGObjectMappingContext.h
similarity index 96%
rename from sope-appserver/NGScripting/NGObjectMappingContext.h
rename to Recycler/NGScripting/NGObjectMappingContext.h
index 96519641bc78b3d8d2a408066a06f7ab824b5e26..132a6ae44079067cd7ac461850f0619e934ff160 100644 (file)
--- a/sope-appserver/NGScripting/NGObjectMappingContext.h
+++ b/Recycler/NGScripting/NGObjectMappingContext.h
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: NGObjectMappingContext.h 6 2004-08-20 17:57:50Z helge $
 
 #ifndef __NGObjectMappingContext_H__
 #define __NGObjectMappingContext_H__

diff --git a/sope-appserver/NGScripting/NGObjectMappingContext.m b/Recycler/NGScripting/NGObjectMappingContext.m
similarity index 98%
rename from sope-appserver/NGScripting/NGObjectMappingContext.m
rename to Recycler/NGScripting/NGObjectMappingContext.m
index 81f0fb9bbd7b43136ee661529756c087844ba0f9..b85db3cf6ded92cb238ad06d6c4c2af4f188f76f 100644 (file)
--- a/sope-appserver/NGScripting/NGObjectMappingContext.m
+++ b/Recycler/NGScripting/NGObjectMappingContext.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: NGObjectMappingContext.m 6 2004-08-20 17:57:50Z helge $
 
 #include "NGObjectMappingContext.h"
 #include "common.h"

diff --git a/sope-appserver/NGScripting/NGScriptLanguage.h b/Recycler/NGScripting/NGScriptLanguage.h
similarity index 97%
rename from sope-appserver/NGScripting/NGScriptLanguage.h
rename to Recycler/NGScripting/NGScriptLanguage.h
index f11db1ae4d070f0c037772741c7aa7b9471f7774..5910334c5941d9a7ef05439c161b23f674ee1926 100644 (file)
--- a/sope-appserver/NGScripting/NGScriptLanguage.h
+++ b/Recycler/NGScripting/NGScriptLanguage.h
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: NGScriptLanguage.h 6 2004-08-20 17:57:50Z helge $
 
 #ifndef __NGScriptLanguage_H__
 #define __NGScriptLanguage_H__

diff --git a/sope-appserver/NGScripting/NGScriptLanguage.m b/Recycler/NGScripting/NGScriptLanguage.m
similarity index 98%
rename from sope-appserver/NGScripting/NGScriptLanguage.m
rename to Recycler/NGScripting/NGScriptLanguage.m
index 0b708e62de4d1fe47c5d9bc4f70f9a4e8c4564c8..1ee964f5728f0bdf77d69c4b71e3cf1fa5959696 100644 (file)
--- a/sope-appserver/NGScripting/NGScriptLanguage.m
+++ b/Recycler/NGScripting/NGScriptLanguage.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: NGScriptLanguage.m 6 2004-08-20 17:57:50Z helge $
 
 #include "NGScriptLanguage.h"
 #include "NSObject+Scripting.h"

diff --git a/sope-appserver/NGScripting/NGScripting-Info.plist b/Recycler/NGScripting/NGScripting-Info.plist
similarity index 100%
rename from sope-appserver/NGScripting/NGScripting-Info.plist
rename to Recycler/NGScripting/NGScripting-Info.plist

diff --git a/sope-appserver/NGScripting/NSObject+Scripting.h b/Recycler/NGScripting/NSObject+Scripting.h
similarity index 96%
rename from sope-appserver/NGScripting/NSObject+Scripting.h
rename to Recycler/NGScripting/NSObject+Scripting.h
index 0084d37dff82d190fcf6fe136da7607fd34de53e..e1da212268429d1934843add2613e332144dedb3 100644 (file)
--- a/sope-appserver/NGScripting/NSObject+Scripting.h
+++ b/Recycler/NGScripting/NSObject+Scripting.h
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: NSObject+Scripting.h 6 2004-08-20 17:57:50Z helge $
 
 #ifndef __NSObject_Scripting_H__
 #define __NSObject_Scripting_H__

diff --git a/sope-appserver/NGScripting/NSObject+Scripting.m b/Recycler/NGScripting/NSObject+Scripting.m
similarity index 97%
rename from sope-appserver/NGScripting/NSObject+Scripting.m
rename to Recycler/NGScripting/NSObject+Scripting.m
index ac13c131af9170dc70f8702d59a2b6dde86c66ce..436398fc791176132b95c7aeb67dda0c8061a1f8 100644 (file)
--- a/sope-appserver/NGScripting/NSObject+Scripting.m
+++ b/Recycler/NGScripting/NSObject+Scripting.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: NSObject+Scripting.m 6 2004-08-20 17:57:50Z helge $
 
 #include "NGScriptLanguage.h"
 #include "common.h"

diff --git a/Recycler/NGScripting/Version b/Recycler/NGScripting/Version
new file mode 100644 (file)
index 0000000..18d0769
--- /dev/null
+++ b/Recycler/NGScripting/Version
@@ -0,0 +1,3 @@
+# $Id: Version 4 2004-08-20 17:04:31Z helge $
+
+SUBMINOR_VERSION:=11

diff --git a/sope-appserver/NGScripting/common.h b/Recycler/NGScripting/common.h
similarity index 95%
rename from sope-appserver/NGScripting/common.h
rename to Recycler/NGScripting/common.h
index 4bd18ceef73aef40ecae87c76d043907bba0a301..6092bccff7b88590e934fde67ea68bbd9aed42b1 100644 (file)
--- a/sope-appserver/NGScripting/common.h
+++ b/Recycler/NGScripting/common.h
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: common.h 1 2004-08-20 10:08:27Z znek $
 
 #ifndef __NGScripting_common_H__
 #define __NGScripting_common_H__

diff --git a/sope-appserver/ChangeLog b/sope-appserver/ChangeLog
index 0686703f9db0320c1ce4fc84c40af2b5042a20a3..7084a6bab1d22bb803050e96bf7ba54ae73776d1 100644 (file)
--- a/sope-appserver/ChangeLog
+++ b/sope-appserver/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-25  Helge Hess  <helge.hess@opengroupware.org>
+
+       * move NGScripting to Recycler, not used anymore
+
 2004-08-22  Helge Hess  <helge.hess@opengroupware.org>
 
        * added SoOFS as a separate project

diff --git a/sope-appserver/GNUmakefile b/sope-appserver/GNUmakefile
index 5e6da56da9e60e679ced4d9ab85b028416920df2..a2f05030f6bfc07be41b9e956ccd440c4a447076 100644 (file)
--- a/sope-appserver/GNUmakefile
+++ b/sope-appserver/GNUmakefile
@@ -6,7 +6,6 @@ PACKAGE_NAME=sope-appserver
 VERSION=4.3.0
 
 SUBPROJECTS += \
-       NGScripting     \
        NGObjWeb        \
        WEExtensions    \
        WOExtensions    \

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index b272d88e749aa89613c76fbe801cc5657bd4ff80..b555a3977adc6e75330ae236d257a36e8e69fe88 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,5 +1,12 @@
 2004-08-25  Helge Hess  <helge.hess@opengroupware.org>
 
+       * v4.3.13
+
+       * removed dependency on NGScripting (disabled WOScriptedComponent)
+
+       * WOComponent.m: added baseURL ivar, _without_ increasing class
+         version (so that we don't need to touch every component in OGo :-| )
+
        * v4.3.12
 
        * Templates/WOxTemplateBuilder.m: properly select a DOM builder based

diff --git a/sope-appserver/NGObjWeb/GNUmakefile b/sope-appserver/NGObjWeb/GNUmakefile
index 4b4852aa1cc22e1b83a66af067ab256312b567aa..75aa0c52fda111308d1484da71237a94e8236bcf 100644 (file)
--- a/sope-appserver/NGObjWeb/GNUmakefile
+++ b/sope-appserver/NGObjWeb/GNUmakefile
@@ -86,9 +86,10 @@ NGObjWebCore_OBJC_FILES = \
        WOSessionStore.m                \
        WOStatisticsStore.m             \
        _WOStringTable.m                \
-       WOScriptedComponent.m           \
         WOElementID.m                  \
 
+#      WOScriptedComponent.m           \
+
 libNGObjWeb_OBJC_FILES = \
        $(NGObjWebCore_OBJC_FILES)      \
        NGHttp+WO.m                     \

diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble
index 5815cd3b7e05733f80ba37d6d7eb4d6b54a38f95..40b7d64601b01b4245248ec080831c602e1f92ae 100644 (file)
--- a/sope-appserver/NGObjWeb/GNUmakefile.preamble
+++ b/sope-appserver/NGObjWeb/GNUmakefile.preamble
@@ -25,7 +25,6 @@ RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml
 
 ADDITIONAL_LIB_DIRS += \
        -L$(GNUSTEP_OBJ_DIR)                                            \
-       -L$(RELBUILD_DIR_SOPE)/NGScripting/$(GNUSTEP_OBJ_DIR_NAME)      \
        -L$(RELBUILD_DIR_MIME)/NGMime/$(GNUSTEP_OBJ_DIR_NAME)           \
        -L$(RELBUILD_DIR_SxCore)/NGStreams/$(GNUSTEP_OBJ_DIR_NAME)      \
        -L$(RELBUILD_DIR_SxCore)/NGExtensions/$(GNUSTEP_OBJ_DIR_NAME)   \
@@ -37,7 +36,6 @@ ADDITIONAL_LIB_DIRS += \
 else
 libNGObjWeb_LIB_DIRS += \
        -L./$(GNUSTEP_OBJ_DIR)                  \
-       -L../NGScripting/$(GNUSTEP_OBJ_DIR)     \
        -L$(SOPE_ROOT)/sope-mime/$(GNUSTEP_OBJ_DIR)             \
        -L$(CORE_ROOT)/NGStreams/$(GNUSTEP_OBJ_DIR)             \
        -L$(CORE_ROOT)/NGExtensions/$(GNUSTEP_OBJ_DIR)          \
@@ -48,13 +46,12 @@ libNGObjWeb_LIB_DIRS += \
 endif
 
 libNGObjWeb_LIBRARIES_DEPEND_UPON += \
-       -lNGScripting                                   \
        -lNGMime -lNGStreams -lNGExtensions -lEOControl \
        -lXmlRpc -lDOM -lSaxObjC
 
 wod_LIB_DIRS  += $(libNGObjWeb_LIB_DIRS)
 wod_TOOL_LIBS += \
-       -lNGObjWeb -lNGScripting        \
+       -lNGObjWeb \
        -lNGMime -lNGStreams -lNGExtensions -lEOControl \
        -lXmlRpc -lDOM -lSaxObjC
 

diff --git a/sope-appserver/NGObjWeb/NGObjWeb/WOComponent.h b/sope-appserver/NGObjWeb/NGObjWeb/WOComponent.h
index 25968ddb8b171ba7b86f4687d777074d269a7309..17bb9e4dc3cb8f3c48a2c1b7c63dbe06741daecb 100644 (file)
--- a/sope-appserver/NGObjWeb/NGObjWeb/WOComponent.h
+++ b/sope-appserver/NGObjWeb/NGObjWeb/WOComponent.h
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #ifndef __NGObjWeb_WOComponent_H__
 #define __NGObjWeb_WOComponent_H__
@@ -27,7 +26,7 @@
 #import <NGObjWeb/WOElement.h>
 #include <NGObjWeb/WOActionResults.h>
 
-@class NSString, NSDictionary, NSMutableDictionary, NSURL, NSException;
+@class NSString, NSDictionary, NSMutableDictionary, NSURL, NSException, NSURL;
 @class WOElement, WOContext, WOSession, WOApplication, WOResourceManager;
 
 @interface WOComponent : WOElement < WOActionResults, NSCoding >
@@ -49,6 +48,8 @@
   WOContext     *context;
   WOApplication *application;
   WOSession     *session;
+  
+  NSURL *wocBaseURL;
 }
 
 - (id)initWithContext:(WOContext *)_ctx;

diff --git a/sope-appserver/NGObjWeb/SoObjects/SoProductResourceManager.m b/sope-appserver/NGObjWeb/SoObjects/SoProductResourceManager.m
index bd34fa3542c4139434bb594fe88da87e4c40e74b..a06e43063699bfea718e13325146ee51625d710d 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/SoProductResourceManager.m
+++ b/sope-appserver/NGObjWeb/SoObjects/SoProductResourceManager.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "SoProductResourceManager.h"
 #include "SoProduct.h"
@@ -29,6 +28,7 @@
 #include <NGObjWeb/WOResponse.h>
 #include <NGObjWeb/WOSession.h>
 #include <NGObjWeb/WORequest.h>
+#include <NGExtensions/NSString+Ext.h>
 #include "common.h"
 
 @interface WOResourceManager(UsedPrivates)

diff --git a/sope-appserver/NGObjWeb/WOComponent.m b/sope-appserver/NGObjWeb/WOComponent.m
index 54550173907dd8c6fd75e1e064f9837c37d31f5e..c83c66f96873dddfe8acd99fafa3ee6a2d1e8304 100644 (file)
--- a/sope-appserver/NGObjWeb/WOComponent.m
+++ b/sope-appserver/NGObjWeb/WOComponent.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id: WOComponent.m 1 2004-08-20 10:08:27Z znek $
 
 #include <NGObjWeb/WOComponent.h>
 #include "WOComponent+private.h"
@@ -63,6 +62,7 @@ static BOOL  abortOnMissingCtx                 = NO;
 static BOOL  wakeupPageOnCreation              = NO;
 
 + (int)version {
+  // TODO: is really v3 for baseURL ivar change
   return [super version] + 0 /* v2 */;
 }
 + (void)initialize {
@@ -150,6 +150,7 @@ static BOOL  wakeupPageOnCreation              = NO;
   [self->wocBindings   release];
   [self->wocVariables  release];
   [self->wocName       release];
+  [self->wocBaseURL    release];
   [super dealloc];
 }
 
@@ -348,17 +349,18 @@ static inline id _getExtraVar(WOComponent *self, NSString *_key) {
                 languages:languages];
 }
 - (void)setBaseURL:(NSURL *)_url {
-  _setExtraVar(self, @"__wobaseurl", _url);
+  ASSIGNCOPY(self->wocBaseURL, _url);
 }
 - (NSURL *)baseURL {
   NSURL *url;
   
-  if ((url = _getExtraVar(self, @"__wobaseurl")))
-    return url;
+  if (self->wocBaseURL)
+    return self->wocBaseURL;
   
   url = [(WOApplication *)[self application] baseURL];
-  url = [NSURL URLWithString:@"WebServerResources" relativeToURL:url];
-  return url;
+  self->wocBaseURL = 
+    [[NSURL URLWithString:@"WebServerResources" relativeToURL:url] copy];
+  return self->wocBaseURL;
 }
 
 - (NSString *)componentActionURLForContext:(WOContext *)_ctx {

diff --git a/sope-appserver/NGObjWeb/WOComponentDefinition.m b/sope-appserver/NGObjWeb/WOComponentDefinition.m
index 6f61547a368cb3a1eb5ee9ecd7035e06a31b6249..9a109b68c42f7da61c0cda99903bad47d9c49993 100644 (file)
--- a/sope-appserver/NGObjWeb/WOComponentDefinition.m
+++ b/sope-appserver/NGObjWeb/WOComponentDefinition.m
@@ -22,7 +22,6 @@
 #include "WOComponentDefinition.h"
 #include "WOComponent+private.h"
 #include "WOComponentFault.h"
-#include "WOScriptedComponent.h"
 #include <NGObjWeb/WOAssociation.h>
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOElement.h>
@@ -439,7 +438,7 @@ static NSArray *woxExtensions = nil;
   WOComponentScript *script;
   
   if ((script = [self->template componentScript])) 
-    cClass = [WOScriptedComponent class];
+    cClass = NSClassFromString(@"WOScriptedComponent");
   else
     cClass = [self componentClass];
   

diff --git a/sope-appserver/NGObjWeb/WOScriptedComponent.m b/sope-appserver/NGObjWeb/WOScriptedComponent.m
index 5e47eaa0ee80670af018967985e654caf7a16783..6930dd15cb527491aba91f03d5ee563f9649570c 100644 (file)
--- a/sope-appserver/NGObjWeb/WOScriptedComponent.m
+++ b/sope-appserver/NGObjWeb/WOScriptedComponent.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: WOScriptedComponent.m 1 2004-08-20 10:08:27Z znek $
 
 #include "WOScriptedComponent.h"
 #include <NGObjWeb/WOTemplateBuilder.h>

diff --git a/sope-appserver/NGObjWeb/ngobjweb.make b/sope-appserver/NGObjWeb/ngobjweb.make
index d8720c035a9622edfec774d5fa14129e354e9607..c8bdd44d2e859267bf9c2c44705d946c70dbf824 100644 (file)
--- a/sope-appserver/NGObjWeb/ngobjweb.make
+++ b/sope-appserver/NGObjWeb/ngobjweb.make
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: ngobjweb.make 14 2004-08-20 21:07:18Z helge $
 
 WO_LDFLAGS =
 WO_LIBS    = -lNGObjWeb -lNGMime -lNGStreams -lNGExtensions        
@@ -6,7 +6,6 @@ WO_DEFINE  = -DNGObjWeb_LIBRARY=1
 
 ifeq ($(FOUNDATION_LIB),apple)
 WO_LIBS += \
-       -lNGScripting                   \
        -lNGMime -lNGStreams -lNGExtensions -lEOControl \
        -lXmlRpc -lDOM -lSaxObjC
 endif

diff --git a/sope-appserver/NGScripting/Version b/sope-appserver/NGScripting/Version
deleted file mode 100644 (file)
index c351558..0000000
--- a/sope-appserver/NGScripting/Version
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-
-SUBMINOR_VERSION:=11

diff --git a/sope-appserver/NGXmlRpc/GNUmakefile.preamble b/sope-appserver/NGXmlRpc/GNUmakefile.preamble
index 5fbe7ef19896f2fba52bec5c6da6b7b9ee3887ea..e99ca66af0b5cda7a4d8fc9c886f6f2b74eae4e3 100644 (file)
--- a/sope-appserver/NGXmlRpc/GNUmakefile.preamble
+++ b/sope-appserver/NGXmlRpc/GNUmakefile.preamble
@@ -17,12 +17,12 @@ libNGXmlRpc_INCLUDE_DIRS += \
        -I$(SOPE_ROOT)/sope-xml
 
 libNGXmlRpc_LIBRARIES_DEPEND_UPON += \
-       -lNGObjWeb -lNGScripting                        \
+       -lNGObjWeb \
        -lNGMime -lNGStreams -lNGExtensions -lEOControl \
        -lXmlRpc -lDOM -lSaxObjC
 
 xmlrpc_call_TOOL_LIBS += \
-       -lNGXmlRpc -lNGObjWeb -lNGScripting     \
+       -lNGXmlRpc -lNGObjWeb \
        -lNGMime -lNGStreams -lNGExtensions -lEOControl \
        -lXmlRpc -lDOM -lSaxObjC
 
@@ -35,7 +35,6 @@ RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml
 ADDITIONAL_LIB_DIRS += \
        -L$(GNUSTEP_OBJ_DIR)                                            \
        -L$(RELBUILD_DIR_SOPE)/NGObjWeb/$(GNUSTEP_OBJ_DIR_NAME)         \
-       -L$(RELBUILD_DIR_SOPE)/NGScripting/$(GNUSTEP_OBJ_DIR_NAME)      \
        -L$(RELBUILD_DIR_MIME)/NGMime/$(GNUSTEP_OBJ_DIR_NAME)           \
        -L$(RELBUILD_DIR_SxCore)/NGStreams/$(GNUSTEP_OBJ_DIR_NAME)      \
        -L$(RELBUILD_DIR_SxCore)/NGExtensions/$(GNUSTEP_OBJ_DIR_NAME)   \
@@ -48,7 +47,6 @@ else
 ADDITIONAL_LIB_DIRS += \
        -L./$(GNUSTEP_OBJ_DIR)                                  \
        -L../NGObjWeb/$(GNUSTEP_OBJ_DIR)                        \
-       -L../NGScripting/$(GNUSTEP_OBJ_DIR)                     \
        -L$(SOPE_ROOT)/sope-mime/$(GNUSTEP_OBJ_DIR)             \
        -L$(CORE_ROOT)/NGStreams/$(GNUSTEP_OBJ_DIR)             \
        -L$(CORE_ROOT)/NGExtensions/$(GNUSTEP_OBJ_DIR)          \

diff --git a/sope-appserver/SoOFS/GNUmakefile.preamble b/sope-appserver/SoOFS/GNUmakefile.preamble
index 9281f608f91ea22c086dcd1d20592c1b5f8176d5..8e23e91fd9bbc86130016609dd1b0ed035a1f12b 100644 (file)
--- a/sope-appserver/SoOFS/GNUmakefile.preamble
+++ b/sope-appserver/SoOFS/GNUmakefile.preamble
@@ -19,12 +19,12 @@ ADDITIONAL_INCLUDE_DIRS += \
 
 
 libSoOFS_LIBRARIES_DEPEND_UPON += \
-       -lNGObjWeb -lNGScripting                        \
+       -lNGObjWeb \
        -lNGMime -lNGStreams -lNGExtensions -lEOControl \
        -lXmlRpc -lDOM -lSaxObjC
 
 sope_TOOL_LIBS += \
-       -lSoOFS -lNGObjWeb -lNGScripting                \
+       -lSoOFS -lNGObjWeb \
        -lNGMime -lNGStreams -lNGExtensions -lEOControl \
        -lXmlRpc -lDOM -lSaxObjC
 
@@ -40,7 +40,6 @@ RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml
 ADDITIONAL_LIB_DIRS += \
        -L$(GNUSTEP_OBJ_DIR)                                            \
        -L$(RELBUILD_DIR_SOPE)/NGObjWeb/$(GNUSTEP_OBJ_DIR_NAME)         \
-       -L$(RELBUILD_DIR_SOPE)/NGScripting/$(GNUSTEP_OBJ_DIR_NAME)      \
        -L$(RELBUILD_DIR_MIME)/NGMime/$(GNUSTEP_OBJ_DIR_NAME)           \
        -L$(RELBUILD_DIR_SxCore)/NGStreams/$(GNUSTEP_OBJ_DIR_NAME)      \
        -L$(RELBUILD_DIR_SxCore)/NGExtensions/$(GNUSTEP_OBJ_DIR_NAME)   \
@@ -53,7 +52,6 @@ else
 ADDITIONAL_LIB_DIRS += \
        -L./$(GNUSTEP_OBJ_DIR)                                  \
        -L../NGObjWeb/$(GNUSTEP_OBJ_DIR)                        \
-       -L../NGScripting/$(GNUSTEP_OBJ_DIR)                     \
        -L$(SOPE_ROOT)/sope-mime/$(GNUSTEP_OBJ_DIR)             \
        -L$(CORE_ROOT)/NGStreams/$(GNUSTEP_OBJ_DIR)             \
        -L$(CORE_ROOT)/NGExtensions/$(GNUSTEP_OBJ_DIR)          \

diff --git a/sope-appserver/WEExtensions/GNUmakefile.preamble b/sope-appserver/WEExtensions/GNUmakefile.preamble
index 587001da84c401b449fe3f0d723e708bf7db008e..710e232468394baf3d22033073d67969995f4db8 100644 (file)
--- a/sope-appserver/WEExtensions/GNUmakefile.preamble
+++ b/sope-appserver/WEExtensions/GNUmakefile.preamble
@@ -23,7 +23,7 @@ endif
 libWEExtensions_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
 
 libWEExtensions_LIBRARIES_DEPEND_UPON += \
-       -lNGObjWeb -lNGScripting \
+       -lNGObjWeb \
        -lNGMime -lNGStreams -lNGExtensions -lEOControl \
        -lXmlRpc -lDOM -lSaxObjC
 
@@ -36,7 +36,6 @@ RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml
 ADDITIONAL_LIB_DIRS += \
        -L$(GNUSTEP_OBJ_DIR)                                            \
         -L$(RELBUILD_DIR_APPSERVER)/NGObjWeb/$(GNUSTEP_OBJ_DIR_NAME)   \
-        -L$(RELBUILD_DIR_APPSERVER)/NGScripting/$(GNUSTEP_OBJ_DIR_NAME)        \
         -L$(RELBUILD_DIR_MIME)/$(GNUSTEP_OBJ_DIR_NAME)                 \
         -L$(RELBUILD_DIR_SxCore)/NGStreams/$(GNUSTEP_OBJ_DIR_NAME)      \
         -L$(RELBUILD_DIR_SxCore)/NGExtensions/$(GNUSTEP_OBJ_DIR_NAME)   \
@@ -48,7 +47,6 @@ else
 ADDITIONAL_LIB_DIRS += \
        -L./$(GNUSTEP_OBJ_DIR)                                  \
         -L../NGObjWeb/$(GNUSTEP_OBJ_DIR)                       \
-        -L../NGScripting/$(GNUSTEP_OBJ_DIR)                    \
         -L../../sope-mime/$(GNUSTEP_OBJ_DIR)                   \
         -L../../sope-core/NGStreams/$(GNUSTEP_OBJ_DIR)         \
         -L../../sope-core/NGExtensions/$(GNUSTEP_OBJ_DIR)      \

diff --git a/sope-appserver/WOExtensions/GNUmakefile.preamble b/sope-appserver/WOExtensions/GNUmakefile.preamble
index 35a1893695c2c2c67bb68c2241e7a6558444cf2e..098d6a5f6eb813d97c864e45bc31431d5d1de46a 100644 (file)
--- a/sope-appserver/WOExtensions/GNUmakefile.preamble
+++ b/sope-appserver/WOExtensions/GNUmakefile.preamble
@@ -15,9 +15,10 @@ libWOExtensions_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
 
 
 libWOExtensions_LIBRARIES_DEPEND_UPON += \
-       -lWEExtensions                                  \
-       -lNGObjWeb -lNGScripting                \
-       -lNGMime -lNGStreams -lNGExtensions -lEOControl \
+       -lWEExtensions  \
+       -lNGObjWeb      \
+       -lNGMime        \
+       -lNGStreams -lNGExtensions -lEOControl \
        -lXmlRpc -lDOM -lSaxObjC
 
 
@@ -30,7 +31,6 @@ ADDITIONAL_LIB_DIRS += \
        -L$(GNUSTEP_OBJ_DIR)                                            \
         -L$(RELBUILD_DIR_APPSERVER)/WEExtensions/$(GNUSTEP_OBJ_DIR_NAME)\
         -L$(RELBUILD_DIR_APPSERVER)/NGObjWeb/$(GNUSTEP_OBJ_DIR_NAME)   \
-        -L$(RELBUILD_DIR_APPSERVER)/NGScripting/$(GNUSTEP_OBJ_DIR_NAME) \
         -L$(RELBUILD_DIR_SxCore)/NGMime/$(GNUSTEP_OBJ_DIR_NAME)        \
         -L$(RELBUILD_DIR_SxCore)/NGStreams/$(GNUSTEP_OBJ_DIR_NAME)      \
         -L$(RELBUILD_DIR_SxCore)/NGExtensions/$(GNUSTEP_OBJ_DIR_NAME)   \
@@ -42,7 +42,6 @@ else
 ADDITIONAL_LIB_DIRS += \
        -L./$(GNUSTEP_OBJ_DIR)                  \
         -L../NGObjWeb/$(GNUSTEP_OBJ_DIR)        \
-        -L../NGScripting/$(GNUSTEP_OBJ_DIR)     \
         -L../WEExtensions/$(GNUSTEP_OBJ_DIR)   \
         -L../../sope-mime/$(GNUSTEP_OBJ_DIR)                   \
         -L../../sope-core/NGStreams/$(GNUSTEP_OBJ_DIR)         \