fixed versitSaxDriver install in SaxObjC framework

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

diff --git a/GNUmakefile b/GNUmakefile
index bf741d2f76547a48e6452c9438567bb0b1ea51c9..0b7b8afd38196a28fb0f1eedf87365cbc5f73442 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -48,3 +48,4 @@ macosx-pkg ::
          (cd $$i; $(MAKE) macosx-pkg); \
        done
        ./maintenance/make-osxmpkg.sh SOPE-4.5
+       ./maintenance/make-osxdmg.sh SOPE-4.5 osxpkgbuild "SOPE 4.5"

diff --git a/maintenance/make-osxdmg.sh b/maintenance/make-osxdmg.sh
index dee527bdad6b45a62fcf558acd132f38e3fff6f8..9089a9a84deffc89b2ddcb3f8024181763987be1 100755 (executable)
--- a/maintenance/make-osxdmg.sh
+++ b/maintenance/make-osxdmg.sh
@@ -99,7 +99,7 @@ echo "Building MacOSX DMG ${DMG_NAME}.dmg for $BIN_DIR .."
 calcSize;
 echo "  size: ${SIZE_KB}K"
 
-setupDisk "${DMG_NAME}.dmg"
+setupDisk "${DMG_NAME}-build-$$.dmg"
 
 echo -n "  coping content to disk .."
 cd $BIN_DIR
@@ -110,9 +110,9 @@ echo ".. done."
 # once again eject, to synchronize
 ejectDisk;
 
-REL_DMG="${DMG_NAME}-release.dmg"
-convertToReadOnlyCompressedImage "${DMG_NAME}.dmg" "${REL_DMG}"
+REL_DMG="${DMG_NAME}.dmg"
+convertToReadOnlyCompressedImage "${DMG_NAME}-build-$$.dmg" "${REL_DMG}"
 internetEnableDiskImage "${REL_DMG}"
 
 # delete src image
-rm -f "${DMG_NAME}.dmg"
+rm -f "${DMG_NAME}-build-$$.dmg"

diff --git a/maintenance/make-osxpkg.sh b/maintenance/make-osxpkg.sh
index f62259d1f05e6cca77e2b1c984887198aa43ae99..2c7c53c7c1cf903f5626ae85be5169816fe60316 100755 (executable)
--- a/maintenance/make-osxpkg.sh
+++ b/maintenance/make-osxpkg.sh
@@ -260,9 +260,6 @@ function genBundleVersions() {
   echo >>$F "  <dict>"
   
 
- # this makes reinstalls fail w/o any information (in Tiger)
- # TODO: => no, doesn't seem to change anything
- if test "x$WORKING_BUNDLE_VERSIONS" = "xyes"; then
   frameworks=`find "${ROOT_DIR}" -type d -name "*.framework"`
   for frameworkpath in $frameworks; do
     frameworkvfile="`find $frameworkpath -type f -name Version | head -n 1`"
@@ -284,7 +281,6 @@ function genBundleVersions() {
       echo "    Note: no Version file in framework `basename $frameworkpath`"
     fi
   done
- fi
   
   echo >>$F "  </dict>"
   echo >>$F "</plist>"

diff --git a/sope-ical/versitSaxDriver/ChangeLog b/sope-ical/versitSaxDriver/ChangeLog
index b45991ed9a0c1f6a4e714f929616ec7184dc953a..68b508c10ff81de69861daf006fec4ecaf386636 100644 (file)
--- a/sope-ical/versitSaxDriver/ChangeLog
+++ b/sope-ical/versitSaxDriver/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-28  Helge Hess  <helge.hess@opengroupware.org>
+
+       * GNUmakefile.preamble: install bundle in proper SaxObjC framework
+         location (v4.5.19)
+
 2005-08-16  Helge Hess  <helge.hess@opengroupware.org>
 
        * install into /Library/SaxDrivers-4.5 when compiling for frameworks

diff --git a/sope-ical/versitSaxDriver/GNUmakefile.preamble b/sope-ical/versitSaxDriver/GNUmakefile.preamble
index d9dfed07d68d196a6d3d189f425902c9bddfdf39..95fbfac6e9d165736603653fd529c79b4ef946bc 100644 (file)
--- a/sope-ical/versitSaxDriver/GNUmakefile.preamble
+++ b/sope-ical/versitSaxDriver/GNUmakefile.preamble
@@ -6,7 +6,7 @@ SOPE_OBJ_ROOT=$(GNUSTEP_BUILD_DIR)/$(SOPE_ROOT)
 ifeq ($(frameworks),yes)
 # hm, we might prefer /Library/SaxDrivers-$(MAJOR_VERSION).$(MINOR_VERSION)/
 # but this is harder with the FRAMEWORK_INSTALL_DIR
-BUNDLE_INSTALL_DIR := $(FRAMEWORK_INSTALL_DIR)/SaxObjC.framework/Resources/SaxDrivers/
+BUNDLE_INSTALL_DIR := $(FRAMEWORK_INSTALL_DIR)/SaxObjC.framework/Versions/A/Resources/SaxDrivers/
 endif
 
 

diff --git a/sope-ical/versitSaxDriver/Version b/sope-ical/versitSaxDriver/Version
index 5fbb9f75a1e39c91ec6279f771579685d6fdc7f9..b5a142f90fe8fb202495b3316d137539f1e78cd5 100644 (file)
--- a/sope-ical/versitSaxDriver/Version
+++ b/sope-ical/versitSaxDriver/Version
@@ -1,3 +1,3 @@
 # Version file
 
-SUBMINOR_VERSION:=18
+SUBMINOR_VERSION:=19