support for revisions, i.e. no changes in extractor code, but in deps or the build process

2 files changed, 24 insertions, 3 deletions

diff --git a/contrib/macosx/Info.plist.in b/contrib/macosx/Info.plist.in
index b7b242e..939832e 100644
--- a/contrib/macosx/Info.plist.in
+++ b/contrib/macosx/Info.plist.in
@@ -9,7 +9,7 @@
         <key>CFBundleName</key>
         <string>Extractor</string>
         <key>CFBundleGetInfoString</key>
-        <string>@PACKAGE_STRING@, Copyright 2002-2008 Vidyut Samanta and Christian Grothoff</string>
+        <string>Extractor (@PACKAGE_STRING@), Copyright 2002-2008 Vidyut Samanta and Christian Grothoff</string>
         <key>CFBundleIconFile</key>
         <string></string>
         <key>CFBundleIdentifier</key>
@@ -19,10 +19,10 @@
         <key>CFBundlePackageType</key>
         <string>FMWK</string>
         <key>CFBundleShortVersionString</key>
-        <string>@PACKAGE_VERSION@-0</string>
+        <string>@PACKAGE_VERSION@</string>
         <key>CFBundleSignature</key>
         <string>????</string>
         <key>CFBundleVersion</key>
-        <string>Extractor @PACKAGE_VERSION@-0</string>
+        <string>Extractor @PACKAGE_VERSION@-@FRAMEWORK_REVISION@</string>
 </dict>
 </plist>
diff --git a/contrib/macosx/build-osx-framework.sh b/contrib/macosx/build-osx-framework.sh
index 4d21e14..1473dcc 100755
--- a/contrib/macosx/build-osx-framework.sh
+++ b/contrib/macosx/build-osx-framework.sh
@@ -561,6 +561,19 @@ copy_file_to_framework()
         fi
 }
 
+fill_framework_revision()
+{
+        local dst_file="${FINAL_FW_DIR}/$1"
+        if [ -e "$dst_file" ]
+        then
+                if ! ( sed -e "s/@FRAMEWORK_REVISION@/${FW_VERSION_REV}/g" -i "" "$dst_file" )
+                then
+                        echo "sed error"
+                        exit 1
+                fi
+        fi
+}
+
 make_framework_link()
 {
         local link_target="$1"
@@ -595,6 +608,13 @@ FINAL_FW_DIR="${FINAL_FW_BASE_DIR}/${FW_VERSION_DIR}"
 ORIG_DIR=$(pwd)
 old_umask=$(umask)
 
+if [ ! -n "$1" ]
+then
+  FW_VERSION_REV="1"
+else
+  FW_VERSION_REV="$1"
+fi  
+
 # prepare build env
 fetch_all_packages
 umask 022
@@ -657,6 +677,7 @@ do
 done
 cd "${ORIG_DIR}"
 copy_file_to_framework "./contrib/macosx/Info.plist" "Resources/Info.plist"
+fill_framework_revision "Resources/Info.plist"
 copy_file_to_framework "./contrib/macosx/English.lproj/InfoPlist.strings" "Resources/English.lproj/InfoPlist.strings"
 make_framework_link "lib/libextractor.dylib" "Extractor"
 make_framework_link "lib" "Libraries"