diff --git a/checkin_notes b/checkin_notes index 861c37ec43..433e048e92 100644 --- a/checkin_notes +++ b/checkin_notes @@ -109,3 +109,10 @@ David 9 Jan 2009 work_fetch.cpp,h lib/ coproc.cpp + +Charlie Jan 10 2009 + - Mac: Fix build scripts for new locale source directory layout. + + mac_installer/ + release_GridRepublic.sh + release_boinc.sh diff --git a/mac_installer/release_GridRepublic.sh b/mac_installer/release_GridRepublic.sh index f4c6ffd060..5790abeb20 100644 --- a/mac_installer/release_GridRepublic.sh +++ b/mac_installer/release_GridRepublic.sh @@ -21,7 +21,7 @@ ## # Release Script for Macintosh GridRepublic Desktop by Charlie Fenton -## updated 9/3/08 by Charlie Fenton +## updated 1/8/09 by Charlie Fenton ## ## NOTE: This script is deprecated. @@ -145,15 +145,15 @@ cp -fpR "$BUILDPATH/BOINCSaver.saver" "${PR_PATH}/Library/Screen Savers/" ## Copy the localization files into the installer tree ## Old way copies CVS and *.po files which are not needed -## cp -fpR locale/client/ "${PR_PATH}/Library/Application Support/BOINC Data/locale" +## cp -fpR locale/ "${PR_PATH}/Library/Application Support/BOINC Data/locale" ## sudo rm -dfR "${PR_PATH}/Library/Application Support/BOINC Data/locale/CVS" ## New way copies only *.mo files (adapted from boinc/sea/make-tar.sh) ##### We've decided not to customize BOINC Data directory name for branding #### find locale/client -name '*.mo' | cut -d '/' -f 3 | awk -v PRPATH=${PR_PATH} -v BRANDNAME=${BRAND_NAME} '{print "\"" PRPATH "/Library/Application Support/" BRANDNAME " Data/locale/"$0"\""}' | xargs mkdir -p -#### find locale/client -name '*.mo' | cut -d '/' -f 3,4 | awk -v PRPATH=${PR_PATH} -v BRANDNAME=${BRAND_NAME} '{print "cp \"locale/client/"$0"\" \"" PRPATH "/Library/Application Support/" BRANDNAME " Data/locale/"$0"\""}' | bash -find locale/client -name '*.mo' | cut -d '/' -f 3 | awk -v PRPATH=${PR_PATH} '{print "\"" PRPATH "/Library/Application Support/BOINC Data/locale/"$0"\""}' | xargs mkdir -p -find locale/client -name '*.mo' | cut -d '/' -f 3,4 | awk -v PRPATH=${PR_PATH} '{print "cp \"locale/client/"$0"\" \"" PRPATH "/Library/Application Support/BOINC Data/locale/"$0"\""}' | bash +#### find locale/client -name '*.mo' | cut -d '/' -f 3,4 | awk -v PRPATH=${PR_PATH} -v BRANDNAME=${BRAND_NAME} '{print "cp \"locale/"$0"\" \"" PRPATH "/Library/Application Support/" BRANDNAME " Data/locale/"$0"\""}' | bash +find locale/client -name '*.mo' | cut -d '/' -f 2 | awk -v PRPATH=${PR_PATH} '{print "\"" PRPATH "/Library/Application Support/BOINC Data/locale/"$0"\""}' | xargs mkdir -p +find locale/client -name '*.mo' | cut -d '/' -f 2,3 | awk -v PRPATH=${PR_PATH} '{print "cp \"locale/"$0"\" \"" PRPATH "/Library/Application Support/BOINC Data/locale/"$0"\""}' | bash ## Modify for Grid Republic # Rename the Manager's bundle and its executable inside the bundle diff --git a/mac_installer/release_boinc.sh b/mac_installer/release_boinc.sh index 6a6aa84743..08405be131 100644 --- a/mac_installer/release_boinc.sh +++ b/mac_installer/release_boinc.sh @@ -21,7 +21,7 @@ ## # Release Script for Macintosh BOINC Manager 10/31/07 by Charlie Fenton -## updated 9/3/08 by Charlie Fenton +## updated 1/8/09 by Charlie Fenton ## ## Usage: @@ -117,11 +117,11 @@ cp -fpR $BUILDPATH/BOINCSaver.saver ../BOINC_Installer/Pkg_Root/Library/Screen\ ## Copy the localization files into the installer tree ## Old way copies CVS and *.po files which are not needed -## cp -fpR locale/client/ ../BOINC_Installer/Pkg_Root/Library/Application\ Support/BOINC\ Data/locale +## cp -fpR locale/ ../BOINC_Installer/Pkg_Root/Library/Application\ Support/BOINC\ Data/locale ## sudo rm -dfR ../BOINC_Installer/Pkg_Root/Library/Application\ Support/BOINC\ Data/locale/CVS ## New way copies only *.mo files (adapted from boinc/sea/make-tar.sh) -find locale/client -name '*.mo' | cut -d '/' -f 3 | awk '{print "\"../BOINC_Installer/Pkg_Root/Library/Application Support/BOINC Data/locale/"$0"\""}' | xargs mkdir -p -find locale/client -name '*.mo' | cut -d '/' -f 3,4 | awk '{print "cp \"locale/client/"$0"\" \"../BOINC_Installer/Pkg_Root/Library/Application Support/BOINC Data/locale/"$0"\""}' | bash +find locale -name '*.mo' | cut -d '/' -f 2 | awk '{print "\"../BOINC_Installer/Pkg_Root/Library/Application Support/BOINC Data/locale/"$0"\""}' | xargs mkdir -p +find locale -name '*.mo' | cut -d '/' -f 2,3 | awk '{print "cp \"locale/"$0"\" \"../BOINC_Installer/Pkg_Root/Library/Application Support/BOINC Data/locale/"$0"\""}' | bash ## Fix up ownership and permissions sudo chown -R root:admin ../BOINC_Installer/Pkg_Root/*