From 40468420c05fa336cea76f523cf45637895c44fc Mon Sep 17 00:00:00 2001 From: helge Date: Tue, 24 Aug 2004 16:10:56 +0000 Subject: [PATCH] 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 --- sope-appserver/NGObjWeb/ChangeLog | 3 +++ sope-appserver/NGObjWeb/GNUmakefile | 2 +- sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m | 3 +-- sope-appserver/NGObjWeb/Templates/WOApplication+Builders.m | 3 +-- sope-appserver/SoOFS/ChangeLog | 2 ++ sope-appserver/SoOFS/GNUmakefile | 2 +- sope-appserver/SoOFS/Version | 2 +- sope-appserver/WEExtensions/ChangeLog | 2 ++ sope-appserver/WEExtensions/GNUmakefile | 2 +- sope-appserver/WEExtensions/Version | 2 +- sope-appserver/WOExtensions/ChangeLog | 2 ++ sope-appserver/WOExtensions/GNUmakefile | 2 +- sope-appserver/WOExtensions/Version | 2 +- sope-ical/iCalSaxDriver/ChangeLog | 2 ++ sope-ical/iCalSaxDriver/GNUmakefile | 2 +- sope-ical/iCalSaxDriver/Version | 2 +- sope-xml/STXSaxDriver/ChangeLog | 2 ++ sope-xml/STXSaxDriver/GNUmakefile | 2 +- sope-xml/STXSaxDriver/Version | 2 +- sope-xml/SaxObjC/ChangeLog | 3 +++ sope-xml/SaxObjC/SaxXMLReaderFactory.m | 5 ++--- sope-xml/SaxObjC/Version | 2 +- sope-xml/libxmlSAXDriver/ChangeLog | 2 ++ sope-xml/libxmlSAXDriver/GNUmakefile | 2 +- sope-xml/libxmlSAXDriver/Version | 2 +- sope-xml/pyxSAXDriver/ChangeLog | 2 ++ sope-xml/pyxSAXDriver/GNUmakefile | 2 +- 27 files changed, 39 insertions(+), 22 deletions(-) diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index 7f800270..b2e0dbe5 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,5 +1,8 @@ 2004-08-24 Helge Hess + * 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 604f393a..4b4852aa 100644 --- 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 e642b0f2..a0f3dac9 100644 --- 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 8eb9d6ee..8d84099a 100644 --- 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 1b981bb6..aa2933a3 100644 --- a/sope-appserver/SoOFS/ChangeLog +++ b/sope-appserver/SoOFS/ChangeLog @@ -1,5 +1,7 @@ 2004-08-24 Helge Hess + * 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 diff --git a/sope-appserver/SoOFS/GNUmakefile b/sope-appserver/SoOFS/GNUmakefile index 79c4d220..3c87520c 100644 --- 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 9d93031b..d1646130 100644 --- 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 d2b8cdaa..5d0146dc 100644 --- a/sope-appserver/WEExtensions/ChangeLog +++ b/sope-appserver/WEExtensions/ChangeLog @@ -1,5 +1,7 @@ 2004-08-24 Helge Hess + * 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 9157fddf..d2a0057d 100644 --- 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 bc613e3d..33ff92fa 100644 --- 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 302687d8..86fdf2e7 100644 --- a/sope-appserver/WOExtensions/ChangeLog +++ b/sope-appserver/WOExtensions/ChangeLog @@ -1,5 +1,7 @@ 2004-08-24 Helge Hess + * 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 578ffe3f..9f77036a 100644 --- 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 27f42dca..33dfbe1b 100644 --- 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 caba1533..98ac342b 100644 --- a/sope-ical/iCalSaxDriver/ChangeLog +++ b/sope-ical/iCalSaxDriver/ChangeLog @@ -1,5 +1,7 @@ 2004-08-24 Helge Hess + * 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 diff --git a/sope-ical/iCalSaxDriver/GNUmakefile b/sope-ical/iCalSaxDriver/GNUmakefile index 03a32ac6..7920d30b 100644 --- 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 c351558f..9cef7993 100644 --- 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 41b8f250..57f4747c 100644 --- a/sope-xml/STXSaxDriver/ChangeLog +++ b/sope-xml/STXSaxDriver/ChangeLog @@ -1,5 +1,7 @@ 2004-08-24 Helge Hess + * 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 diff --git a/sope-xml/STXSaxDriver/GNUmakefile b/sope-xml/STXSaxDriver/GNUmakefile index 47f6c696..b1e4b0c5 100644 --- 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 72918f18..fa740e02 100644 --- 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 8dcca011..0b860c70 100644 --- a/sope-xml/SaxObjC/ChangeLog +++ b/sope-xml/SaxObjC/ChangeLog @@ -1,5 +1,8 @@ 2004-08-24 Helge Hess + * 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 8a92e16f..7a6098e0 100644 --- 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 760afe2d..d3d7995a 100644 --- 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 3800bf91..f83bdc21 100644 --- a/sope-xml/libxmlSAXDriver/ChangeLog +++ b/sope-xml/libxmlSAXDriver/ChangeLog @@ -1,5 +1,7 @@ 2004-08-24 Helge Hess + * 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 diff --git a/sope-xml/libxmlSAXDriver/GNUmakefile b/sope-xml/libxmlSAXDriver/GNUmakefile index 29416302..71646f8d 100644 --- 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 cc039aca..cf9e5c12 100644 --- 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 98320cf4..5cafdd1b 100644 --- a/sope-xml/pyxSAXDriver/ChangeLog +++ b/sope-xml/pyxSAXDriver/ChangeLog @@ -1,5 +1,7 @@ 2004-08-24 Helge Hess + * GNUmakefile: install SAX driver in Library/SaxDrivers-4.3/ + * GNUmakefile: install SAX driver in Library/SaxDrivers/4.3/ 2004-05-05 Marcus Mueller diff --git a/sope-xml/pyxSAXDriver/GNUmakefile b/sope-xml/pyxSAXDriver/GNUmakefile index 3bf8ee1c..67a95f98 100644 --- 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 -- 2.39.5