From 9ab7d909ad88c69ed2763dc1f51085f25aaf8bbb Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Tue, 8 Nov 2005 01:07:13 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=8825 --- checkin_notes | 10 ++++ mac_build/boinc.pbproj/project.pbxproj | 66 +------------------------- mac_installer/release_boinc.sh | 27 ++++++++--- 3 files changed, 31 insertions(+), 72 deletions(-) diff --git a/checkin_notes b/checkin_notes index aebae2faed..d6cdbdce79 100755 --- a/checkin_notes +++ b/checkin_notes @@ -13621,4 +13621,14 @@ Rom 7 Nov 2005 client/win/ hostinfo_win.cpp +Charlie 7 nov 2005 + - Mac: update scripts to be compatible with XCode 2.1 as well as 1.x. + + mac_build/ + boinc.pbproj/ + project.pbxproj + mac_installer/ + release_boinc.sh + + \ No newline at end of file diff --git a/mac_build/boinc.pbproj/project.pbxproj b/mac_build/boinc.pbproj/project.pbxproj index 43d4ac96aa..5a1248f539 100755 --- a/mac_build/boinc.pbproj/project.pbxproj +++ b/mac_build/boinc.pbproj/project.pbxproj @@ -365,7 +365,6 @@ }; DD095EF007D87AE900362260 = { buildPhases = ( - DDAECA2B07FA5F2400A7BC36, DD095EED07D87AE900362260, DD095EEE07D87AE900362260, DD095EEF07D87AE900362260, @@ -710,7 +709,6 @@ }; DD1277B2081F3D67007B5DE1 = { buildPhases = ( - DDAD19D609090899004E7DD0, DD1277AF081F3D67007B5DE1, DD1277B0081F3D67007B5DE1, DD1277B1081F3D67007B5DE1, @@ -2025,7 +2023,6 @@ }; DD40CDF807F0386A0096C645 = { buildPhases = ( - DDAD19BB09090731004E7DD0, DD40CDF507F0386A0096C645, DD40CDF607F0386A0096C645, DD40CDF707F0386A0096C645, @@ -4021,7 +4018,6 @@ DD96AFF80811075000A06F22 = { buildPhases = ( DDCDB29708CEDCE400E4F573, - DDAD19C3090907A7004E7DD0, DD96AFF50811075000A06F22, DD96AFF60811075000A06F22, DD96AFF70811075000A06F22, @@ -4137,36 +4133,6 @@ settings = { }; }; - DDAD19BB09090731004E7DD0 = { - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(TARGET_BUILD_DIR)/../../client/version.h", - ); - isa = PBXShellScriptBuildPhase; - outputPaths = ( - "$(TARGET_BUILD_DIR)/../SystemMenu-Info.plist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "./build/SetVersion\nmkdir -p \"$BUILD_DIR/boinc.build/mgr_boinc.build\"\ncp -fp \"$BUILD_DIR/../Info.plist\" \"$BUILD_DIR/boinc.build/mgr_boinc.build/Info.plist\"\nmkdir -p \"$BUILD_DIR/boinc.build/Installer.build\"\ncp -fp \"$BUILD_DIR/../Installer-Info.plist\" \"$BUILD_DIR/boinc.build/Installer.build/Info.plist\"\nmkdir -p \"$BUILD_DIR/boinc.build/ScreenSaver.build\"\ncp -fp \"$BUILD_DIR/../ScreenSaver-Info.plist\" \"$BUILD_DIR/boinc.build/ScreenSaver.build/Info.plist\"\nmkdir -p \"$BUILD_DIR/boinc.build/SystemMenu.build\"\ncp -fp \"$BUILD_DIR/../SystemMenu-Info.plist\" \"$BUILD_DIR/boinc.build/SystemMenu.build/Info.plist\"\n"; - }; - DDAD19C3090907A7004E7DD0 = { - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(TARGET_BUILD_DIR)/../../client/version.h", - ); - isa = PBXShellScriptBuildPhase; - outputPaths = ( - "$(TARGET_BUILD_DIR)/../ScreenSaver-Info.plist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "./build/SetVersion\nmkdir -p \"$BUILD_DIR/boinc.build/mgr_boinc.build\"\ncp -fp \"$BUILD_DIR/../Info.plist\" \"$BUILD_DIR/boinc.build/mgr_boinc.build/Info.plist\"\nmkdir -p \"$BUILD_DIR/boinc.build/Installer.build\"\ncp -fp \"$BUILD_DIR/../Installer-Info.plist\" \"$BUILD_DIR/boinc.build/Installer.build/Info.plist\"\nmkdir -p \"$BUILD_DIR/boinc.build/ScreenSaver.build\"\ncp -fp \"$BUILD_DIR/../ScreenSaver-Info.plist\" \"$BUILD_DIR/boinc.build/ScreenSaver.build/Info.plist\"\nmkdir -p \"$BUILD_DIR/boinc.build/SystemMenu.build\"\ncp -fp \"$BUILD_DIR/../SystemMenu-Info.plist\" \"$BUILD_DIR/boinc.build/SystemMenu.build/Info.plist\"\n"; - }; DDAD19CC09090824004E7DD0 = { containerPortal = 20286C28FDCF999611CA2CEA; isa = PBXContainerItemProxy; @@ -4191,21 +4157,6 @@ target = DDAEC9E007FA583B00A7BC36; targetProxy = DDAD19CE09090833004E7DD0; }; - DDAD19D609090899004E7DD0 = { - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(TARGET_BUILD_DIR)/../../client/version.h", - ); - isa = PBXShellScriptBuildPhase; - outputPaths = ( - "$(TARGET_BUILD_DIR)/../Installer-Info.plist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "./build/SetVersion\nmkdir -p \"$BUILD_DIR/boinc.build/mgr_boinc.build\"\ncp -fp \"$BUILD_DIR/../Info.plist\" \"$BUILD_DIR/boinc.build/mgr_boinc.build/Info.plist\"\nmkdir -p \"$BUILD_DIR/boinc.build/Installer.build\"\ncp -fp \"$BUILD_DIR/../Installer-Info.plist\" \"$BUILD_DIR/boinc.build/Installer.build/Info.plist\"\nmkdir -p \"$BUILD_DIR/boinc.build/ScreenSaver.build\"\ncp -fp \"$BUILD_DIR/../ScreenSaver-Info.plist\" \"$BUILD_DIR/boinc.build/ScreenSaver.build/Info.plist\"\nmkdir -p \"$BUILD_DIR/boinc.build/SystemMenu.build\"\ncp -fp \"$BUILD_DIR/../SystemMenu-Info.plist\" \"$BUILD_DIR/boinc.build/SystemMenu.build/Info.plist\"\n"; - }; DDAD19DE09090914004E7DD0 = { containerPortal = 20286C28FDCF999611CA2CEA; isa = PBXContainerItemProxy; @@ -4231,7 +4182,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "./build/SetVersion\nmkdir -p \"$BUILD_DIR/boinc.build/mgr_boinc.build\"\ncp -fp \"$BUILD_DIR/../Info.plist\" \"$BUILD_DIR/boinc.build/mgr_boinc.build/Info.plist\"\nmkdir -p \"$BUILD_DIR/boinc.build/Installer.build\"\ncp -fp \"$BUILD_DIR/../Installer-Info.plist\" \"$BUILD_DIR/boinc.build/Installer.build/Info.plist\"\nmkdir -p \"$BUILD_DIR/boinc.build/ScreenSaver.build\"\ncp -fp \"$BUILD_DIR/../ScreenSaver-Info.plist\" \"$BUILD_DIR/boinc.build/ScreenSaver.build/Info.plist\"\nmkdir -p \"$BUILD_DIR/boinc.build/SystemMenu.build\"\ncp -fp \"$BUILD_DIR/../SystemMenu-Info.plist\" \"$BUILD_DIR/boinc.build/SystemMenu.build/Info.plist\"\n"; + shellScript = "$BUILT_PRODUCTS_DIR/SetVersion\nmkdir -p \"$TEMP_FILES_DIR/../mgr_boinc.build\"\ncp -fp \"$BUILD_DIR/../Info.plist\" \"$TEMP_FILES_DIR/../mgr_boinc.build/Info.plist\"\nmkdir -p \"$TEMP_FILES_DIR/../Installer.build\"\ncp -fp \"$BUILD_DIR/../Installer-Info.plist\" \"$TEMP_FILES_DIR/../Installer.build/Info.plist\"\nmkdir -p \"$TEMP_FILES_DIR/../ScreenSaver.build\"\ncp -fp \"$BUILD_DIR/../ScreenSaver-Info.plist\" \"$TEMP_FILES_DIR/../ScreenSaver.build/Info.plist\"\nmkdir -p \"$TEMP_FILES_DIR/../SystemMenu.build\"\ncp -fp \"$BUILD_DIR/../SystemMenu-Info.plist\" \"$TEMP_FILES_DIR/../SystemMenu.build/Info.plist\"\n"; }; DDADA51508BAC96200053BFB = { fileRef = 20286C33FDCF999611CA2CEA; @@ -4341,21 +4292,6 @@ target = DDAEC9E007FA583B00A7BC36; targetProxy = DDAECA2707FA5EE500A7BC36; }; - DDAECA2B07FA5F2400A7BC36 = { - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(TARGET_BUILD_DIR)/../../client/version.h", - ); - isa = PBXShellScriptBuildPhase; - outputPaths = ( - "$(TARGET_BUILD_DIR)/../English.lproj/InfoPlist.strings", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "./build/SetVersion\nmkdir -p \"$BUILD_DIR/boinc.build/mgr_boinc.build\"\ncp -fp \"$BUILD_DIR/../Info.plist\" \"$BUILD_DIR/boinc.build/mgr_boinc.build/Info.plist\"\nmkdir -p \"$BUILD_DIR/boinc.build/Installer.build\"\ncp -fp \"$BUILD_DIR/../Installer-Info.plist\" \"$BUILD_DIR/boinc.build/Installer.build/Info.plist\"\nmkdir -p \"$BUILD_DIR/boinc.build/ScreenSaver.build\"\ncp -fp \"$BUILD_DIR/../ScreenSaver-Info.plist\" \"$BUILD_DIR/boinc.build/ScreenSaver.build/Info.plist\"\nmkdir -p \"$BUILD_DIR/boinc.build/SystemMenu.build\"\ncp -fp \"$BUILD_DIR/../SystemMenu-Info.plist\" \"$BUILD_DIR/boinc.build/SystemMenu.build/Info.plist\"\n"; - }; DDB8D5A5081FC8C700A5A1E8 = { fileEncoding = 30; isa = PBXFileReference; diff --git a/mac_installer/release_boinc.sh b/mac_installer/release_boinc.sh index 6bc874cd80..421a4226b6 100644 --- a/mac_installer/release_boinc.sh +++ b/mac_installer/release_boinc.sh @@ -1,7 +1,7 @@ #!/bin/csh ## -# Release Script for Macintosh BOINC Manager 10/20/05 by Charlie Fenton +# Release Script for Macintosh BOINC Manager 11/7/05 by Charlie Fenton ## ## Usage: @@ -15,6 +15,19 @@ ## This will create a director "BOINC_Installer" in the parent directory of ## the current directory +if [ $# -lt 3 ]; then +echo "Usage:" +echo " cd [path]/boinc" +echo " source [path_to_this_script] major_version minor_version revision_number" +exit 0 +fi + +## XCode 2.x has separate directories for Development and Deployment build products +if [ -d mac_build/build/Deployment/ ]; then +BUILDPATH="mac_build/build/Deployment" +else +BUILDPATH="mac_build/build" +fi sudo rm -dfR ../BOINC_Installer/Installer\ Resources/ sudo rm -dfR ../BOINC_Installer/Pkg_Root @@ -26,7 +39,7 @@ cp -fp mac_installer/ReadMe.rtf ../BOINC_Installer/Installer\ Resources/ cp -fp mac_installer/postinstall ../BOINC_Installer/Installer\ Resources/ cp -fp mac_installer/postupgrade ../BOINC_Installer/Installer\ Resources/ -cp -fpR mac_build/build/Postinstall.app ../BOINC_Installer/Installer\ Resources/ +cp -fpR $BUILDPATH/Postinstall.app ../BOINC_Installer/Installer\ Resources/ mkdir -p ../BOINC_Installer/Pkg_Root mkdir -p ../BOINC_Installer/Pkg_Root/Applications @@ -36,9 +49,9 @@ mkdir -p ../BOINC_Installer/Pkg_Root/Library/Application\ Support mkdir -p ../BOINC_Installer/Pkg_Root/Library/Application\ Support/BOINC\ Data mkdir -p ../BOINC_Installer/Pkg_Root/Library/Application\ Support/BOINC\ Data/locale -cp -fpR mac_build/build/BOINCManager.app ../BOINC_Installer/Pkg_Root/Applications/ +cp -fpR $BUILDPATH/BOINCManager.app ../BOINC_Installer/Pkg_Root/Applications/ -cp -fpR mac_build/build/BOINCSaver.saver ../BOINC_Installer/Pkg_Root/Library/Screen\ Savers/ +cp -fpR $BUILDPATH/BOINCSaver.saver ../BOINC_Installer/Pkg_Root/Library/Screen\ Savers/ ## Copy the localization files into the installer tree ## Old way copies CVS and *.po files which are not needed @@ -74,12 +87,12 @@ cp -fp mac_installer/ReadMe.rtf ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1 sudo chown -R 501:wheel ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX/ReadMe.rtf sudo chmod -R 755 ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX/ReadMe.rtf -cp -fpR mac_build/build/boinc ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_powerpc-apple-darwin/ -cp -fpR mac_build/build/boinc_cmd ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_powerpc-apple-darwin/ +cp -fpR $BUILDPATH/boinc ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_powerpc-apple-darwin/ +cp -fpR $BUILDPATH/boinc_cmd ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_powerpc-apple-darwin/ sudo chown -R root:admin ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_powerpc-apple-darwin/* sudo chmod -R 755 ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_powerpc-apple-darwin/* -cp -fpR mac_build/build/SymbolTables ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_SymbolTables/ +cp -fpR $BUILDPATH/SymbolTables ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_SymbolTables/ /Developer/Tools/packagemaker -build -p ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX/BOINC.pkg -f ../BOINC_Installer/Pkg_Root -r ../BOINC_Installer/Installer\ Resources/ -i mac_build/Pkg-Info.plist -d mac_Installer/Description.plist -ds