diff --git a/checkin_notes b/checkin_notes index cc59a7a8f8..3059b81b14 100644 --- a/checkin_notes +++ b/checkin_notes @@ -2485,8 +2485,22 @@ Charlie Mar 19 2008 officially supported APIs backtrace() and backtrace_symbols_fd() under OS 10.5 or later, continue to use older code on earlier systems without these APIs. + - Mac: Change back to saving unstripped Client and Manager executables for + symbol tables rather than separate .dSYM files, which cannot be loaded + by atos command-line utility. This also lets user substitute the + unstripped executable into application bundle to get backtraces with + symbols when debugging a crash in the field. Set visibility of all + variables in Client and Manager to not be hidden so they appear in + crash dumps. -lib/ - coproc.C - mac/ - mac_backtrace.C \ No newline at end of file + lib/ + coproc.C + mac/ + mac_backtrace.C + mac_build/ + boinc.xcodeproj/ + project.pbxproj + buildWxMac.sh + mac_installer/ + release_boinc.sh + release_GridRepublic.sh diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj index 023d0ddc18..dbb56ce92c 100755 --- a/mac_build/boinc.xcodeproj/project.pbxproj +++ b/mac_build/boinc.xcodeproj/project.pbxproj @@ -1612,8 +1612,10 @@ DD3E14DE0A774397007E0084 /* Sources */, DD3E15300A774397007E0084 /* Frameworks */, DD3E15350A774397007E0084 /* CopyFiles */, + DD73550C0D91105F0006A9D1 /* ShellScript */, DD3E15380A774397007E0084 /* ShellScript */, DD3E15390A774397007E0084 /* ShellScript */, + DDEE5E8E0D9112AF0056A99E /* ShellScript */, ); buildRules = ( ); @@ -1805,7 +1807,9 @@ buildPhases = ( DDD74D8407CF482E0065AC9D /* Sources */, DDD74D8507CF482E0065AC9D /* Frameworks */, + DD7355180D9110AE0006A9D1 /* ShellScript */, DD1B90070A954C9A00FF5591 /* ShellScript */, + DD73551E0D9111150006A9D1 /* ShellScript */, ); buildRules = ( ); @@ -2044,7 +2048,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ \"$BUILD_STYLE\" != \"Deploy_noSandbox\" ] && [ \"$BUILD_STYLE\" != \"Dev_noSandbox\" ]; then\n chown -R ${USER}:${GROUP} \"${BUILT_PRODUCTS_DIR}/BOINCManager.app\"\n chmod g+s \"${BUILT_PRODUCTS_DIR}/BOINCManager.app/Contents/MacOS/BOINCManager\"\n chmod u+s,g+s \"${BUILT_PRODUCTS_DIR}/BOINCManager.app/Contents/Resources/boinc\"\nfi"; + shellScript = "if [ \"$BUILD_STYLE\" != \"Deploy_noSandbox\" ] && [ \"$BUILD_STYLE\" != \"Dev_noSandbox\" ]; then\n chown -R ${USER}:${GROUP} \"${BUILT_PRODUCTS_DIR}/BOINCManager.app\"\n chmod g+s \"${BUILT_PRODUCTS_DIR}/BOINCManager.app/Contents/MacOS/BOINCManager\"\n chmod u+s,g+s \"${BUILT_PRODUCTS_DIR}/BOINCManager.app/Contents/Resources/boinc\"\nfi\n"; }; DD5FD5830A0232F30093C19F /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -2091,6 +2095,51 @@ shellPath = /bin/sh; shellScript = "cp -fpv \"${SRCROOT}/PostInstall-Info.plist\" \"${BUILT_PRODUCTS_DIR}/Postinstall.app/Contents/Info.plist\""; }; + DD73550C0D91105F0006A9D1 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${BUILT_PRODUCTS_DIR}/BOINCManager.app/Contents/MacOS/BOINCManager", + ); + outputPaths = ( + "${BUILT_PRODUCTS_DIR}/SymbolTables/sgBOINCManager_i386", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ \"$BUILD_STYLE\" = \"i386_Deployment\" ] || [ \"$BUILD_STYLE\" = \"ppc_Deployment\" ] || [ \"$BUILD_STYLE\" = \"Deployment\" ]; then\n mkdir \"${BUILT_PRODUCTS_DIR}/SymbolTables\"\n if [ \"${BUILT_PRODUCTS_DIR}/BOINCManager.app/Contents/MacOS/BOINCManager\" -nt \"$TARGET_BUILD_DIR/SymbolTables/BOINCManager_i386\" ]; then\n lipo \"${BUILT_PRODUCTS_DIR}/BOINCManager.app/Contents/MacOS/BOINCManager\" -thin i386 -output \"$TARGET_BUILD_DIR/SymbolTables/BOINCManager_i386\"\n lipo \"${BUILT_PRODUCTS_DIR}/BOINCManager.app/Contents/MacOS/BOINCManager\" -thin ppc -output \"$TARGET_BUILD_DIR/SymbolTables/BOINCManager_ppc\"\n /usr/bin/strip \"${BUILT_PRODUCTS_DIR}/BOINCManager.app/Contents/MacOS/BOINCManager\"\n\ttouch \"$TARGET_BUILD_DIR/SymbolTables/BOINCManager_i386\"\n\ttouch \"$TARGET_BUILD_DIR/SymbolTables/BOINCManager_ppc\"\n fi\nfi\n"; + }; + DD7355180D9110AE0006A9D1 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${BUILT_PRODUCTS_DIR}/$PRODUCT_NAME", + ); + outputPaths = ( + "${BUILT_PRODUCTS_DIR}/SymbolTables/${PRODUCT_NAME}_i386", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ \"$BUILD_STYLE\" = \"i386_Deployment\" ] || [ \"$BUILD_STYLE\" = \"ppc_Deployment\" ] || [ \"$BUILD_STYLE\" = \"Deployment-no64\" ] || [ \"$BUILD_STYLE\" = \"Deployment\" ]; then\n mkdir \"${BUILT_PRODUCTS_DIR}/SymbolTables\"\n if [ \"${BUILT_PRODUCTS_DIR}/$PRODUCT_NAME\" -nt \"$TARGET_BUILD_DIR/SymbolTables/${PRODUCT_NAME}_i386\" ]; then\n lipo \"${BUILT_PRODUCTS_DIR}/$PRODUCT_NAME\" -thin i386 -output \"$TARGET_BUILD_DIR/SymbolTables/${PRODUCT_NAME}_i386\"\n lipo \"${BUILT_PRODUCTS_DIR}/$PRODUCT_NAME\" -thin x86_64 -output \"$TARGET_BUILD_DIR/SymbolTables/${PRODUCT_NAME}_x86_64\"\n lipo \"${BUILT_PRODUCTS_DIR}/$PRODUCT_NAME\" -thin ppc -output \"$TARGET_BUILD_DIR/SymbolTables/${PRODUCT_NAME}_ppc\"\n /usr/bin/strip \"${BUILT_PRODUCTS_DIR}/$PRODUCT_NAME\"\n touch \"$TARGET_BUILD_DIR/SymbolTables/${PRODUCT_NAME}_i386\"\n touch \"$TARGET_BUILD_DIR/SymbolTables/${PRODUCT_NAME}_x86_64\"\n touch \"$TARGET_BUILD_DIR/SymbolTables/${PRODUCT_NAME}_ppc\"\n fi\nfi"; + }; + DD73551E0D9111150006A9D1 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${BUILT_PRODUCTS_DIR}/$PRODUCT_NAME", + ); + outputPaths = ( + "${BUILT_PRODUCTS_DIR}/SymbolTables/${PRODUCT_NAME}_i386", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ \"$BUILD_STYLE\" = \"i386_Deployment\" ] || [ \"$BUILD_STYLE\" = \"ppc_Deployment\" ] || [ \"$BUILD_STYLE\" = \"Deployment-no64\" ] || [ \"$BUILD_STYLE\" = \"Deployment\" ]; then\n touch \"$TARGET_BUILD_DIR/SymbolTables/${PRODUCT_NAME}_i386\"\n touch \"$TARGET_BUILD_DIR/SymbolTables/${PRODUCT_NAME}_x86_64\"\n touch \"$TARGET_BUILD_DIR/SymbolTables/${PRODUCT_NAME}_ppc\"\nfi"; + }; DDAD1A380909139E004E7DD0 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -2106,6 +2155,21 @@ shellPath = /bin/sh; shellScript = "# echo \"BuiltProductsDir = ${BUILT_PRODUCTS_DIR}\"\n# echo \"CONFIGURATIONTEMPDIR = ${CONFIGURATION_TEMP_DIR}\"\n# echo \"SRC ROOT = ${SRCROOT}\"\n# echo \"architecture = ${ARCHS}\"\n# echo \"native architecture = ${ARCHS}\"\n\"${BUILT_PRODUCTS_DIR}/SetVersion\"\n"; }; + DDEE5E8E0D9112AF0056A99E /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${BUILT_PRODUCTS_DIR}/$PRODUCT_NAME", + ); + outputPaths = ( + "${BUILT_PRODUCTS_DIR}/SymbolTables/${PRODUCT_NAME}_i386", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ \"$BUILD_STYLE\" = \"i386_Deployment\" ] || [ \"$BUILD_STYLE\" = \"ppc_Deployment\" ] || [ \"$BUILD_STYLE\" = \"Deployment\" ]; then\n\ttouch \"$TARGET_BUILD_DIR/SymbolTables/BOINCManager_i386\"\n\ttouch \"$TARGET_BUILD_DIR/SymbolTables/BOINCManager_ppc\"\nfi"; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -2685,9 +2749,15 @@ DD3E153E0A774397007E0084 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + DEPLOYMENT_POSTPROCESSING = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PFE_FILE_C_DIALECTS = "c++"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ../clientgui/mac/MacGUI.pch; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = ( "../../wxMac-2.8.7/src/build/include/", "../../wxMac-2.8.7/include", @@ -2726,16 +2796,23 @@ "-lm", ); PRODUCT_NAME = BOINCManager; + SKIP_INSTALL = NO; + STRIP_INSTALLED_PRODUCT = NO; }; name = Development; }; DD3E153F0A774397007E0084 /* ppc_Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - DEAD_CODE_STRIPPING = YES; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + DEPLOYMENT_POSTPROCESSING = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PFE_FILE_C_DIALECTS = "c++"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ../clientgui/mac/MacGUI.pch; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = ( "../../wxMac-2.8.7/src/build/include/", "../../wxMac-2.8.7/include", @@ -2774,17 +2851,23 @@ "-lm", ); PRODUCT_NAME = BOINCManager; - STRIP_INSTALLED_PRODUCT = YES; + SKIP_INSTALL = NO; + STRIP_INSTALLED_PRODUCT = NO; }; name = ppc_Deployment; }; DD3E15400A774397007E0084 /* i386_Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - DEAD_CODE_STRIPPING = YES; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + DEPLOYMENT_POSTPROCESSING = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PFE_FILE_C_DIALECTS = "c++"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ../clientgui/mac/MacGUI.pch; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = ( "../../wxMac-2.8.7/src/build/include/", "../../wxMac-2.8.7/include", @@ -2823,17 +2906,23 @@ "-lm", ); PRODUCT_NAME = BOINCManager; - STRIP_INSTALLED_PRODUCT = YES; + SKIP_INSTALL = NO; + STRIP_INSTALLED_PRODUCT = NO; }; name = i386_Deployment; }; DD3E15410A774397007E0084 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - DEAD_CODE_STRIPPING = YES; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + DEPLOYMENT_POSTPROCESSING = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PFE_FILE_C_DIALECTS = "c++"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ../clientgui/mac/MacGUI.pch; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = ( "../../wxMac-2.8.7/src/build/include/", "../../wxMac-2.8.7/include", @@ -2872,7 +2961,8 @@ "-lm", ); PRODUCT_NAME = BOINCManager; - STRIP_INSTALLED_PRODUCT = YES; + SKIP_INSTALL = NO; + STRIP_INSTALLED_PRODUCT = NO; }; name = Deployment; }; @@ -3041,6 +3131,11 @@ DD62C3870A801FB500B3D68A /* Dev_noSandbox */ = { isa = XCBuildConfiguration; buildSettings = { + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + DEPLOYMENT_POSTPROCESSING = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = "../../curl-7.17.1/include"; OTHER_LDFLAGS = ( "-framework", @@ -3053,6 +3148,8 @@ "-lz", ); PRODUCT_NAME = boinc; + SKIP_INSTALL = NO; + STRIP_INSTALLED_PRODUCT = NO; }; name = Dev_noSandbox; }; @@ -3063,6 +3160,11 @@ i386, ppc, ); + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + DEPLOYMENT_POSTPROCESSING = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = "../../curl-7.17.1/include"; OTHER_LDFLAGS = ( "../../curl-7.18.0/lib/.libs/libcurl.a", @@ -3073,6 +3175,8 @@ "-lz", ); PRODUCT_NAME = boinc; + SKIP_INSTALL = NO; + STRIP_INSTALLED_PRODUCT = NO; }; name = Deploy_noSandbox; }; @@ -3316,9 +3420,15 @@ DD62C39D0A801FB500B3D68A /* Dev_noSandbox */ = { isa = XCBuildConfiguration; buildSettings = { + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + DEPLOYMENT_POSTPROCESSING = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PFE_FILE_C_DIALECTS = "c++"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ../clientgui/mac/MacGUI.pch; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = ( "../../wxMac-2.8.7/src/build/include/", "../../wxMac-2.8.7/include", @@ -3356,16 +3466,23 @@ "-lm", ); PRODUCT_NAME = BOINCManager; + SKIP_INSTALL = NO; + STRIP_INSTALLED_PRODUCT = NO; }; name = Dev_noSandbox; }; DD62C39E0A801FB500B3D68A /* Deploy_noSandbox */ = { isa = XCBuildConfiguration; buildSettings = { - DEAD_CODE_STRIPPING = YES; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + DEPLOYMENT_POSTPROCESSING = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PFE_FILE_C_DIALECTS = "c++"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ../clientgui/mac/MacGUI.pch; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = ( "../../wxMac-2.8.7/src/build/include/", "../../wxMac-2.8.7/include", @@ -3403,7 +3520,8 @@ "-lm", ); PRODUCT_NAME = BOINCManager; - STRIP_INSTALLED_PRODUCT = YES; + SKIP_INSTALL = NO; + STRIP_INSTALLED_PRODUCT = NO; }; name = Deploy_noSandbox; }; @@ -3597,6 +3715,11 @@ DD9670690CED9A800009D32B /* Deployment-no64 */ = { isa = XCBuildConfiguration; buildSettings = { + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + DEPLOYMENT_POSTPROCESSING = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = "../../curl-7.17.1/include"; OTHER_LDFLAGS = ( "../../curl-7.18.0/lib/.libs/libcurl.a", @@ -3607,7 +3730,8 @@ "-lz", ); PRODUCT_NAME = boinc; - STRIP_INSTALLED_PRODUCT = YES; + SKIP_INSTALL = NO; + STRIP_INSTALLED_PRODUCT = NO; }; name = "Deployment-no64"; }; @@ -3760,10 +3884,15 @@ DD9670780CED9A800009D32B /* Deployment-no64 */ = { isa = XCBuildConfiguration; buildSettings = { - DEAD_CODE_STRIPPING = YES; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + DEPLOYMENT_POSTPROCESSING = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PFE_FILE_C_DIALECTS = "c++"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ../clientgui/mac/MacGUI.pch; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = ( "../../wxMac-2.8.7/src/build/include/", "../../wxMac-2.8.7/include", @@ -3802,7 +3931,8 @@ "-lm", ); PRODUCT_NAME = BOINCManager; - STRIP_INSTALLED_PRODUCT = YES; + SKIP_INSTALL = NO; + STRIP_INSTALLED_PRODUCT = NO; }; name = "Deployment-no64"; }; @@ -3890,6 +4020,11 @@ ppc, x86_64, ); + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + DEPLOYMENT_POSTPROCESSING = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = "../../curl-7.18.0/include"; OTHER_LDFLAGS = ( "../../curl-7.18.0/lib/.libs/libcurl.a", @@ -3900,7 +4035,8 @@ "-lz", ); PRODUCT_NAME = boinc; - STRIP_INSTALLED_PRODUCT = YES; + SKIP_INSTALL = NO; + STRIP_INSTALLED_PRODUCT = NO; }; name = Deployment; }; @@ -4141,6 +4277,11 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(NATIVE_ARCH_32_BIT)"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + DEPLOYMENT_POSTPROCESSING = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = "../../curl-7.17.1/include"; OTHER_LDFLAGS = ( "-framework", @@ -4153,6 +4294,8 @@ "-lz", ); PRODUCT_NAME = boinc; + SKIP_INSTALL = NO; + STRIP_INSTALLED_PRODUCT = NO; }; name = Development; }; @@ -4160,6 +4303,11 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = ppc; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + DEPLOYMENT_POSTPROCESSING = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = "../../curl-7.17.1/include"; OTHER_LDFLAGS = ( "../../curl-7.18.0/lib/.libs/libcurl.a", @@ -4170,6 +4318,8 @@ "-lz", ); PRODUCT_NAME = boinc; + SKIP_INSTALL = NO; + STRIP_INSTALLED_PRODUCT = NO; }; name = ppc_Deployment; }; @@ -4461,6 +4611,11 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = i386; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + DEPLOYMENT_POSTPROCESSING = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = "../../curl-7.17.1/include"; OTHER_LDFLAGS = ( "../../curl-7.18.0/lib/.libs/libcurl.a", @@ -4471,6 +4626,8 @@ "-lz", ); PRODUCT_NAME = boinc; + SKIP_INSTALL = NO; + STRIP_INSTALLED_PRODUCT = NO; }; name = i386_Deployment; }; diff --git a/mac_build/buildWxMac.sh b/mac_build/buildWxMac.sh index 328e6bee4c..5bb1d5a5c0 100644 --- a/mac_build/buildWxMac.sh +++ b/mac_build/buildWxMac.sh @@ -57,7 +57,7 @@ if [ "$1" != "-clean" ] && [ -f src/build/Deployment/libwx_mac_static.a ]; then echo "Deployment libwx_mac_static.a already built" else export DEVELOPER_SDK_DIR="/Developer/SDKs" - xcodebuild -project src/wxWindows.xcodeproj -target static -configuration Deployment $doclean build GCC_VERSION_ppc=4.0 MACOSX_DEPLOYMENT_TARGET_ppc=10.3 SDKROOT_ppc=/Developer/SDKs/MacOSX10.3.9.sdk GCC_VERSION_i386=4.0 MACOSX_DEPLOYMENT_TARGET_i386=10.4 SDKROOT_i386=/Developer/SDKs/MacOSX10.4u.sdk ARCHS="i386 ppc" OTHER_CPLUSPLUSFLAGS="-DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -fvisibility=hidden -fvisibility-inlines-hidden" + xcodebuild -project src/wxWindows.xcodeproj -target static -configuration Deployment $doclean build GCC_VERSION_ppc=4.0 MACOSX_DEPLOYMENT_TARGET_ppc=10.3 SDKROOT_ppc=/Developer/SDKs/MacOSX10.3.9.sdk GCC_VERSION_i386=4.0 MACOSX_DEPLOYMENT_TARGET_i386=10.4 SDKROOT_i386=/Developer/SDKs/MacOSX10.4u.sdk ARCHS="i386 ppc" OTHER_CPLUSPLUSFLAGS="-DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1" if [ $? -ne 0 ]; then return 1; fi fi @@ -66,10 +66,10 @@ if [ "$1" != "-clean" ] && [ -f src/build/Development/libwx_mac_static.a ]; then echo "Development libwx_mac_static.a already built" else export DEVELOPER_SDK_DIR="/Developer/SDKs" - xcodebuild -project src/wxWindows.xcodeproj -target static -configuration Development $doclean build GCC_VERSION_ppc=4.0 MACOSX_DEPLOYMENT_TARGET_ppc=10.3 SDKROOT_ppc=/Developer/SDKs/MacOSX10.3.9.sdk GCC_VERSION_i386=4.0 MACOSX_DEPLOYMENT_TARGET_i386=10.4 SDKROOT_i386=/Developer/SDKs/MacOSX10.4u.sdk OTHER_CPLUSPLUSFLAGS="-DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -fvisibility=hidden -fvisibility-inlines-hidden" + xcodebuild -project src/wxWindows.xcodeproj -target static -configuration Development $doclean build GCC_VERSION_ppc=4.0 MACOSX_DEPLOYMENT_TARGET_ppc=10.3 SDKROOT_ppc=/Developer/SDKs/MacOSX10.3.9.sdk GCC_VERSION_i386=4.0 MACOSX_DEPLOYMENT_TARGET_i386=10.4 SDKROOT_i386=/Developer/SDKs/MacOSX10.4u.sdk OTHER_CPLUSPLUSFLAGS="-DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1" ## The above line does Development build for only the native architecture. ## Use line below instead for Universal Binary Development build -## xcodebuild -project src/wxWindows.xcodeproj -target static -configuration Development $doclean build MACOSX_DEPLOYMENT_TARGET_ppc=10.3 SDKROOT_ppc=/Developer/SDKs/MacOSX10.3.9.sdk MACOSX_DEPLOYMENT_TARGET_i386=10.4 SDKROOT_i386=/Developer/SDKs/MacOSX10.4u.sdk ARCHS="i386 ppc" OTHER_CPLUSPLUSFLAGS="-DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -fvisibility=hidden -fvisibility-inlines-hidden" +## xcodebuild -project src/wxWindows.xcodeproj -target static -configuration Development $doclean build MACOSX_DEPLOYMENT_TARGET_ppc=10.3 SDKROOT_ppc=/Developer/SDKs/MacOSX10.3.9.sdk MACOSX_DEPLOYMENT_TARGET_i386=10.4 SDKROOT_i386=/Developer/SDKs/MacOSX10.4u.sdk ARCHS="i386 ppc" OTHER_CPLUSPLUSFLAGS="-DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -fvisibility=default" if [ $? -ne 0 ]; then return 1; fi fi diff --git a/mac_installer/release_GridRepublic.sh b/mac_installer/release_GridRepublic.sh index dbcda75f0f..2d7ae83457 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 2/21/08 by Charlie Fenton +## updated 3/13/08 by Charlie Fenton ## ## NOTE: This script is deprecated. @@ -246,8 +246,7 @@ sudo chmod -R 555 "${NEW_DIR_PATH}/${LC_BRAND_NAME}_$1.$2.$3_macOSX_universal/ex ##### We've decided not to create branded symbol table file; it is identical to standard one #### mkdir -p "${NEW_DIR_PATH}/${LC_BRAND_NAME}_$1.$2.$3_macOSX_SymbolTables" -#### cp -fpR $BUILDPATH/boinc.dSYM ${NEW_DIR_PATH}/${LC_BRAND_NAME}_$1.$2.$3_macOSX_SymbolTables/ -#### cp -fpR $BUILDPATH/BOINCManager.app.dSYM ${NEW_DIR_PATH}/${LC_BRAND_NAME}_$1.$2.$3_macOSX_SymbolTables/ +#### cp -fpR $BUILDPATH/SymbolTables ${NEW_DIR_PATH}/${LC_BRAND_NAME}_$1.$2.$3_macOSX_SymbolTables/ # Make temporary copies of Pkg-Info.plist and Description.plist for PackageMaker and update for this branding cp -fp mac_build/Pkg-Info.plist "${NEW_DIR_PATH}" diff --git a/mac_installer/release_boinc.sh b/mac_installer/release_boinc.sh index d53e04d1e8..eb3b747e3c 100644 --- a/mac_installer/release_boinc.sh +++ b/mac_installer/release_boinc.sh @@ -21,6 +21,7 @@ ## # Release Script for Macintosh BOINC Manager 10/31/07 by Charlie Fenton +## updated 3/13/08 by Charlie Fenton ## ## Usage: @@ -210,8 +211,7 @@ cp -fpR $BUILDPATH/setprojectgrp ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$ sudo chown -R root:admin ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_universal-apple-darwin/move_to_boinc_dir/* sudo chmod -R u+rw-s,g+r-ws,o+r-w ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_universal-apple-darwin/move_to_boinc_dir/* -cp -fpR $BUILDPATH/boinc.dSYM ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_SymbolTables/ -cp -fpR $BUILDPATH/BOINCManager.app.dSYM ../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/ cd ../BOINC_Installer/New_Release_$1_$2_$3 zip -rqy boinc_$1.$2.$3_macOSX_universal.zip boinc_$1.$2.$3_macOSX_universal