use makefile version in resource lookup

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 4e060512017056b8df6adba04946a4a7911534bf..ee839f8b53729c923e3c828b860f99568471ebc3 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-14  Helge Hess  <helge.hess@skyrix.com>
+
+       * WOMessage.m, WOCoreApplication.m, SoProductRegistry.m, 
+         WOApplication+Builders.m: use makefile provided SOPE version for
+         resource lookup (v4.3.39)
+
 2004-09-13  Helge Hess  <helge.hess@opengroupware.org>
 
        * OWResourceManager.m: deprecated -pathToComponentNamed:inFramework:

diff --git a/sope-appserver/NGObjWeb/GNUmakefile b/sope-appserver/NGObjWeb/GNUmakefile
index a37b3e489056c3f357e77695dc6a4d91b264abc6..f4242598120d8cc3865826fd966783cf46c63880 100644 (file)
--- a/sope-appserver/NGObjWeb/GNUmakefile
+++ b/sope-appserver/NGObjWeb/GNUmakefile
@@ -9,11 +9,9 @@ LIBRARY_NAME  = libNGObjWeb
 ifeq ($(FHS_INSTALL_ROOT),)
 RESOURCES_DIR = $(GNUSTEP_RESOURCES)/NGObjWeb
 else
-RESOURCES_DIR = $(FHS_INSTALL_ROOT)/share/sope-4.3/ngobjweb
+RESOURCES_DIR = $(FHS_INSTALL_ROOT)/share/sope-$(MAJOR_VERSION).$(MINOR_VERSION)/ngobjweb
 endif
 
-libNGObjWeb_CPPFLAGS += -pipe -DCOMPILING_NGOBJWEB=1
-
 libNGObjWeb_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
 libNGObjWeb_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
 

diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble
index 5091249d55f3d265e8c0df4cfc2cd14f0436c2e6..46c9472b400e91c51ff8a37aab60ddab45bfa61a 100644 (file)
--- a/sope-appserver/NGObjWeb/GNUmakefile.preamble
+++ b/sope-appserver/NGObjWeb/GNUmakefile.preamble
@@ -1,6 +1,13 @@
 # $Id: GNUmakefile.preamble 25 2004-08-20 23:01:07Z helge $
 
-ADDITIONAL_CPPFLAGS += -Wall -DCOMPILE_FOR_GSTEP_MAKE=1
+ADDITIONAL_CPPFLAGS += \
+        -Wall -DCOMPILE_FOR_GSTEP_MAKE=1        \
+        -DSOPE_MAJOR_VERSION=$(MAJOR_VERSION)   \
+        -DSOPE_MINOR_VERSION=$(MINOR_VERSION)   \
+        -DSOPE_SUBMINOR_VERSION=$(SUBMINOR_VERSION)
+
+libNGObjWeb_CPPFLAGS  += -pipe -DCOMPILING_NGOBJWEB=1
+libNGObjWeb_OBJCFLAGS += -Wall -Wno-import -Wno-protocol
 
 SOPE_ROOT=../..
 CORE_ROOT=$(SOPE_ROOT)/sope-core
@@ -15,7 +22,6 @@ ADDITIONAL_INCLUDE_DIRS += \
        -I$(CORE_ROOT)/NGExtensions     \
        -I$(SOPE_ROOT)/sope-mime
 
-libNGObjWeb_OBJCFLAGS += -Wall -Wno-import -Wno-protocol
 
 ifneq ($(GNUSTEP_BUILD_DIR),)
 RELBUILD_DIR_SOPE=$(GNUSTEP_BUILD_DIR)/..

diff --git a/sope-appserver/NGObjWeb/NGHttp+WO.m b/sope-appserver/NGObjWeb/NGHttp+WO.m
index 7eef5945304084440877ad8d65774a2ed1e9dd1d..b990e282375c1b6409cb68f718c68f6bc463571a 100644 (file)
--- a/sope-appserver/NGObjWeb/NGHttp+WO.m
+++ b/sope-appserver/NGObjWeb/NGHttp+WO.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "NGHttp+WO.h"
 #include <NGHttp/NGHttp.h>

diff --git a/sope-appserver/NGObjWeb/SoObjects/GNUmakefile b/sope-appserver/NGObjWeb/SoObjects/GNUmakefile
index fedd674a2c25bdd6ffcb389205ebfd53f1c26b23..7a6492d631cba10a931257b5117f9409e6696ebf 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/GNUmakefile
+++ b/sope-appserver/NGObjWeb/SoObjects/GNUmakefile
@@ -1,6 +1,6 @@
 # $Id: GNUmakefile 1 2004-08-20 10:08:27Z znek $
 
-include $(GNUSTEP_MAKEFILES)/common.make
+include ../subdirs.make
 
 SUBPROJECT_NAME = SoObjects
 

diff --git a/sope-appserver/NGObjWeb/SoObjects/GNUmakefile.preamble b/sope-appserver/NGObjWeb/SoObjects/GNUmakefile.preamble
index 9be6f9fbaf0358615dec70dc1dd2b3115ef7379c..ff4872d48b8fd64a4acd1a056970628199d18130 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/GNUmakefile.preamble
+++ b/sope-appserver/NGObjWeb/SoObjects/GNUmakefile.preamble
@@ -1,11 +1,3 @@
 # $Id$
 
-ADDITIONAL_INCLUDE_DIRS += \
-       -I..                    \
-       -I../DynamicElements/   \
-       -I../WebDAV/            \
-       -I../..                 \
-       -I../../../sope-core                    \
-       -I../../../sope-core/NGStreams          \
-       -I../../../sope-core/NGExtensions       \
-       -I../../../sope-xml
+ADDITIONAL_INCLUDE_DIRS += -I../WebDAV/

diff --git a/sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m b/sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m
index af2c68ca46834923463bbb624af1b28644f208ae..9ee2a7159410999ee466441cae4b4bfe6ebb4d0b 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m
+++ b/sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m
@@ -202,6 +202,7 @@ static int debugOn = 0;
   NSProcessInfo *pi;
   NSArray  *pathes;
   NSBundle *bundle;
+  NSString *relPath;
   unsigned i;
 
   /* scan mail bundle & frameworks */
@@ -248,15 +249,16 @@ static int debugOn = 0;
   
   [self debugWithFormat:@"scanning for products ..."];
   
+#if !COCOA_Foundation_LIBRARY
+  relPath = @"Library/";
+#endif
+  relPath = [NSString stringWithFormat:@"%@SoProducts-%i.%i/", relPath,
+                        SOPE_MAJOR_VERSION, SOPE_MINOR_VERSION];
   for (i = 0; i < [pathes count]; i++) {
     NSString *lPath;
     BOOL     isDir;
     
-    lPath = [pathes objectAtIndex:i];
-#if !COCOA_Foundation_LIBRARY
-    lPath = [lPath stringByAppendingPathComponent:@"Library"];
-#endif
-    lPath = [lPath stringByAppendingPathComponent:@"SoProducts-4.3"];
+    lPath = [[pathes objectAtIndex:i] stringByAppendingPathComponent:relPath];
     
     if (![fm fileExistsAtPath:lPath isDirectory:&isDir])
       continue;
@@ -269,9 +271,11 @@ static int debugOn = 0;
   
   /* look into FHS pathes */
   
+  relPath = [NSString stringWithFormat:@"lib/sope-%i.%i/products/",
+                        SOPE_MAJOR_VERSION, SOPE_MINOR_VERSION];
   pathes = [NSArray arrayWithObjects:
-                     @"/usr/local/lib/sope-4.3/products/",
-                     @"/usr/lib/sope-4.3/products/",
+                     [@"/usr/local/" stringByAppendingString:relPath],
+                     [@"/usr/"       stringByAppendingString:relPath],
                    nil];
   for (i = 0; i < [pathes count]; i++) {
     NSString *lPath;

diff --git a/sope-appserver/NGObjWeb/Templates/GNUmakefile b/sope-appserver/NGObjWeb/Templates/GNUmakefile
index f0bedf1afa6b9e2e6f41ea4c90c0af33aee6d798..2269c5ae45c7bf60bc5759d4919c5862377fdecd 100644 (file)
--- a/sope-appserver/NGObjWeb/Templates/GNUmakefile
+++ b/sope-appserver/NGObjWeb/Templates/GNUmakefile
@@ -1,6 +1,6 @@
 # $Id$
 
-include $(GNUSTEP_MAKEFILES)/common.make
+include ../subdirs.make
 
 SUBPROJECT_NAME = Templates
 

diff --git a/sope-appserver/NGObjWeb/Templates/GNUmakefile.preamble b/sope-appserver/NGObjWeb/Templates/GNUmakefile.preamble
index e72c26781c22b2af69d7cd5094df42caffaada4b..73c51ce6ee000d8189143e0cf2b9044f66617ca2 100644 (file)
--- a/sope-appserver/NGObjWeb/Templates/GNUmakefile.preamble
+++ b/sope-appserver/NGObjWeb/Templates/GNUmakefile.preamble
@@ -1,10 +1,2 @@
-# $Id$
+# compile settings
 
-ADDITIONAL_INCLUDE_DIRS += \
-       -I..                    \
-       -I../DynamicElements/   \
-       -I../..                 \
-       -I../../../sope-core                    \
-       -I../../../sope-core/NGStreams  \
-       -I../../../sope-core/NGExtensions       \
-       -I../../../sope-xml

diff --git a/sope-appserver/NGObjWeb/Templates/WOApplication+Builders.m b/sope-appserver/NGObjWeb/Templates/WOApplication+Builders.m
index 18b66a6e3e26565eb684ce4c2d9e425d4ffec607..792e082d4cea73923381a9c041b15b9971a8b43c 100644 (file)
--- a/sope-appserver/NGObjWeb/Templates/WOApplication+Builders.m
+++ b/sope-appserver/NGObjWeb/Templates/WOApplication+Builders.m
@@ -64,9 +64,11 @@
 }
 
 - (void)loadBuilderBundles {
+  // TODO: DUP to SoProductRegistry.m
   NSFileManager *fm;
   NSProcessInfo *pi;
   NSArray       *pathes;
+  NSString      *relPath;
   unsigned      i;
   
   /* scan library pathes */
@@ -98,16 +100,16 @@
   
   [self debugWithFormat:@"scanning for builder bundles ..."];
   
+#if !COCOA_Foundation_LIBRARY
+  relPath = @"Library/";
+#endif
+  relPath = [NSString stringWithFormat:@"%@WOxElemBuilders-%i.%i/", relPath,
+                        SOPE_MAJOR_VERSION, SOPE_MINOR_VERSION];
   for (i = 0; i < [pathes count]; i++) {
     NSString *lPath;
     BOOL     isDir;
     
-    lPath = [pathes objectAtIndex:i];
-#if !COCOA_Foundation_LIBRARY
-    lPath = [lPath stringByAppendingPathComponent:@"Library"];
-#endif
-    lPath = [lPath stringByAppendingPathComponent:@"WOxElemBuilders-4.3"];
-    
+    lPath = [[pathes objectAtIndex:i] stringByAppendingPathComponent:relPath];
     if (![fm fileExistsAtPath:lPath isDirectory:&isDir])
       continue;
     if (!isDir)
@@ -119,9 +121,11 @@
   
   /* look into FHS pathes */
   
+  relPath = [NSString stringWithFormat:@"lib/sope-%i.%i/wox-builders/",
+                        SOPE_MAJOR_VERSION, SOPE_MINOR_VERSION];
   pathes = [NSArray arrayWithObjects:
-                     @"/usr/local/lib/sope-4.3/wox-builders/",
-                     @"/usr/lib/sope-4.3/wox-builders/",
+                     [@"/usr/local/" stringByAppendingString:relPath],
+                     [@"/usr/"       stringByAppendingString:relPath],
                    nil];
   for (i = 0; i < [pathes count]; i++) {
     NSString *lPath;

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 3c3f9fab7c62b0b3afa067ca371a9a39416d2df7..0aff0f28bd612bdee6b612bcbbc1e150c25f00f0 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=38
+SUBMINOR_VERSION:=39
 
 # v4.2.413 requires libSaxObjC      v4.2.33
 # v4.2.341 requires libNGExtensions v4.2.77

diff --git a/sope-appserver/NGObjWeb/WOCoreApplication.m b/sope-appserver/NGObjWeb/WOCoreApplication.m
index 3ae35a49dd2b165115560de41ed86ba26d621082..7245a1a35a84aefcb3de662fe4005591bb4f7c13 100644 (file)
--- a/sope-appserver/NGObjWeb/WOCoreApplication.m
+++ b/sope-appserver/NGObjWeb/WOCoreApplication.m
@@ -715,8 +715,11 @@ static NSMutableArray *activeApps = nil; // THREAD
     [ma addObject:apath];
   }
   [ma addObject:relPath];
-  [ma addObject:@"/usr/local/share/sope-4.3/ngobjweb/"];
-  [ma addObject:@"/usr/share/sope-4.3/ngobjweb/"];
+  
+  relPath = [NSString stringWithFormat:@"share/sope-%i.%i/ngobjweb/",
+                        SOPE_MAJOR_VERSION, SOPE_MINOR_VERSION];
+  [ma addObject:[@"/usr/local/" stringByAppendingString:relPath]];
+  [ma addObject:[@"/usr/"       stringByAppendingString:relPath]];
   return ma;
 }
 

diff --git a/sope-appserver/NGObjWeb/WOMessage.m b/sope-appserver/NGObjWeb/WOMessage.m
index 083500064b1948a7b13239e437f1f5db8f514402..e3fb0019051427b9df160e22c98eb97d11911972 100644 (file)
--- a/sope-appserver/NGObjWeb/WOMessage.m
+++ b/sope-appserver/NGObjWeb/WOMessage.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id: WOMessage.m 4 2004-08-20 17:04:31Z helge $
 
 #include <NGObjWeb/WOMessage.h>
 #include <NGExtensions/NGHashMap.h>

diff --git a/sope-appserver/NGObjWeb/subdirs.make b/sope-appserver/NGObjWeb/subdirs.make
new file mode 100644 (file)
index 0000000..dff4a40
--- /dev/null
+++ b/sope-appserver/NGObjWeb/subdirs.make
@@ -0,0 +1,20 @@
+# common settings for SOPE subdirs
+
+include $(GNUSTEP_MAKEFILES)/common.make
+include ../../Version
+include ../Version
+
+ADDITIONAL_CPPFLAGS += \
+        -Wall -DCOMPILE_FOR_GSTEP_MAKE=1        \
+        -DSOPE_MAJOR_VERSION=$(MAJOR_VERSION)   \
+        -DSOPE_MINOR_VERSION=$(MINOR_VERSION)   \
+        -DSOPE_SUBMINOR_VERSION=$(SUBMINOR_VERSION)
+
+ADDITIONAL_INCLUDE_DIRS += \
+       -I..                    \
+       -I../DynamicElements/   \
+       -I../..                 \
+       -I../../../sope-core                    \
+       -I../../../sope-core/NGStreams          \
+       -I../../../sope-core/NGExtensions       \
+       -I../../../sope-xml