From d8ff305bb394337f6684a55659f49cdb00479a31 Mon Sep 17 00:00:00 2001 From: Sergej Jovanovic Date: Thu, 23 Oct 2014 18:55:28 +0200 Subject: [PATCH] Removed sufficient build script and updated remaining. --- .../OpenPeerSampleApp/DefaultSettings.plist | 12 ++++++------ openpeer-ios-sdk.xcodeproj/project.pbxproj | 14 -------------- .../xcshareddata/xcschemes/OpenpeerSDK.xcscheme | 2 +- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/Samples/OpenPeerSampleApp/OpenPeerSampleApp/DefaultSettings.plist b/Samples/OpenPeerSampleApp/OpenPeerSampleApp/DefaultSettings.plist index bbbf3599..be879416 100644 --- a/Samples/OpenPeerSampleApp/OpenPeerSampleApp/DefaultSettings.plist +++ b/Samples/OpenPeerSampleApp/OpenPeerSampleApp/DefaultSettings.plist @@ -3,17 +3,17 @@ outerFrameURL - + http://identity.hcs.io:5005/outer-new.html identityProviderDomain - + sampleapp-hookflash-com.app.hcs.io identityFederateBaseURI - + identity://facebook.com/ namespaceGrantServiceURL - + http://jsouter-v1-rel-lespaulinst2-i.hcs.io/grant.html lockBoxServiceDomain - + hcs.io defaultOutgoingTelnetServer - + log.hcs.io:8115 localTelnetLoggerPort 59999 applicationSettingsBackgroundingPhaseRichPush diff --git a/openpeer-ios-sdk.xcodeproj/project.pbxproj b/openpeer-ios-sdk.xcodeproj/project.pbxproj index 406c7375..9a68733d 100644 --- a/openpeer-ios-sdk.xcodeproj/project.pbxproj +++ b/openpeer-ios-sdk.xcodeproj/project.pbxproj @@ -1094,7 +1094,6 @@ 8792E86416519CFF00DEAC58 /* Sources */, 8792E86516519CFF00DEAC58 /* Frameworks */, 87B013B716611FAA00E8938B /* Headers */, - 87226B78197FC26900E7A660 /* ShellScript */, ); buildRules = ( ); @@ -1264,19 +1263,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 87226B78197FC26900E7A660 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "set -e\n\n: ${BOOST_LIB_PATH:=./libs/op/libs/ortc-lib/libs/boost/ios/library/boost.a}\n: ${CURL_LIB_PATH:=./libs/op/libs/ortc-lib/libs/curl-build-scripts/curl/lib/libcurl.a}\n\nFMK_VERSION=C\n\n# Delete old framework folder\nrm -rf \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework\"\n\nmkdir -p \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Versions/${FMK_VERSION}/Headers\"\n#mkdir -p \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Versions/${FMK_VERSION}/Frameworks\"\nmkdir -p \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Versions/${FMK_VERSION}/Libraries\"\nmkdir -p \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Versions/${FMK_VERSION}/Resources\"\n\n# Link the \"Current\" version to \"C\"\n/bin/ln -sfh ${FMK_VERSION} \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Versions/Current\"\n/bin/ln -sfh Versions/Current/Headers \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Headers\"\n#/bin/ln -sfh Versions/Current/Frameworks \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Frameworks\"\n/bin/ln -sfh Versions/Current/Libraries \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Libraries\"\n/bin/ln -sfh Versions/Current/Resources \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Resources\"\n/bin/ln -sfh \"Versions/Current/${PRODUCT_NAME}\" \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/${PRODUCT_NAME}\"\n\n# The -a ensures that the headers maintain the source modification date so that we don't constantly\n# cause propagating rebuilds of files that import these headers.\n/bin/cp -a \"${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}/\" \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Versions/${FMK_VERSION}/Headers\"\n\n/bin/cp -a \"${BOOST_LIB_PATH}\" \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Versions/${FMK_VERSION}/Libraries\"\n\n/bin/cp -a \"${CURL_LIB_PATH}\" \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Versions/${FMK_VERSION}/Libraries\"\n\n/bin/cp -R \"${TARGET_BUILD_DIR}/${PUBLIC_RESOURCES_FOLDER_PATH}/OpenpeerDataModel.bundle\" \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Versions/${FMK_VERSION}/Resources\"\n\n/bin/cp -a \"${BUILT_PRODUCTS_DIR}/lib${PRODUCT_NAME}.a\" \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Versions/${FMK_VERSION}/${PRODUCT_NAME}\"\n"; - }; 87D7EF93197926CA003B1746 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/openpeer-ios-sdk.xcodeproj/xcshareddata/xcschemes/OpenpeerSDK.xcscheme b/openpeer-ios-sdk.xcodeproj/xcshareddata/xcschemes/OpenpeerSDK.xcscheme index f93ff356..b49c188c 100644 --- a/openpeer-ios-sdk.xcodeproj/xcshareddata/xcschemes/OpenpeerSDK.xcscheme +++ b/openpeer-ios-sdk.xcodeproj/xcshareddata/xcschemes/OpenpeerSDK.xcscheme @@ -87,7 +87,7 @@ ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction"> + scriptText = "DATE=$( /bin/date +"%Y-%m-%d" ) TIME=$( /bin/date +"%H-%M-%S" ) BUILD_VERSION_FILE_PATH="${HOME}/build_tools/version.txt" VERSION_NUMBER="0" if [ -f ${BUILD_VERSION_FILE_PATH} ]; then VERSION_NUMBER=$(cat ${BUILD_VERSION_FILE_PATH}) fi LOG="${HOME}/build_logs/SDK/build_log_${PRODUCT_NAME}_{$FRAMEWORK_VERSION}_${DYLIB_CURRENT_VERSION}_${VERSION_NUMBER}_${DATE}_${TIME}.txt" echo "info: Version file path is ${BUILD_VERSION_FILE_PATH}" > $LOG echo "info: Old build version number is ${VERSION_NUMBER}" >> $LOG OPENPEER_REGISTERED_APPLICATION_NAME="sampleapp" OPENPEER_REGISTERED_APPLICATION_ID="sampleapp.hookflash.com" OPENPEER_REGISTERED_APPLICATION_SHARED_SECRET="22qcbjdmts740-i1kg62kp" OPENPEER_REGISTERED_APPLICATION_UPLOAD_PATH="" OPENPEER_REGISTERED_APPLICATION_UA_KEY="" OPENPEER_REGISTERED_APPLICATION_UA_APP_SECRET="" OPENPEER_REGISTERED_APPLICATION_UA_MASTER_SECRET="" OPENPEER_REGISTERED_APPLICATION_UPLOAD_UA_URL="" SAMPLEPROJECT_PATH="${PROJECT_DIR}/Samples/OpenPeerSampleApp" echo "info: Sample project path is ${SAMPLEPROJECT_PATH}" >> $LOG UPLOAD_URL=$(/usr/libexec/PlistBuddy -c "Print :applicationReleaseUploadPath" "${SAMPLEPROJECT_PATH}/OpenPeerSampleApp/CustomerSpecific.plist") echo "info: Upload URL is ${UPLOAD_URL}" >> $LOG UPLOAD_URL_SIZE=${#UPLOAD_URL} echo "info: Upload URL size is ${UPLOAD_URL_SIZE}" >> $LOG FRAMEWORK_NAME="${PRODUCT_NAME}.${FRAMEWORK_VERSION}.${DYLIB_CURRENT_VERSION}.${VERSION_NUMBER}.framework" echo "info: Framework name is ${FRAMEWORK_NAME}" >> $LOG FRAMEWORK_NAME_FOR_APP="${PRODUCT_NAME}.framework" SAMPLEAPPLICATION_NAME="SampleApplicationWithSDK.${DYLIB_CURRENT_VERSION}.${VERSION_NUMBER}" echo "info: Sample application name is ${SAMPLEAPPLICATION_NAME}" >> $LOG APPLICATION_PATH="${HOME}/Desktop/OpenpeerApplications/SDK" echo "info: Application path is ${APPLICATION_PATH}" >> $LOG DESTINATION_PATH="${APPLICATION_PATH}/Builds" echo "info: Destination path is ${DESTINATION_PATH}" >> $LOG DESTINATION_SAMPLE_PATH="${DESTINATION_PATH}/OpenPeer_${VERSION_NUMBER}" echo "info: Destination sample app path is ${DESTINATION_SAMPLE_PATH}" >> $LOG VERSION_NUMBER="$(expr "$VERSION_NUMBER" '+' '1')" echo "info: New build version number is ${VERSION_NUMBER}" >> $LOG echo $VERSION_NUMBER > $BUILD_VERSION_FILE_PATH #FRAMEWORK_PATH="${DESTINATION_PATH}/${FRAMEWORK_NAME}" FRAMEWORK_PATH="${DESTINATION_PATH}/${FRAMEWORK_NAME_FOR_APP}" echo "info: Framework path is ${FRAMEWORK_PATH}" >> $LOG BOOST_LIB_PATH="${PROJECT_DIR}/libs/op/libs/ortc-lib/libs/boost/ios/library/boost.a" CURL_LIB_PATH="${PROJECT_DIR}/libs/op/libs/ortc-lib/libs/curl-build-scripts/curl/lib/libcurl.a" #CURL_LIB_PATH="${PROJECT_DIR}/libs/op/libs/ortc-lib/libs/curl/staging/libcurl.a" echo "info: boost lib path is ${BOOST_LIB_PATH}" >> $LOG echo "info: curl lib path is ${CURL_LIB_PATH}" >> $LOG # Delete old framework folder rm -rf "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework" mkdir -p "${FRAMEWORK_PATH}/Versions/${FRAMEWORK_VERSION}/Headers" mkdir -p "${FRAMEWORK_PATH}/Versions/${FRAMEWORK_VERSION}/Libraries" mkdir -p "${FRAMEWORK_PATH}/Versions/${FRAMEWORK_VERSION}/Resources" # Link the "Current" version to "C" /bin/ln -sfh ${FRAMEWORK_VERSION} "${FRAMEWORK_PATH}/Versions/Current" /bin/ln -sfh Versions/Current/Headers "${FRAMEWORK_PATH}/Headers" /bin/ln -sfh Versions/Current/Libraries "${FRAMEWORK_PATH}/Libraries" /bin/ln -sfh Versions/Current/Resources "${FRAMEWORK_PATH}/Resources" /bin/ln -sfh "Versions/Current/${PRODUCT_NAME}" "${FRAMEWORK_PATH}/${PRODUCT_NAME}" echo "info: Target build path is ${TARGET_BUILD_DIR}" >> $LOG echo "info: Public header path is ${PUBLIC_HEADERS_FOLDER_PATH}" >> $LOG # The -a ensures that the headers maintain the source modification date so that we don't constantly # cause propagating rebuilds of files that import these headers. #/bin/cp -a "${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}/" "${FRAMEWORK_PATH}/Versions/${FRAMEWORK_VERSION}/Headers" /bin/cp -a "${OBJROOT}/UninstalledProducts/${PUBLIC_HEADERS_FOLDER_PATH}/" "${FRAMEWORK_PATH}/Versions/${FRAMEWORK_VERSION}/Headers" if [ $? -eq 1 ]; then echo "error: Copying header files has failed" >> $LOG exit 1 else echo "info: Header files has been copied successfully" >> $LOG fi /bin/cp -a "${BOOST_LIB_PATH}" "${FRAMEWORK_PATH}/Versions/${FRAMEWORK_VERSION}/Libraries" if [ $? -eq 1 ]; then echo "error: Copying boost library has failed" >> $LOG exit 1 else echo "info: Boost library files has been copied successfully" >> $LOG fi /bin/cp -a "${CURL_LIB_PATH}" "${FRAMEWORK_PATH}/Versions/${FRAMEWORK_VERSION}/Libraries" if [ $? -eq 1 ]; then echo "error: Copying curl library has failed" >> $LOG exit 1 else echo "info: Curl library files has been copied successfully" >> $LOG fi #/bin/cp -R "${TARGET_BUILD_DIR}/${PUBLIC_RESOURCES_FOLDER_PATH}/OpenpeerDataModel.bundle" "${FRAMEWORK_PATH}/Versions/${FRAMEWORK_VERSION}/Resources" /bin/cp -R "${OBJROOT}/UninstalledProducts/OpenpeerDataModel.bundle" "${FRAMEWORK_PATH}/Versions/${FRAMEWORK_VERSION}/Resources" if [ $? -eq 1 ]; then echo "error: Copying data model has failed" >> $LOG exit 1 else echo "info: Data model has been copied successfully" >> $LOG fi #/bin/cp -a "${TARGET_BUILD_DIR}/lib${PRODUCT_NAME}.a" "${FRAMEWORK_PATH}/Versions/${FRAMEWORK_VERSION}/${PRODUCT_NAME}" /bin/cp -a "${OBJROOT}/UninstalledProducts/lib${PRODUCT_NAME}.a" "${FRAMEWORK_PATH}/Versions/${FRAMEWORK_VERSION}/${PRODUCT_NAME}" if [ $? -eq 1 ]; then echo "error: Copying openpeer SDK static library has failed" >> $LOG exit 1 else echo "info: Openpeer SDK static library has been copied successfully" >> $LOG fi #Delete old framework from sample project rm -rf "${PROJECT_DIR}/${PRODUCT_NAME}.framework" #Copy framework to sample project /bin/cp -a "${FRAMEWORK_PATH}" "${PROJECT_DIR}/${PRODUCT_NAME}.framework" if [ $? -eq 1 ]; then echo "error: Copying openpeer framework to sample app" >> $LOG exit 1 else echo "info: Openpeer framework has been copied successfully" >> $LOG fi rm -rf "${DESTINATION_SAMPLE_PATH}" mkdir -p "${DESTINATION_SAMPLE_PATH}" /bin/cp -R "${FRAMEWORK_PATH}" "${DESTINATION_SAMPLE_PATH}" /bin/cp -R "${PROJECT_DIR}/Samples" "${DESTINATION_SAMPLE_PATH}" /usr/libexec/PlistBuddy -c "Set :applicationReleaseUploadPath ${OPENPEER_REGISTERED_APPLICATION_UPLOAD_PATH}" "${DESTINATION_SAMPLE_PATH}/Samples/OpenPeerSampleApp/OpenPeerSampleApp/CustomerSpecific.plist" if [ $? -eq 1 ]; then echo "error: applicationReleaseUploadPath value is not cleared" >> $LOG #exit 1 else echo "info: applicationReleaseUploadPath value is cleared" >> $LOG fi /usr/libexec/PlistBuddy -c "Set :applicationName ${OPENPEER_REGISTERED_APPLICATION_NAME}" "${DESTINATION_SAMPLE_PATH}/Samples/OpenPeerSampleApp/OpenPeerSampleApp/CustomerSpecific.plist" if [ $? -eq 1 ]; then echo "error: applicationName is not set properly" >> $LOG exit 1 else echo "info: applicationName is set" >> $LOG fi /usr/libexec/PlistBuddy -c "Set :applicationID ${OPENPEER_REGISTERED_APPLICATION_ID}" "${DESTINATION_SAMPLE_PATH}/Samples/OpenPeerSampleApp/OpenPeerSampleApp/CustomerSpecific.plist" if [ $? -eq 1 ]; then echo "error: applicationId is not set properly" >> $LOG exit 1 else echo "info: applicationId is set" >> $LOG fi /usr/libexec/PlistBuddy -c "Set :applicationSharedSecret ${OPENPEER_REGISTERED_APPLICATION_SHARED_SECRET}" "${DESTINATION_SAMPLE_PATH}/Samples/OpenPeerSampleApp/OpenPeerSampleApp/CustomerSpecific.plist" if [ $? -eq 1 ]; then echo "error: applicationIdSharedSecret is not set properly" >> $LOG exit 1 else echo "info: applicationIdSharedSecret is set" >> $LOG fi /usr/libexec/PlistBuddy -c "Set :APNS-UrbanAirShip:apiPushURL ${OPENPEER_REGISTERED_APPLICATION_UPLOAD_UA_URL}" "${DESTINATION_SAMPLE_PATH}/Samples/OpenPeerSampleApp/OpenPeerSampleApp/CustomerSpecific.plist" if [ $? -eq 1 ]; then echo "error: apiPushURL is not set properly" >> $LOG #exit 1 else echo "info: apiPushURL is set" >> $LOG fi /usr/libexec/PlistBuddy -c "Set :APNS-UrbanAirShip:masterAppSecret ${OPENPEER_REGISTERED_APPLICATION_UA_MASTER_SECRET}" "${DESTINATION_SAMPLE_PATH}/Samples/OpenPeerSampleApp/OpenPeerSampleApp/CustomerSpecific.plist" if [ $? -eq 1 ]; then echo "error: masterAppSecret is not set properly" >> $LOG #exit 1 else echo "info: masterAppSecret is set" >> $LOG fi /usr/libexec/PlistBuddy -c "Set :APNS-UrbanAirShip:productionAppKey ${OPENPEER_REGISTERED_APPLICATION_UA_KEY}" "${DESTINATION_SAMPLE_PATH}/Samples/OpenPeerSampleApp/OpenPeerSampleApp/CustomerSpecific.plist" if [ $? -eq 1 ]; then echo "error: productionAppKey is not set properly" >> $LOG #exit 1 else echo "info: apiPushURL is set" >> $LOG fi /usr/libexec/PlistBuddy -c "Set :APNS-UrbanAirShip:productionAppSecret ${OPENPEER_REGISTERED_APPLICATION_UA_APP_SECRET}" "${DESTINATION_SAMPLE_PATH}/Samples/OpenPeerSampleApp/OpenPeerSampleApp/CustomerSpecific.plist" if [ $? -eq 1 ]; then echo "error: productionAppSecret is not set properly" >> $LOG #exit 1 else echo "info: productionAppSecret is set" >> $LOG fi /usr/libexec/PlistBuddy -c "Set :APNS-UrbanAirShip:developmentAppKey ${OPENPEER_REGISTERED_APPLICATION_UA_KEY}" "${DESTINATION_SAMPLE_PATH}/Samples/OpenPeerSampleApp/OpenPeerSampleApp/CustomerSpecific.plist" if [ $? -eq 1 ]; then echo "error: developmentAppKey is not set properly" >> $LOG #exit 1 else echo "info: developmentAppKey is set" >> $LOG fi /usr/libexec/PlistBuddy -c "Set :APNS-UrbanAirShip:developmentAppSecret ${OPENPEER_REGISTERED_APPLICATION_UA_APP_SECRET}" "${DESTINATION_SAMPLE_PATH}/Samples/OpenPeerSampleApp/OpenPeerSampleApp/CustomerSpecific.plist" if [ $? -eq 1 ]; then echo "error: developmentAppSecret is not set properly" >> $LOG #exit 1 else echo "info: developmentAppSecret is set" >> $LOG fi /usr/libexec/PlistBuddy -c "Set :APNS-UrbanAirShip:masterAppSecretDev ${OPENPEER_REGISTERED_APPLICATION_UA_MASTER_SECRET}" "${DESTINATION_SAMPLE_PATH}/Samples/OpenPeerSampleApp/OpenPeerSampleApp/CustomerSpecific.plist" if [ $? -eq 1 ]; then echo "error: masterAppSecretDev is not set properly" >> $LOG #exit 1 else echo "info: masterAppSecretDev is set" >> $LOG fi #ditto --keepParent "${PROJECT_DIR}/${PRODUCT_NAME}.framework" "${SAMPLEPROJECT_PATH}" "${DESTINATION_SAMPLE_PATH}" #zip -r "${DESTINATION_PATH}/${FRAMEWORK_NAME}.zip" "${FRAMEWORK_PATH}" ditto -ck --rsrc --sequesterRsrc --keepParent "${FRAMEWORK_PATH}" "${DESTINATION_PATH}/${FRAMEWORK_NAME}.zip" if [ $? -eq 1 ]; then echo "error: Commpressing framework has failed" >> $LOG exit 1 else echo "info: Framework has been commpressed successfully" >> $LOG fi #Pack sample project #ditto -ck --rsrc --sequesterRsrc --keepParent "${SAMPLEPROJECT_PATH}" "${DESTINATION_PATH}/${SAMPLEAPPLICATION_NAME}.zip" ditto -ck --rsrc --sequesterRsrc --keepParent "${DESTINATION_SAMPLE_PATH}" "${DESTINATION_PATH}/${SAMPLEAPPLICATION_NAME}.zip" if [ $? -eq 1 ]; then echo "error: Commpressing sample project" >> $LOG exit 1 else echo "info: Sample project has been commpressed successfully" >> $LOG fi if (( UPLOAD_URL_SIZE>0 )); then #/usr/local/bin/s3cmd put --acl-public --force --guess-mime-type "${DESTINATION_PATH}/${FRAMEWORK_NAME}.zip" "s3://assets.hookflash.me/github.com-openpeer-opios/OPiOS_SDK_Builds/${FRAMEWORK_NAME}.zip" >> $LOG /usr/local/bin/s3cmd put --acl-public --force --guess-mime-type "${DESTINATION_PATH}/${FRAMEWORK_NAME}.zip" "${UPLOAD_URL}/${FRAMEWORK_NAME}.zip" >> $LOG if [ $? -eq 1 ]; then echo "error: Upload to server has failed" >> $LOG exit 1 else echo "info: Framework has been uploaded to server" >> $LOG fi /usr/local/bin/s3cmd put --acl-public --force --guess-mime-type "${DESTINATION_PATH}/${SAMPLEAPPLICATION_NAME}.zip" "${UPLOAD_URL}/${SAMPLEAPPLICATION_NAME}.zip" >> $LOG if [ $? -eq 1 ]; then echo "error: Upload to server has failed" >> $LOG exit 1 else echo "info: Framework has been uploaded to server" >> $LOG fi else echo "Upload URL is not set" >> $LOG fi">