Mac installer: update build scripts for naming consistency with other…

… platforms svn path=/trunk/boinc/; revision=24797
MrBrain295 · Dec 14, 2011 · 7a9aa01 · 7a9aa01
1 parent c396972
commit 7a9aa01
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/checkin_notes b/checkin_notes
@@ -9044,3 +9044,10 @@ Charlie 14 Dec 2011
         ptp_icon_play.png
     clientscr/res/
         ProgThruProc_ss_logo.png
+
+Charlie 14 Dec 2011
+    - Mac installer: update build scripts for naming consistency with other platforms.
+
+    mac_installer/
+        make_CharityEngine.sh
+        make_ProgThruProc.sh
diff --git a/mac_installer/make_CharityEngine.sh b/mac_installer/make_CharityEngine.sh
@@ -19,7 +19,7 @@
 
 ##
 # Script to convert Macintosh BOINC installer to Charity Engine Desktop installer
-# updated 12/7/11 by Charlie Fenton for BOINC 6.8.33 / 6.12.44 / 7.0.3 and later
+# updated 12/14/11 by Charlie Fenton for BOINC 6.8.34 / 6.12.44 / 7.0.3 and later
 ##
 
 ## Usage:
@@ -75,6 +75,7 @@ BRAND_NAME="Charity Engine"
 MANAGER_NAME="Charity Engine Desktop"
 LC_BRAND_NAME="Charity Engine"
 SOURCE_PKG_PATH="BOINC Installer.app/Contents/Resources/BOINC.pkg/Contents"
+ZIP_BRAND_NAME="ce"
 
 if [ $# -lt 3 ]; then
 echo "Usage:"
@@ -357,15 +358,15 @@ sudo rm -dfR "${SCRIPTS_PATH}"
 # Compress the products
 cd ${NEW_DIR_PATH}
 ## Use ditto instead of zip utility to preserve resource forks and Finder attributes (custom icon, hide extension) 
-ditto -ck --sequesterRsrc --keepParent "${LC_BRAND_NAME}_$1.$2.$3_macOSX_universal" "${LC_BRAND_NAME}_$1.$2.$3_macOSX_universal.zip"
+ditto -ck --sequesterRsrc --keepParent "${LC_BRAND_NAME}_$1.$2.$3_macOSX_universal" "${ZIP_BRAND_NAME}_$1.$2.$3_macOSX_universal.zip"
 ##### We've decided not to create branded command-line executables; they are identical to standard ones
-#### ditto -ck --sequesterRsrc --keepParent "${LC_BRAND_NAME}_$1.$2.$3_universal-apple-darwin" "${LC_BRAND_NAME}_$1.$2.$3_universal-apple-darwin.zip"
+#### ditto -ck --sequesterRsrc --keepParent "${LC_BRAND_NAME}_$1.$2.$3_universal-apple-darwin" "${ZIP_BRAND_NAME}_$1.$2.$3_universal-apple-darwin.zip"
 ##### We've decided not to create branded symbol table file; it is identical to standard one
-#### ditto -ck --sequesterRsrc --keepParent "${LC_BRAND_NAME}_$1.$2.$3_macOSX_SymbolTables" "${LC_BRAND_NAME}_$1.$2.$3_macOSX_SymbolTables.zip"
+#### ditto -ck --sequesterRsrc --keepParent "${LC_BRAND_NAME}_$1.$2.$3_macOSX_SymbolTables" "${ZIP_BRAND_NAME}_$1.$2.$3_macOSX_SymbolTables.zip"
 
 # Force Finder to recognize changed icons by deleting the uncompressed products and expanding the zip file 
 sudo rm -dfR "${LC_BRAND_NAME}_$1.$2.$3_macOSX_universal"
-open "${LC_BRAND_NAME}_$1.$2.$3_macOSX_universal.zip"
+open "${ZIP_BRAND_NAME}_$1.$2.$3_macOSX_universal.zip"
 
 popd
 exit 0
diff --git a/mac_installer/make_ProgThruProc.sh b/mac_installer/make_ProgThruProc.sh
@@ -19,7 +19,7 @@
 
 ##
 # Script to convert Macintosh BOINC installer to Progress Thru Processors Desktop installer
-# updated 12/7/11 by Charlie Fenton for BOINC 6.8.33 / 6.12.44 / 7.0.3 and later
+# updated 12/14/11 by Charlie Fenton for BOINC 6.8.34 / 6.12.44 / 7.0.3 and later
 ##
 
 ## Usage:
@@ -74,6 +74,8 @@ BRAND_NAME="Progress Thru Processors"
 MANAGER_NAME="Progress Thru Processors Desktop"
 LC_BRAND_NAME="Progress Thru Processors"
 SOURCE_PKG_PATH="BOINC Installer.app/Contents/Resources/BOINC.pkg/Contents"
+ZIP_BRAND_NAME="ptp"
+
 
 if [ $# -lt 3 ]; then
 echo "Usage:"
@@ -359,15 +361,15 @@ sudo rm -dfR "${SCRIPTS_PATH}"
 # Compress the products
 cd ${NEW_DIR_PATH}
 ## Use ditto instead of zip utility to preserve resource forks and Finder attributes (custom icon, hide extension) 
-ditto -ck --sequesterRsrc --keepParent "${LC_BRAND_NAME}_$1.$2.$3_macOSX_universal" "${LC_BRAND_NAME}_$1.$2.$3_macOSX_universal.zip"
+ditto -ck --sequesterRsrc --keepParent "${LC_BRAND_NAME}_$1.$2.$3_macOSX_universal" "${ZIP_BRAND_NAME}_$1.$2.$3_macOSX_universal.zip"
 ##### We've decided not to create branded command-line executables; they are identical to standard ones
-#### ditto -ck --sequesterRsrc --keepParent "${LC_BRAND_NAME}_$1.$2.$3_universal-apple-darwin" "${LC_BRAND_NAME}_$1.$2.$3_universal-apple-darwin.zip"
+#### ditto -ck --sequesterRsrc --keepParent "${LC_BRAND_NAME}_$1.$2.$3_universal-apple-darwin" "${ZIP_BRAND_NAME}_$1.$2.$3_universal-apple-darwin.zip"
 ##### We've decided not to create branded symbol table file; it is identical to standard one
-#### ditto -ck --sequesterRsrc --keepParent "${LC_BRAND_NAME}_$1.$2.$3_macOSX_SymbolTables" "${LC_BRAND_NAME}_$1.$2.$3_macOSX_SymbolTables.zip"
+#### ditto -ck --sequesterRsrc --keepParent "${LC_BRAND_NAME}_$1.$2.$3_macOSX_SymbolTables" "${ZIP_BRAND_NAME}_$1.$2.$3_macOSX_SymbolTables.zip"
 
 # Force Finder to recognize changed icons by deleting the uncompressed products and expanding the zip file 
 sudo rm -dfR "${LC_BRAND_NAME}_$1.$2.$3_macOSX_universal"
-open "${LC_BRAND_NAME}_$1.$2.$3_macOSX_universal.zip"
+open "${ZIP_BRAND_NAME}_$1.$2.$3_macOSX_universal.zip"
 
 popd
 exit 0