diff --git a/checkin_notes b/checkin_notes index 48ad7e28f8..443999d538 100755 --- a/checkin_notes +++ b/checkin_notes @@ -6348,3 +6348,11 @@ Rom 17 June 2007 clientgui/ Events.h ViewWork.cpp, .h + +Charlie 19 June 2007 + - Mac: Fix visible copyright and version strings in installer and + uninstaller. + + mac_build/ + boinc.xcodeproj/ + project.pbxproj diff --git a/mac_build/English.lproj/InfoPlist.strings b/mac_build/English.lproj/InfoPlist.strings index 7e49711dfe..0e61755549 100755 --- a/mac_build/English.lproj/InfoPlist.strings +++ b/mac_build/English.lproj/InfoPlist.strings @@ -1,5 +1,5 @@ /* Localized versions of Info.plist keys */ CFBundleName = "BOINC"; -CFBundleShortVersionString = "BOINC version 5.10.5"; -CFBundleGetInfoString = "BOINC version 5.10.5, Copyright 2006 University of California."; +CFBundleShortVersionString = "BOINC version 5.10.7"; +CFBundleGetInfoString = "BOINC version 5.10.7, Copyright 2006 University of California."; diff --git a/mac_build/Info.plist b/mac_build/Info.plist index f41286d6b6..2c9258ecbf 100644 --- a/mac_build/Info.plist +++ b/mac_build/Info.plist @@ -17,6 +17,6 @@ CFBundleSignature BNC! CFBundleVersion - 5.10.5 + 5.10.7 diff --git a/mac_build/Installer-Info.plist b/mac_build/Installer-Info.plist index b54b4a5ee2..20f3629a98 100644 --- a/mac_build/Installer-Info.plist +++ b/mac_build/Installer-Info.plist @@ -8,8 +8,6 @@ BOINC Installer CFBundleIconFile MacInstaller.icns - CFBundleGetInfoString - BOINC Installer version 5.10.2, Copyright 2007 University of California. CFBundleIdentifier edu.berkeley.boinc.Installer CFBundleInfoDictionaryVersion @@ -20,9 +18,7 @@ ???? CFBundleName BOINC Installer - CFBundleShortVersionString - BOINC Installer version 5.10.2 CFBundleVersion - 5.10.5 + 5.10.7 diff --git a/mac_build/PostInstall-Info.plist b/mac_build/PostInstall-Info.plist index c1962e3888..b3f29f0cab 100644 --- a/mac_build/PostInstall-Info.plist +++ b/mac_build/PostInstall-Info.plist @@ -15,6 +15,6 @@ CFBundleSignature ???? CFBundleVersion - 5.10.5 + 5.10.7 diff --git a/mac_build/ScreenSaver-Info.plist b/mac_build/ScreenSaver-Info.plist index dca340251a..673b60d59b 100644 --- a/mac_build/ScreenSaver-Info.plist +++ b/mac_build/ScreenSaver-Info.plist @@ -17,7 +17,7 @@ CFBundleSignature ???? CFBundleVersion - 5.10.5 + 5.10.7 NSPrincipalClass BOINC_Saver_ModuleView diff --git a/mac_build/SystemMenu-Info.plist b/mac_build/SystemMenu-Info.plist index d0577c4726..164db44e68 100644 --- a/mac_build/SystemMenu-Info.plist +++ b/mac_build/SystemMenu-Info.plist @@ -15,6 +15,6 @@ CFBundleSignature ???? CFBundleVersion - 5.10.5 + 5.10.7 diff --git a/mac_build/Uninstaller-Info.plist b/mac_build/Uninstaller-Info.plist index c38ad4b558..bcd8b323c7 100644 --- a/mac_build/Uninstaller-Info.plist +++ b/mac_build/Uninstaller-Info.plist @@ -8,23 +8,17 @@ ${EXECUTABLE_NAME} CFBundleIconFile MacUninstaller.icns - CFBundleGetInfoString - Uninstall BOINC version 5.10.2, Copyright 2007 University of California. CFBundleIdentifier edu.berkeley.boinc.Uninstaller CFBundleInfoDictionaryVersion 6.0 + CFBundleName + Uninstall BOINC CFBundlePackageType APPL CFBundleSignature ???? CFBundleVersion - 5.10.5 - CFBundleName - Uninstall BOINC - CFBundleShortVersionString - Uninstall BOINC version 5.10.2 - CFBundleDevelopmentRegion - English + 5.10.7 diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj index 1eca39a5fd..e4f3e659ab 100755 --- a/mac_build/boinc.xcodeproj/project.pbxproj +++ b/mac_build/boinc.xcodeproj/project.pbxproj @@ -57,6 +57,8 @@ DD2EA06D0B4B20570073B1AA /* ViewTransfersGrid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD2EA0690B4B20570073B1AA /* ViewTransfersGrid.cpp */; }; DD2EA06F0B4B20570073B1AA /* ViewWorkGrid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD2EA06B0B4B20570073B1AA /* ViewWorkGrid.cpp */; }; DD2EA0850B4B22010073B1AA /* BOINCGridCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD2EA0830B4B22010073B1AA /* BOINCGridCtrl.cpp */; }; + DD32CC830C27CEFB0016F571 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F51BDF4903086C46012012A7 /* InfoPlist.strings */; }; + DD32CC8F0C27CF860016F571 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F51BDF4903086C46012012A7 /* InfoPlist.strings */; }; DD33C6F308B5BAF500768630 /* gui_http.C in Sources */ = {isa = PBXBuildFile; fileRef = DD33C6F108B5BAF500768630 /* gui_http.C */; }; DD33C6F808B5BB4500768630 /* acct_setup.C in Sources */ = {isa = PBXBuildFile; fileRef = DD33C6F708B5BB4500768630 /* acct_setup.C */; }; DD33C70408B5BEDE00768630 /* http_curl.C in Sources */ = {isa = PBXBuildFile; fileRef = DD33C70208B5BEDE00768630 /* http_curl.C */; }; @@ -1988,6 +1990,7 @@ DD46883D0C165F3C0089F500 /* Resources */, DD46883E0C165F3C0089F500 /* Sources */, DD46883F0C165F3C0089F500 /* Frameworks */, + DD32CC900C27CFB90016F571 /* ShellScript */, ); buildRules = ( ); @@ -2235,6 +2238,7 @@ buildActionMask = 2147483647; files = ( DD531BC60C193D3800742E50 /* MacInstaller.icns in Resources */, + DD32CC830C27CEFB0016F571 /* InfoPlist.strings in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2260,6 +2264,7 @@ buildActionMask = 2147483647; files = ( DD531BC80C193D5200742E50 /* MacUninstaller.icns in Resources */, + DD32CC8F0C27CF860016F571 /* InfoPlist.strings in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2289,7 +2294,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "cp -fpv \"${SRCROOT}/Installer-Info.plist\" \"${BUILT_PRODUCTS_DIR}/BOINC Installer.app/Contents/Info.plist\""; + shellScript = "sed -i \"\" s/BOINC/\"BOINC Installer\"/g \"${BUILT_PRODUCTS_DIR}/BOINC Installer.app/Contents/Resources/English.lproj/InfoPlist.strings\"\n"; }; DD1B90070A954C9A00FF5591 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -2304,6 +2309,21 @@ shellPath = /bin/sh; shellScript = "if [ \"$BUILD_STYLE\" != \"Deploy_noSandbox\" ] && [ \"$BUILD_STYLE\" != \"Dev_noSandbox\" ]; then\n chown -R ${USER}:${GROUP} \"${BUILT_PRODUCTS_DIR}/boinc\"\n chmod u+s,g+s \"${BUILT_PRODUCTS_DIR}/boinc\"\nfi"; }; + DD32CC900C27CFB90016F571 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${SRCROOT}/Uninstaller-Info.plist", + ); + outputPaths = ( + "${BUILT_PRODUCTS_DIR}/Uninstall BOINC.app/Contents/Info.plist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "sed -i \"\" s/BOINC/\"Uninstall BOINC\"/g \"${BUILT_PRODUCTS_DIR}/Uninstall BOINC.app/Contents/Resources/English.lproj/InfoPlist.strings\"\n"; + }; DD3E15370A774397007E0084 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 12;