From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Wed, 22 Feb 2006 11:55:06 +0000 (+0000)
Subject: improved versioning support
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1b7f93635ed1283228658f3b427b9716f873c34;p=sope

improved versioning support


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

diff --git a/maintenance/ChangeLog b/maintenance/ChangeLog
index 511747a8..c0ef835d 100644
--- a/maintenance/ChangeLog
+++ b/maintenance/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-09  Helge Hess  <helge.hess@opengroupware.org>
+
+	* make-osxmpkg.sh, make-osxpkg.sh: improved versioning support
+
 2005-09-28  Helge Hess  <helge.hess@opengroupware.org>
 
 	* started make-osxdmg.sh script
diff --git a/maintenance/make-osxmpkg.sh b/maintenance/make-osxmpkg.sh
index e598be75..081f0254 100755
--- a/maintenance/make-osxmpkg.sh
+++ b/maintenance/make-osxmpkg.sh
@@ -11,7 +11,13 @@ oldpwd="$PWD"
 PKG_BUILD_DIR="$PWD/osxpkgbuild"
 PKG_DIR="$PKG_BUILD_DIR/${PKG_NAME}.mpkg"
 PKG_RSRC_DIR="$PKG_BUILD_DIR/${PKG_NAME}.mpkg/Contents/Resources"
-PKG_VERSION="4.5"
+
+# TODO: make that arguments
+PKG_MAJOR_VERSION=4
+PKG_MINOR_VERSION=5
+PKG_SUBMINOR_VERSION=trunk
+
+PKG_VERSION="${PKG_MAJOR_VERSION}.${PKG_MINOR_VERSION}.${PKG_SUBMINOR_VERSION}"
 ROOT_DIR="$PKG_BUILD_DIR/Packages"
 
 CHECK_XML="yes"
@@ -139,8 +145,8 @@ function genInfoPList() {
   echo >>$F "<plist version=\"1.0\">"
   echo >>$F "  <dict>"
 
-  plistWriteString >>$F IFMajorVersion 4
-  plistWriteString >>$F IFMinorVersion 5
+  plistWriteString >>$F IFMajorVersion ${PKG_MAJOR_VERSION}
+  plistWriteString >>$F IFMinorVersion ${PKG_MINOR_VERSION}
 
   plistWriteDate   >>$F IFPkgBuildDate "`date -u +%Y-%m-%dT%H:%M:%SZ`"
   plistWriteString >>$F IFPkgBuildVersion                 "${PKG_VERSION}"
@@ -205,10 +211,12 @@ function genVersionPList() {
   echo >>$F "<plist version=\"1.0\">"
   echo >>$F "  <dict>"
 
+  # TODO: find out about BuildVersion
   plistWriteString >>$F BuildVersion               4
-  plistWriteString >>$F CFBundleShortVersionString "4.5"
+  
+  plistWriteString >>$F CFBundleShortVersionString "${PKG_VERSION}"
   plistWriteString >>$F ProjectName                "${PKG_NAME}"
-  plistWriteString >>$F SourceVersion              45000
+  plistWriteString >>$F SourceVersion ${PKG_MAJOR_VERSION}${PKG_MINOR_VERSION}000
   
   # close plist
   echo >>$F "  </dict>"
@@ -294,8 +302,8 @@ function genPkgInfoFile() {
 function genPkgVersionFile() {
   F="${PKG_RSRC_DIR}/package_version"
   echo -n "  gen package_version: $F .."
-  echo >$F  "major: 4"
-  echo >>$F "minor: 5"
+  echo >$F  "major: ${PKG_MAJOR_VERSION}"
+  echo >>$F "minor: ${PKG_MINOR_VERSION}"
   echo ".. done."
 }
 
diff --git a/maintenance/make-osxpkg.sh b/maintenance/make-osxpkg.sh
index 2c7c53c7..4808cfee 100755
--- a/maintenance/make-osxpkg.sh
+++ b/maintenance/make-osxpkg.sh
@@ -13,7 +13,13 @@ oldpwd="$PWD"
 PKG_BUILD_DIR="$PWD/osxpkgbuild"
 PKG_DIR="$PKG_BUILD_DIR/${PKG_NAME}.pkg"
 PKG_RSRC_DIR="$PKG_BUILD_DIR/${PKG_NAME}.pkg/Contents/Resources"
-PKG_VERSION="4.5"
+
+# TODO: make that arguments
+PKG_MAJOR_VERSION=4
+PKG_MINOR_VERSION=5
+PKG_SUBMINOR_VERSION=trunk
+
+PKG_VERSION="${PKG_MAJOR_VERSION}.${PKG_MINOR_VERSION}.${PKG_SUBMINOR_VERSION}"
 ROOT_DIR="$PKG_BUILD_DIR/root"
 
 CHECK_XML="yes"
@@ -202,8 +208,8 @@ function genInfoPList() {
   plistWriteString >>$F CFBundleName       "${PKG_NAME}"
   plistWriteString >>$F CFBundleShortVersionString "${PKG_VERSION}"
   
-  plistWriteString >>$F IFMajorVersion 4
-  plistWriteString >>$F IFMinorVersion 5
+  plistWriteString >>$F IFMajorVersion ${PKG_MAJOR_VERSION}
+  plistWriteString >>$F IFMinorVersion ${PKG_MINOR_VERSION}
   
   plistWriteDate   >>$F IFPkgBuildDate "`date -u +%Y-%m-%dT%H:%M:%SZ`"
   plistWriteString >>$F IFPkgBuildVersion                 "${PKG_VERSION}"
@@ -360,8 +366,8 @@ function genPkgInfoFile() {
 function genPkgVersionFile() {
   F="${PKG_RSRC_DIR}/package_version"
   echo -n "  gen package_version: $F .."
-  echo >$F  "major: 4"
-  echo >>$F "minor: 5"
+  echo >$F  "major: ${PKG_MAJOR_VERSION}"
+  echo >>$F "minor: ${PKG_MINOR_VERSION}"
   echo ".. done."
 }