chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From psut...@apache.org
Subject svn commit: r1802930 - /chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/project.pbxproj
Date Tue, 25 Jul 2017 12:56:46 GMT
Author: psutter
Date: Tue Jul 25 12:56:46 2017
New Revision: 1802930

URL: http://svn.apache.org/viewvc?rev=1802930&view=rev
Log:
Build script fix for skd name iOS > 9

Modified:
    chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/project.pbxproj

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/project.pbxproj
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/project.pbxproj?rev=1802930&r1=1802929&r2=1802930&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/project.pbxproj (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/project.pbxproj Tue Jul 25 12:56:46
2017
@@ -1718,7 +1718,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# [JORAM] Added check for variable: when running a regular build in XCode,
this causes not to trigger the universal lib building.\n\necho \"BUILD_UNIVERSAL_LIB =  $BUILD_UNIVERSAL_LIB\"\nif
[ -z $BUILD_UNIVERSAL_LIB ]\nthen\necho \"Not building universal lib\"\nexit 0\nelse\necho
\"Building universal lib\"\nfi\n\n# --------------------------------------------------------------------------------------------------------------------------------------------------------\n#\n#
Following code is integral from http://stackoverflow.com/questions/3520977/build-fat-static-library-device-simulator-using-xcode-and-sdk-4\n#\n#
Version 2.0 (updated for Xcode 4, with some fixes)\n# Changes:\n#    - Works with xcode 4,
even when running xcode 3 projects (Workarounds for apple bugs)\n#    - Faster / better: only
runs lipo once, instead of once per recursion\n#    - Added some debugging statemetns that
can be switched on/off by changing the DEBUG_THIS_SCRIPT variable to \"true\"\n#  
   - Fixed some typos\n# \n# Purpose:\n#   Create a static library for iPhone from within
XCode\n#   Because Apple staff DELIBERATELY broke Xcode to make this impossible from the GUI
(Xcode 3.2.3 specifically states this in the Release notes!)\n#   ...no, I don't understand
why they did this!\n#\n# Author: Adam Martin - http://twitter.com/redglassesapps\n# Based
on: original script from Eonil (main changes: Eonil's script WILL NOT WORK in Xcode GUI -
it WILL CRASH YOUR COMPUTER)\n#\n# More info: see this Stack Overflow question: http://stackoverflow.com/questions/3520977/build-fat-static-library-device-simulator-using-xcode-and-sdk-4\n\n#################[
Tests: helps workaround any future bugs in Xcode ]########\n#\nDEBUG_THIS_SCRIPT=\"true\"\n\nif
[ $DEBUG_THIS_SCRIPT = \"true\" ]\nthen\necho \"########### TESTS #############\"\necho \"Use
the following variables when debugging this script; note that they may change on recursions\"\necho
\"BUILD_DIR = $BUILD_DIR\"\necho \"BUILD_ROO
 T = $BUILD_ROOT\"\necho \"CONFIGURATION_BUILD_DIR = $CONFIGURATION_BUILD_DIR\"\necho \"BUILT_PRODUCTS_DIR
= $BUILT_PRODUCTS_DIR\"\necho \"CONFIGURATION_TEMP_DIR = $CONFIGURATION_TEMP_DIR\"\necho \"TARGET_BUILD_DIR
= $TARGET_BUILD_DIR\"\nfi\n\n#####################[ part 1 ]##################\n# First, work
out the BASESDK version number (NB: Apple ought to report this, but they hide it)\n#    (incidental:
searching for substrings in sh is a nightmare! Sob)\n\nSDK_VERSION=$(echo ${SDK_NAME} | grep
-o '.\\{3\\}$')\n\n# Next, work out if we're in SIM or DEVICE\n\nif [ ${PLATFORM_NAME} = \"iphonesimulator\"
]\nthen\nOTHER_SDK_TO_BUILD=iphoneos${SDK_VERSION}\nelse\nOTHER_SDK_TO_BUILD=iphonesimulator${SDK_VERSION}\nfi\n\necho
\"XCode has selected SDK: ${PLATFORM_NAME} with version: ${SDK_VERSION} (although back-targetting:
${IPHONEOS_DEPLOYMENT_TARGET})\"\necho \"...therefore, OTHER_SDK_TO_BUILD = ${OTHER_SDK_TO_BUILD}\"\n#\n#####################[
end of part 1 ]##################\n\n####
 #################[ part 2 ]##################\n#\n# IF this is the original invocation, invoke
WHATEVER other builds are required\n#\n# Xcode is already building ONE target...\n#\n# ...but
this is a LIBRARY, so Apple is wrong to set it to build just one.\n# ...we need to build ALL
targets\n# ...we MUST NOT re-build the target that is ALREADY being built: Xcode WILL CRASH
YOUR COMPUTER if you try this (infinite recursion!)\n#\n#\n# So: build ONLY the missing platforms/configurations.\n\nif
[ \"true\" == ${ALREADYINVOKED:-false} ]\nthen\necho \"RECURSION: I am NOT the root invocation,
so I'm NOT going to recurse\"\nelse\n# CRITICAL:\n# Prevent infinite recursion (Xcode sucks)\nexport
ALREADYINVOKED=\"true\"\n\necho \"RECURSION: I am the root ... recursing all missing build
targets NOW...\"\necho \"RECURSION: ...about to invoke: xcodebuild -configuration \\\"${CONFIGURATION}\\\"
-target \\\"${TARGET_NAME}\\\" -sdk \\\"${OTHER_SDK_TO_BUILD}\\\" clean ${ACTION} RUN_CLANG_STATIC_ANALYZER=
 NO\"\nxcodebuild -configuration \"${CONFIGURATION}\" -target \"${TARGET_NAME}\" -sdk \"${OTHER_SDK_TO_BUILD}\"
clean ${ACTION} ONLY_ACTIVE_ARCH=NO RUN_CLANG_STATIC_ANALYZER=NO BUILD_DIR=\"${BUILD_DIR}\"
BUILD_ROOT=\"${BUILD_ROOT}\"\n\nACTION=\"build\"\n\n#Merge all platform binaries as a fat
binary for each configurations.\n\n# Calculate where the (multiple) built files are coming
from:\nCURRENTCONFIG_DEVICE_DIR=${SYMROOT}/${CONFIGURATION}-iphoneos\nCURRENTCONFIG_SIMULATOR_DIR=${SYMROOT}/${CONFIGURATION}-iphonesimulator\n\necho
\"Taking device build from: ${CURRENTCONFIG_DEVICE_DIR}\"\necho \"Taking simulator build from:
${CURRENTCONFIG_SIMULATOR_DIR}\"\n\nCREATING_UNIVERSAL_DIR=${SYMROOT}/${CONFIGURATION}-universal\necho
\"\"\necho \"...I will output a universal build to: ${CREATING_UNIVERSAL_DIR}\"\necho \"\"\n\n#
... remove the products of previous runs of this script\n#      NB: this directory is ONLY
created by this script - it should be safe to delete!\n\nrm -rf \"${CREATING_U
 NIVERSAL_DIR}\"\nmkdir \"${CREATING_UNIVERSAL_DIR}\"\n\n# [MIKEH] Rename universal library
depending on build configuration type\nif [ ${CONFIGURATION} = \"Debug\" ]\nthen\nUNIVERSAL_FILE=${EXECUTABLE_NAME%.a}-debug.a\nelse\nUNIVERSAL_FILE=${EXECUTABLE_NAME}\nfi\n\n#\necho
\"lipo: for current configuration (${CONFIGURATION}) creating output file: ${CREATING_UNIVERSAL_DIR}/${UNIVERSAL_FILE}\"\nlipo
-create -output \"${CREATING_UNIVERSAL_DIR}/${UNIVERSAL_FILE}\" \"${CURRENTCONFIG_DEVICE_DIR}/${EXECUTABLE_NAME}\"
\"${CURRENTCONFIG_SIMULATOR_DIR}/${EXECUTABLE_NAME}\"\n\n#########\n#\n# Added: StackOverflow
suggestion to also copy \"include\" files\n#    (untested, but should work OK)\n#\nif [ -d
\"${CURRENTCONFIG_DEVICE_DIR}/ObjectiveCMIS\" ]\nthen\nmkdir -p \"${CREATING_UNIVERSAL_DIR}/ObjectiveCMIS\"\n#mkdir
-p \"${CREATING_UNIVERSAL_DIR}/usr/local/include\"\n# * needs to be outside the double quotes?\ncp
\"${CURRENTCONFIG_DEVICE_DIR}/ObjectiveCMIS/\"* \"${CREATING_UNIVERSAL_DIR}/Objec
 tiveCMIS\"\nfi\nfi\n\n";
+			shellScript = "# [JORAM] Added check for variable: when running a regular build in XCode,
this causes not to trigger the universal lib building.\n\necho \"BUILD_UNIVERSAL_LIB =  $BUILD_UNIVERSAL_LIB\"\nif
[ -z $BUILD_UNIVERSAL_LIB ]\nthen\necho \"Not building universal lib\"\nexit 0\nelse\necho
\"Building universal lib\"\nfi\n\n# --------------------------------------------------------------------------------------------------------------------------------------------------------\n#\n#
Following code is integral from http://stackoverflow.com/questions/3520977/build-fat-static-library-device-simulator-using-xcode-and-sdk-4\n#\n#
Version 2.0 (updated for Xcode 4, with some fixes)\n# Changes:\n#    - Works with xcode 4,
even when running xcode 3 projects (Workarounds for apple bugs)\n#    - Faster / better: only
runs lipo once, instead of once per recursion\n#    - Added some debugging statemetns that
can be switched on/off by changing the DEBUG_THIS_SCRIPT variable to \"true\"\n#  
   - Fixed some typos\n# \n# Purpose:\n#   Create a static library for iPhone from within
XCode\n#   Because Apple staff DELIBERATELY broke Xcode to make this impossible from the GUI
(Xcode 3.2.3 specifically states this in the Release notes!)\n#   ...no, I don't understand
why they did this!\n#\n# Author: Adam Martin - http://twitter.com/redglassesapps\n# Based
on: original script from Eonil (main changes: Eonil's script WILL NOT WORK in Xcode GUI -
it WILL CRASH YOUR COMPUTER)\n#\n# More info: see this Stack Overflow question: http://stackoverflow.com/questions/3520977/build-fat-static-library-device-simulator-using-xcode-and-sdk-4\n\n#################[
Tests: helps workaround any future bugs in Xcode ]########\n#\nDEBUG_THIS_SCRIPT=\"true\"\n\nif
[ $DEBUG_THIS_SCRIPT = \"true\" ]\nthen\necho \"########### TESTS #############\"\necho \"Use
the following variables when debugging this script; note that they may change on recursions\"\necho
\"BUILD_DIR = $BUILD_DIR\"\necho \"BUILD_ROO
 T = $BUILD_ROOT\"\necho \"CONFIGURATION_BUILD_DIR = $CONFIGURATION_BUILD_DIR\"\necho \"BUILT_PRODUCTS_DIR
= $BUILT_PRODUCTS_DIR\"\necho \"CONFIGURATION_TEMP_DIR = $CONFIGURATION_TEMP_DIR\"\necho \"TARGET_BUILD_DIR
= $TARGET_BUILD_DIR\"\nfi\n\n#####################[ part 1 ]##################\n# First, work
out the BASESDK version number (NB: Apple ought to report this, but they hide it)\n#    (incidental:
searching for substrings in sh is a nightmare! Sob)\n\nSDK_VERSION=$(echo ${SDK_NAME} | grep
-o '.\\{4\\}$')\n\n# Next, work out if we're in SIM or DEVICE\n\nif [ ${PLATFORM_NAME} = \"iphonesimulator\"
]\nthen\nOTHER_SDK_TO_BUILD=iphoneos${SDK_VERSION}\nelse\nOTHER_SDK_TO_BUILD=iphonesimulator${SDK_VERSION}\nfi\n\necho
\"XCode has selected SDK: ${PLATFORM_NAME} with version: ${SDK_VERSION} (although back-targetting:
${IPHONEOS_DEPLOYMENT_TARGET})\"\necho \"...therefore, OTHER_SDK_TO_BUILD = ${OTHER_SDK_TO_BUILD}\"\n#\n#####################[
end of part 1 ]##################\n\n####
 #################[ part 2 ]##################\n#\n# IF this is the original invocation, invoke
WHATEVER other builds are required\n#\n# Xcode is already building ONE target...\n#\n# ...but
this is a LIBRARY, so Apple is wrong to set it to build just one.\n# ...we need to build ALL
targets\n# ...we MUST NOT re-build the target that is ALREADY being built: Xcode WILL CRASH
YOUR COMPUTER if you try this (infinite recursion!)\n#\n#\n# So: build ONLY the missing platforms/configurations.\n\nif
[ \"true\" == ${ALREADYINVOKED:-false} ]\nthen\necho \"RECURSION: I am NOT the root invocation,
so I'm NOT going to recurse\"\nelse\n# CRITICAL:\n# Prevent infinite recursion (Xcode sucks)\nexport
ALREADYINVOKED=\"true\"\n\necho \"RECURSION: I am the root ... recursing all missing build
targets NOW...\"\necho \"RECURSION: ...about to invoke: xcodebuild -configuration \\\"${CONFIGURATION}\\\"
-target \\\"${TARGET_NAME}\\\" -sdk \\\"${OTHER_SDK_TO_BUILD}\\\" clean ${ACTION} RUN_CLANG_STATIC_ANALYZER=
 NO\"\nxcodebuild -configuration \"${CONFIGURATION}\" -target \"${TARGET_NAME}\" -sdk \"${OTHER_SDK_TO_BUILD}\"
clean ${ACTION} ONLY_ACTIVE_ARCH=NO RUN_CLANG_STATIC_ANALYZER=NO BUILD_DIR=\"${BUILD_DIR}\"
BUILD_ROOT=\"${BUILD_ROOT}\"\n\nACTION=\"build\"\n\n#Merge all platform binaries as a fat
binary for each configurations.\n\n# Calculate where the (multiple) built files are coming
from:\nCURRENTCONFIG_DEVICE_DIR=${SYMROOT}/${CONFIGURATION}-iphoneos\nCURRENTCONFIG_SIMULATOR_DIR=${SYMROOT}/${CONFIGURATION}-iphonesimulator\n\necho
\"Taking device build from: ${CURRENTCONFIG_DEVICE_DIR}\"\necho \"Taking simulator build from:
${CURRENTCONFIG_SIMULATOR_DIR}\"\n\nCREATING_UNIVERSAL_DIR=${SYMROOT}/${CONFIGURATION}-universal\necho
\"\"\necho \"...I will output a universal build to: ${CREATING_UNIVERSAL_DIR}\"\necho \"\"\n\n#
... remove the products of previous runs of this script\n#      NB: this directory is ONLY
created by this script - it should be safe to delete!\n\nrm -rf \"${CREATING_U
 NIVERSAL_DIR}\"\nmkdir \"${CREATING_UNIVERSAL_DIR}\"\n\n# [MIKEH] Rename universal library
depending on build configuration type\nif [ ${CONFIGURATION} = \"Debug\" ]\nthen\nUNIVERSAL_FILE=${EXECUTABLE_NAME%.a}-debug.a\nelse\nUNIVERSAL_FILE=${EXECUTABLE_NAME}\nfi\n\n#\necho
\"lipo: for current configuration (${CONFIGURATION}) creating output file: ${CREATING_UNIVERSAL_DIR}/${UNIVERSAL_FILE}\"\nlipo
-create -output \"${CREATING_UNIVERSAL_DIR}/${UNIVERSAL_FILE}\" \"${CURRENTCONFIG_DEVICE_DIR}/${EXECUTABLE_NAME}\"
\"${CURRENTCONFIG_SIMULATOR_DIR}/${EXECUTABLE_NAME}\"\n\n#########\n#\n# Added: StackOverflow
suggestion to also copy \"include\" files\n#    (untested, but should work OK)\n#\nif [ -d
\"${CURRENTCONFIG_DEVICE_DIR}/ObjectiveCMIS\" ]\nthen\nmkdir -p \"${CREATING_UNIVERSAL_DIR}/ObjectiveCMIS\"\n#mkdir
-p \"${CREATING_UNIVERSAL_DIR}/usr/local/include\"\n# * needs to be outside the double quotes?\ncp
\"${CURRENTCONFIG_DEVICE_DIR}/ObjectiveCMIS/\"* \"${CREATING_UNIVERSAL_DIR}/Objec
 tiveCMIS\"\nfi\nfi\n\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */



Mime
View raw message