bugfix for garbage committed during last commit, reverted to r103 with

only minor check for WHICH_LIB_SCRIPT

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 893ac4c5a4651b3d7f73caa7e337e6707d781871..8f98959685547ff6a97f49adbbfca9e12856c710 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-18  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * wobundle-gs.make: basically reverted to r103, but with the
+         WHICH_LIB_SCRIPT check enabled - the rest was garbage which
+         accidentaly got committed, unsure how that happened in the
+         first place (v4.5.251)
+
 2006-09-18  Helge Hess  <helge.hess@opengroupware.org>
 
         * removed deprecated woapp.make, wobundle.make (v4.5.250)

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 5f5d5820abafe89813703ef6417d98be7b8427a7..6c4d70cb27fa4ccd25c3e5364bd96df6f14d1541 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=250
+SUBMINOR_VERSION:=251
 
 # v4.5.234 requires libDOM          v4.5.21
 # v4.5.214 requires libNGExtensions v4.5.179

diff --git a/sope-appserver/NGObjWeb/wobundle-gs.make b/sope-appserver/NGObjWeb/wobundle-gs.make
index affcb7396f0ad609e3ed9f518e4543dcf913f39b..42500e7755c32cc8f0a3b3ce8aa302a101ef3c8d 100644 (file)
--- a/sope-appserver/NGObjWeb/wobundle-gs.make
+++ b/sope-appserver/NGObjWeb/wobundle-gs.make
@@ -126,8 +126,7 @@ ifndef $(WHICH_LIB_SCRIPT)
 ALL_WOBUNDLE_LIBS = $(ALL_LIB_DIRS) $(TALL_WOBUNDLE_LIBS)
 else
 ALL_WOBUNDLE_LIBS = \
-    $(shell $(WHICH_LIB_SCRIPT)        \
-       $(ALL_LIB_DIRS) $(TALL_WOBUNDLE_LIBS)   \
+    $(shell $(WHICH_LIB_SCRIPT) $(ALL_LIB_DIRS) $(TALL_WOBUNDLE_LIBS) \
        debug=$(debug) profile=$(profile) shared=$(shared) libext=$(LIBEXT) \
        shared_libext=$(SHARED_LIBEXT))
 endif
@@ -147,55 +146,6 @@ ifeq ($(strip $(LANGUAGES)),)
 endif
 
 
-build-bundle-dir:: $(WOBUNDLE_DIR_NAME)/$(WORSRCDIRINFIX) \
-                   $(WOBUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR) \
-                   $(WOBUNDLE_RESOURCE_DIRS)
-
-$(WOBUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR):
-       @$(MKDIRS) $(WOBUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)
-
-$(WOBUNDLE_RESOURCE_DIRS):
-       @$(MKDIRS) $(WOBUNDLE_RESOURCE_DIRS)
-
-build-bundle:: $(WOBUNDLE_FILE) \
-               wobundle-components \
-               wobundle-resource-files \
-               wobundle-localized-resource-files \
-               wobundle-localized-webresource-files \
-               wobundle-webresource-files
-
-
-$(WOBUNDLE_FILE) : $(OBJ_FILES_TO_LINK)
-       $(WOBUNDLE_LD) $(WOBUNDLE_LDFLAGS) \
-                       $(ALL_LDFLAGS) -o $(LDOUT)$(WOBUNDLE_FILE) \
-                       $(OBJ_FILES_TO_LINK) \
-                       $(ALL_WOBUNDLE_LIBS)
-
-wobundle-components :: $(WOBUNDLE_DIR_NAME)
-ifneq ($(strip $(COMPONENTS)),)
-       @(echo "Linking components into the bundle wrapper..."; \
-        cd $(WOBUNDLE_DIR_NAME)/$(WORSRCDIRINFIX); \
-        for component in $(COMPONENTS); do \
-         if [ -d $(WORSRCLINKUP)/$$component ]; then \
-           $(LN_S) -f $(WORSRCLINKUP)/$$component ./;\
-         fi; \
-        done; \
-
-internal-wobundle-all_:: $(GNUSTEP_OBJ_DIR) \
-                          build-bundle-dir \
-                          build-bundle
-
-WOBUNDLE_DIR_NAME = $(GNUSTEP_INSTANCE:=$(WOBUNDLE_EXTENSION))
-WOBUNDLE_FILE = \
-    $(WOBUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE)
-WOBUNDLE_RESOURCE_DIRS = $(foreach d, $(RESOURCE_DIRS), $(WOBUNDLE_DIR_NAME)/$(WORSRCDIRINFIX)/$(d))
-WOBUNDLE_WEBSERVER_RESOURCE_DIRS =  $(foreach d, $(WEBSERVER_RESOURCE_DIRS), $(WOBUNDLE_DIR_NAME)/Resources/WebServer/$(d))
-
-ifeq ($(strip $(LANGUAGES)),)
-  LANGUAGES="English"
-endif
-
-
 build-bundle-dir:: $(WOBUNDLE_DIR_NAME)/$(WORSRCDIRINFIX) \
                    $(WOBUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR) \
                    $(WOBUNDLE_RESOURCE_DIRS)