diff --git a/Scripts/build_aggregate.sh b/Scripts/build_aggregate.sh index 514d0075..e5b007ce 100755 --- a/Scripts/build_aggregate.sh +++ b/Scripts/build_aggregate.sh @@ -1,3 +1,5 @@ +#!/bin/bash -e + unset TOOLCHAINS #Xcode 7.3 BUG FIX http://stackoverflow.com/questions/36184930/xcodebuild-7-3-cant-enable-bitcode # define output folder environment variable @@ -6,7 +8,7 @@ PHONE_CONFIGURATION="Release" SIMULATOR_CONFIGURATION="Debug" BUILD_DIR=$(xcodebuild -showBuildSettings -project ./MVMCoreUI.xcodeproj | grep -w -o 'BUILD_DIR = .*' | cut -d\ -f3-) SIMULATOR_LIBRARY_PATH="${BUILD_DIR}/${SIMULATOR_CONFIGURATION}-iphonesimulator/${C_PROJECT_NAME}.framework" -FRAMEWORKS_DIR=$BUILD_DIR/Frameworks +FRAMEWORKS_DIR=$BUILD_DIR/../../../Frameworks/MVMCoreUI UNIVERSAL_OUTPUTFOLDER=${BUILD_DIR}/universal # Step 1. Build Device and Simulator versions diff --git a/Scripts/download_dependencies.sh b/Scripts/download_dependencies.sh index f03a25e8..10d11351 100755 --- a/Scripts/download_dependencies.sh +++ b/Scripts/download_dependencies.sh @@ -12,10 +12,10 @@ if [ -z $ARTIFACTORY_URL ]; then fi BUILD_DIR=$(xcodebuild -showBuildSettings -project ./MVMCoreUI.xcodeproj | grep -w -o 'BUILD_DIR = .*' | cut -d\ -f3-) -FRAMEWORKS_DIR=$BUILD_DIR/Frameworks +FRAMEWORKS_DIR=$BUILD_DIR/../../../Frameworks/MVMCoreUI if [ ! -d $FRAMEWORKS_DIR ]; then - mkdir $FRAMEWORKS_DIR + mkdir -p $FRAMEWORKS_DIR fi ./Scripts/download_framework.sh $ARTIFACTORY_URL "$FRAMEWORKS_DIR/MVMCore.framework" BPHV_MobileFirst_IOS/com/vzw/hss/myverizon/MVMCore/1.0/MVMCore-1.0-Debug-SNAPSHOT.zip diff --git a/Scripts/download_framework.sh b/Scripts/download_framework.sh index 9e9e2bb5..5d602e0a 100755 --- a/Scripts/download_framework.sh +++ b/Scripts/download_framework.sh @@ -14,7 +14,7 @@ LOGFILE=$3 LOCALDIR=$(dirname "${LOCALPATH}") LOCALBASE=$(basename "${LOCALPATH}") NEWFILEPATH="${LOCALDIR}"/$(basename "${REMOTEPATH}") -VERSIONFILE=$LOCALDIR/../Checksums/"${LOCALBASE}".txt +VERSIONFILE=$LOCALDIR/Checksums/"${LOCALBASE}".txt if [ -z $URL ]; then echo "The artifactory instance url must be specified as the first argument!"