changed bundles to install in "xxx-4.3" pathes instead of "xxx/4.3"

to be consistent with OGo

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 7f800270766058d324a11be23099c7671c2bc62c..b2e0dbe56725b6f3c8fab3f0b5bd644d9ffa9d4d 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,5 +1,8 @@
 2004-08-24  Helge Hess  <helge.hess@opengroupware.org>
 
+       * changed bundles to install in "xxx-4.3" pathes instead of "xxx/4.3"
+         to be consistent with OGo (v4.3.11)
+
        * v4.3.10
 
        * GNUmakefile: install SoCore.sxp in Library/SoProducts/4.3/

diff --git a/sope-appserver/NGObjWeb/GNUmakefile b/sope-appserver/NGObjWeb/GNUmakefile
index 604f393a33f822ead5f14225d72f79824e39e9d8..4b4852aa1cc22e1b83a66af067ab256312b567aa 100644 (file)
--- a/sope-appserver/NGObjWeb/GNUmakefile
+++ b/sope-appserver/NGObjWeb/GNUmakefile
@@ -129,7 +129,7 @@ libNGObjWeb_OBJC_FILES = \
 
 BUNDLE_NAME      = SoCore
 BUNDLE_EXTENSION = .sxp
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SoProducts/4.3/
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SoProducts-4.3/
 
 SoCore_OBJC_FILES      = SoCoreProduct.m
 SoCore_RESOURCE_FILES  = SoObjects/product.plist Version

diff --git a/sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m b/sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m
index e642b0f23aa699cdb4874d8a9c699aed31a90536..a0f3dac9f2e2faf5d1d5d27611f3abb28cead3d7 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m
+++ b/sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m
@@ -256,8 +256,7 @@ static int debugOn = 0;
 #if !COCOA_Foundation_LIBRARY
     lPath = [lPath stringByAppendingPathComponent:@"Library"];
 #endif
-    lPath = [lPath stringByAppendingPathComponent:@"SoProducts"];
-    lPath = [lPath stringByAppendingPathComponent:@"4.3"];
+    lPath = [lPath stringByAppendingPathComponent:@"SoProducts-4.3"];
     
     if (![fm fileExistsAtPath:lPath isDirectory:&isDir])
       continue;

diff --git a/sope-appserver/NGObjWeb/Templates/WOApplication+Builders.m b/sope-appserver/NGObjWeb/Templates/WOApplication+Builders.m
index 8eb9d6ee7f4fe739ff13674b143abe3daf9546fb..8d84099a99dcf84f65c5d39d02419c7f3d9347f8 100644 (file)
--- a/sope-appserver/NGObjWeb/Templates/WOApplication+Builders.m
+++ b/sope-appserver/NGObjWeb/Templates/WOApplication+Builders.m
@@ -106,8 +106,7 @@
 #if !COCOA_Foundation_LIBRARY
     lPath = [lPath stringByAppendingPathComponent:@"Library"];
 #endif
-    lPath = [lPath stringByAppendingPathComponent:@"WOxElemBuilders"];
-    lPath = [lPath stringByAppendingPathComponent:@"4.3"];
+    lPath = [lPath stringByAppendingPathComponent:@"WOxElemBuilders-4.3"];
     
     if (![fm fileExistsAtPath:lPath isDirectory:&isDir])
       continue;

diff --git a/sope-appserver/SoOFS/ChangeLog b/sope-appserver/SoOFS/ChangeLog
index 1b981bb6f8fdf02e822117dd33210e8891e69c32..aa2933a3acaad629e7602ac8ecb8805179d1223c 100644 (file)
--- a/sope-appserver/SoOFS/ChangeLog
+++ b/sope-appserver/SoOFS/ChangeLog
@@ -1,5 +1,7 @@
 2004-08-24  Helge Hess  <helge.hess@skyrix.com>
 
+       * install product in Library/SoProducts-4.3/ (v4.3.5)
+       
        * install product in Library/SoProducts/4.3/ (v4.3.4)
 
 2004-08-23  Helge Hess  <helge.hess@opengroupware.org>

diff --git a/sope-appserver/SoOFS/GNUmakefile b/sope-appserver/SoOFS/GNUmakefile
index 79c4d220852488fd4798cf38fb5bbfeff3211fa3..3c87520c9759204dadc2fc2dfccda11a64be2ffb 100644 (file)
--- a/sope-appserver/SoOFS/GNUmakefile
+++ b/sope-appserver/SoOFS/GNUmakefile
@@ -52,7 +52,7 @@ libSoOFS_OBJC_FILES = \
 
 BUNDLE_NAME      = SoOFS
 BUNDLE_EXTENSION = .sxp
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SoProducts/4.3/
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SoProducts-4.3/
 
 SoOFS_OBJC_FILES       = SoOFSProduct.m
 SoOFS_RESOURCE_FILES   = product.plist Version

diff --git a/sope-appserver/SoOFS/Version b/sope-appserver/SoOFS/Version
index 9d93031b2c14602d3af70ada8fe43b6eda356ce9..d1646130b383b0ffd643ec15ead84ab41281eb5e 100644 (file)
--- a/sope-appserver/SoOFS/Version
+++ b/sope-appserver/SoOFS/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=4
+SUBMINOR_VERSION:=5

diff --git a/sope-appserver/WEExtensions/ChangeLog b/sope-appserver/WEExtensions/ChangeLog
index d2b8cdaa8486305445bc08f7f3e766dee26fd18f..5d0146dc9e39a656c49e93100441c24e5d10466a 100644 (file)
--- a/sope-appserver/WEExtensions/ChangeLog
+++ b/sope-appserver/WEExtensions/ChangeLog
@@ -1,5 +1,7 @@
 2004-08-24  Helge Hess  <helge.hess@skyrix.com>
 
+       * install bundle in Library/WOxElemBuilders-4.3/ (v4.3.57)
+       
        * install (elem builder) bundle in Library/WOxElemBuilders/4.3/
          (v4.3.56)
 

diff --git a/sope-appserver/WEExtensions/GNUmakefile b/sope-appserver/WEExtensions/GNUmakefile
index 9157fddf0b0a1cbb2577b5cfed5022bec61644f1..d2a0057dd61f284f2caea0d585cec2ec1cebdb1e 100644 (file)
--- a/sope-appserver/WEExtensions/GNUmakefile
+++ b/sope-appserver/WEExtensions/GNUmakefile
@@ -6,7 +6,7 @@ include ./Version
 
 LIBRARY_NAME = libWEExtensions
 BUNDLE_NAME  = WEExtensions
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders/4.3/
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-4.3/
 
 libWEExtensions_HEADER_FILES_DIR         = .
 libWEExtensions_HEADER_FILES_INSTALL_DIR = /WEExtensions

diff --git a/sope-appserver/WEExtensions/Version b/sope-appserver/WEExtensions/Version
index bc613e3d15a1b083d6abc45707dffd212d43d641..33ff92fa59afb607bc43c639e1e1e5ffb24ebeea 100644 (file)
--- a/sope-appserver/WEExtensions/Version
+++ b/sope-appserver/WEExtensions/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=56
+SUBMINOR_VERSION:=57

diff --git a/sope-appserver/WOExtensions/ChangeLog b/sope-appserver/WOExtensions/ChangeLog
index 302687d85817eb1ef599f1909ebe881dea1bfe05..86fdf2e7d1fa25053fd3b7f4b77a8540dc58498d 100644 (file)
--- a/sope-appserver/WOExtensions/ChangeLog
+++ b/sope-appserver/WOExtensions/ChangeLog
@@ -1,5 +1,7 @@
 2004-08-24  Helge Hess  <helge.hess@skyrix.com>
 
+       * install bundle in Library/WOxElemBuilders-4.3/ (v4.3.57)
+
        * v4.3.56
 
        * added a bundle manager class (WOExtensionsBuilderModule)

diff --git a/sope-appserver/WOExtensions/GNUmakefile b/sope-appserver/WOExtensions/GNUmakefile
index 578ffe3f45e987ffcb8bbb449f735315c8c28d0c..9f77036a1b52058efc712aae4cf4b1b902096130 100644 (file)
--- a/sope-appserver/WOExtensions/GNUmakefile
+++ b/sope-appserver/WOExtensions/GNUmakefile
@@ -6,7 +6,7 @@ include ./Version
 
 LIBRARY_NAME = libWOExtensions
 BUNDLE_NAME  = WOExtensions
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders/4.3/
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-4.3/
 
 libWOExtensions_HEADER_FILES_DIR        = .
 libWOExtensions_HEADER_FILES_INSTALL_DIR = /WOExtensions

diff --git a/sope-appserver/WOExtensions/Version b/sope-appserver/WOExtensions/Version
index 27f42dca521c102631a68b11d5a0fab575d2dd28..33dfbe1b04726220aa5142e7e070a02c182f5657 100644 (file)
--- a/sope-appserver/WOExtensions/Version
+++ b/sope-appserver/WOExtensions/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=16
+SUBMINOR_VERSION:=17

diff --git a/sope-ical/iCalSaxDriver/ChangeLog b/sope-ical/iCalSaxDriver/ChangeLog
index caba1533a9324ca3854368f1c72fa611246fedf9..98ac342bb06b37b3656eaf420c9b1c3518480c50 100644 (file)
--- a/sope-ical/iCalSaxDriver/ChangeLog
+++ b/sope-ical/iCalSaxDriver/ChangeLog
@@ -1,5 +1,7 @@
 2004-08-24  Helge Hess  <helge.hess@skyrix.com>
 
+       * GNUmakefile: install SAX driver in Library/SaxDrivers-4.3/ (v4.3.12)
+       
        * GNUmakefile: install SAX driver in Library/SaxDrivers/4.3/ (v4.3.11)
 
 2004-08-20  Helge Hess  <helge.hess@opengroupware.org>

diff --git a/sope-ical/iCalSaxDriver/GNUmakefile b/sope-ical/iCalSaxDriver/GNUmakefile
index 03a32ac61c51606253ba58075468843facfbc851..7920d30bf33bd2ef2d56b39769e0381822ea42fe 100644 (file)
--- a/sope-ical/iCalSaxDriver/GNUmakefile
+++ b/sope-ical/iCalSaxDriver/GNUmakefile
@@ -4,7 +4,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
 
 BUNDLE_NAME        = iCalSaxDriver
 BUNDLE_EXTENSION   = .sax
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers/4.3/
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers-4.3/
 
 iCalSaxDriver_OBJC_FILES = \
        ICalSaxParser.m         \

diff --git a/sope-ical/iCalSaxDriver/Version b/sope-ical/iCalSaxDriver/Version
index c351558f441a4d159527ee99c46d76a467ff4349..9cef79939ea704d51f0e6725b9964991d0cafe31 100644 (file)
--- a/sope-ical/iCalSaxDriver/Version
+++ b/sope-ical/iCalSaxDriver/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=11
+SUBMINOR_VERSION:=12

diff --git a/sope-xml/STXSaxDriver/ChangeLog b/sope-xml/STXSaxDriver/ChangeLog
index 41b8f2509218d12aaa999b8e46cd22dd3f4bddf3..57f4747c25442e5aa4e388279971174209dfbed2 100644 (file)
--- a/sope-xml/STXSaxDriver/ChangeLog
+++ b/sope-xml/STXSaxDriver/ChangeLog
@@ -1,5 +1,7 @@
 2004-08-24  Helge Hess  <helge.hess@skyrix.com>
 
+       * GNUmakefile: install SAX driver in Library/SaxDrivers-4.3/ (v1.0.8)
+
        * GNUmakefile: install SAX driver in Library/SaxDrivers/4.3/ (v1.0.7)
 
 2004-05-05  Marcus Mueller  <znek@mulle-kybernetik.com>  

diff --git a/sope-xml/STXSaxDriver/GNUmakefile b/sope-xml/STXSaxDriver/GNUmakefile
index 47f6c69604993758a802e613dd99f82ca20413f3..b1e4b0c588475967e73d5bf222471ece5d5bed70 100644 (file)
--- a/sope-xml/STXSaxDriver/GNUmakefile
+++ b/sope-xml/STXSaxDriver/GNUmakefile
@@ -4,7 +4,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
 
 BUNDLE_NAME        = STXSaxDriver
 BUNDLE_EXTENSION   = .sax
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers/4.3/
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers-4.3/
 
 STXSaxDriver_OBJC_FILES += \
        STXSaxDriver.m  \

diff --git a/sope-xml/STXSaxDriver/Version b/sope-xml/STXSaxDriver/Version
index 72918f18aabe4e901a33c6e0d4d153721dc05bfc..fa740e0292b6d0446a6c1d797716345fe9fcea62 100644 (file)
--- a/sope-xml/STXSaxDriver/Version
+++ b/sope-xml/STXSaxDriver/Version
@@ -2,4 +2,4 @@
 
 MAJOR_VERSION=1
 MINOR_VERSION=0
-SUBMINOR_VERSION:=7
+SUBMINOR_VERSION:=8

diff --git a/sope-xml/SaxObjC/ChangeLog b/sope-xml/SaxObjC/ChangeLog
index 8dcca0117db91b8ffb6a41840fe457bb3a0c9fda..0b860c700d8f1488549296a09e2c416e2043d621 100644 (file)
--- a/sope-xml/SaxObjC/ChangeLog
+++ b/sope-xml/SaxObjC/ChangeLog
@@ -1,5 +1,8 @@
 2004-08-24  Helge Hess  <helge.hess@skyrix.com>
 
+       * changed lookup path to SaxDrivers-4.3 to be consistent with OGo
+         (v4.3.40)
+
        * SaxXMLReaderFactory.m: lookup SAX drivers in Library/SaxDrivers/4.3
          (v4.3.39)
 

diff --git a/sope-xml/SaxObjC/SaxXMLReaderFactory.m b/sope-xml/SaxObjC/SaxXMLReaderFactory.m
index 8a92e16ffdfd837224fbc1d4882157587166d583..7a6098e0599b2781b6fe3fc00d83c75a61e09688 100644 (file)
--- a/sope-xml/SaxObjC/SaxXMLReaderFactory.m
+++ b/sope-xml/SaxObjC/SaxXMLReaderFactory.m
@@ -86,8 +86,7 @@ static id      factory       = nil;
       
       e = [tmp objectEnumerator];
       while ((tmp = [e nextObject])) {
-        tmp = [tmp stringByAppendingPathComponent:@"SaxDrivers"];
-        tmp = [tmp stringByAppendingPathComponent:@"4.3"];
+        tmp = [tmp stringByAppendingPathComponent:@"SaxDrivers-4.3"];
         if (![ma containsObject:tmp])
           [ma addObject:tmp];
       }
@@ -113,7 +112,7 @@ static id      factory       = nil;
       
       e = [tmp objectEnumerator];
       while ((tmp = [e nextObject])) {
-        tmp = [tmp stringByAppendingPathComponent:@"Library/SaxDrivers/4.3"];
+        tmp = [tmp stringByAppendingPathComponent:@"Library/SaxDrivers-4.3"];
         if (![ma containsObject:tmp])
           [ma addObject:tmp];
       }

diff --git a/sope-xml/SaxObjC/Version b/sope-xml/SaxObjC/Version
index 760afe2d42040b34cb2f81900f7858995e07f5ee..d3d7995a946cb8741ec4e7a9dcf1b0a92263088a 100644 (file)
--- a/sope-xml/SaxObjC/Version
+++ b/sope-xml/SaxObjC/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=39
+SUBMINOR_VERSION:=40

diff --git a/sope-xml/libxmlSAXDriver/ChangeLog b/sope-xml/libxmlSAXDriver/ChangeLog
index 3800bf912a7ab155d78de690bb5fa1b09b0b7430..f83bdc214bacfa4023c9e355c97e4e770cc60af9 100644 (file)
--- a/sope-xml/libxmlSAXDriver/ChangeLog
+++ b/sope-xml/libxmlSAXDriver/ChangeLog
@@ -1,5 +1,7 @@
 2004-08-24  Helge Hess  <helge.hess@skyrix.com>
 
+       * GNUmakefile: install SAX driver in Library/SaxDrivers-4.3/ (v4.3.15)
+       
        * GNUmakefile: install SAX driver in Library/SaxDrivers/4.3/ (v4.3.14)
 
 2004-05-07  Helge Hess  <helge.hess@skyrix.com>

diff --git a/sope-xml/libxmlSAXDriver/GNUmakefile b/sope-xml/libxmlSAXDriver/GNUmakefile
index 294163021ce582cfb829283c6d9b08b8ba862065..71646f8d5e8ceca251ce5522cbc27107f9d17a9d 100644 (file)
--- a/sope-xml/libxmlSAXDriver/GNUmakefile
+++ b/sope-xml/libxmlSAXDriver/GNUmakefile
@@ -4,7 +4,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
 
 BUNDLE_NAME        = libxmlSAXDriver
 BUNDLE_EXTENSION   = .sax
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers/4.3/
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers-4.3/
 
 libxmlSAXDriver_OBJC_FILES = \
        libxmlSAXDriver.m       \

diff --git a/sope-xml/libxmlSAXDriver/Version b/sope-xml/libxmlSAXDriver/Version
index cc039aca8fe720e89b35bf8bb715cdccb043159e..cf9e5c1262bbe256db9dcbe38538f8ad07693b99 100644 (file)
--- a/sope-xml/libxmlSAXDriver/Version
+++ b/sope-xml/libxmlSAXDriver/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=14
+SUBMINOR_VERSION:=15

diff --git a/sope-xml/pyxSAXDriver/ChangeLog b/sope-xml/pyxSAXDriver/ChangeLog
index 98320cf4c026dd92cc35e2d040b9d86092bb2d6a..5cafdd1ba3834e00e81025632b9c3ef5bf228089 100644 (file)
--- a/sope-xml/pyxSAXDriver/ChangeLog
+++ b/sope-xml/pyxSAXDriver/ChangeLog
@@ -1,5 +1,7 @@
 2004-08-24  Helge Hess  <helge.hess@skyrix.com>
 
+       * GNUmakefile: install SAX driver in Library/SaxDrivers-4.3/
+       
        * GNUmakefile: install SAX driver in Library/SaxDrivers/4.3/
 
 2004-05-05  Marcus Mueller  <znek@mulle-kybernetik.com>  

diff --git a/sope-xml/pyxSAXDriver/GNUmakefile b/sope-xml/pyxSAXDriver/GNUmakefile
index 3bf8ee1c7c521e913a2206179d526e981137b3bb..67a95f98a11bda13dc98dc5fa892132582e4c4b8 100644 (file)
--- a/sope-xml/pyxSAXDriver/GNUmakefile
+++ b/sope-xml/pyxSAXDriver/GNUmakefile
@@ -4,7 +4,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
 
 BUNDLE_NAME        = pyxSAXDriver
 BUNDLE_EXTENSION   = .sax
-BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SaxDrivers/4.3/
+BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SaxDrivers-4.3/
 
 pyxSAXDriver_OBJC_FILES = pyxSAXDriver.m