summaryrefslogtreecommitdiffstats
path: root/contrib/build-scripts
diff options
context:
space:
mode:
authorStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2014-07-04 13:00:48 (GMT)
committerStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2014-07-04 13:00:48 (GMT)
commit791c99ed223c8491c9da2c9863da07cc84122514 (patch)
tree69154cf6e91fc8e6dc1993fa928a957803ede9ab /contrib/build-scripts
parentf0e9ecf5bc708f57270f8b7e3abb50538224c3ef (diff)
downloaduscxml-791c99ed223c8491c9da2c9863da07cc84122514.zip
uscxml-791c99ed223c8491c9da2c9863da07cc84122514.tar.gz
uscxml-791c99ed223c8491c9da2c9863da07cc84122514.tar.bz2
Polished iOS builds and docs
Diffstat (limited to 'contrib/build-scripts')
-rwxr-xr-xcontrib/build-scripts/build-uscxml-ios.sh35
1 files changed, 20 insertions, 15 deletions
diff --git a/contrib/build-scripts/build-uscxml-ios.sh b/contrib/build-scripts/build-uscxml-ios.sh
index fccea19..f2fbee7 100755
--- a/contrib/build-scripts/build-uscxml-ios.sh
+++ b/contrib/build-scripts/build-uscxml-ios.sh
@@ -8,14 +8,20 @@
unset MACOSX_DEPLOYMENT_TARGET
# be ridiculously conservative with regard to ios features
-export IPHONEOS_DEPLOYMENT_TARGET="1.0"
+
+if [ -z "${IPHONEOS_DEPLOYMENT_TARGET+xxx}" ]; then
+ export IPHONEOS_DEPLOYMENT_TARGET="1.0"
+fi
+
+if [ -z "${IOS_SDK_VERSION+xxx}" ]; then
+ export IOS_SDK_VERSION=7.1
+fi
# exit on error
set -e
ME=`basename $0`
DIR="$( cd "$( dirname "$0" )" && pwd )"
-SDK_VER="6.1"
CWD=`pwd`
BUILD_DIR="/tmp/build-uscxml-ios"
@@ -24,22 +30,21 @@ BUILD_DIR="/tmp/build-uscxml-ios"
#
# Build device with older SDK for old architectures
#
-export IOS_SDK_VERSION=5.1
-
-mkdir -p ${BUILD_DIR}/device-${IOS_SDK_VERSION}-debug &> /dev/null
-cd ${BUILD_DIR}/device-${IOS_SDK_VERSION}-debug
-cmake ${DIR}/../../ -DCMAKE_TOOLCHAIN_FILE=${DIR}/../cmake/CrossCompile-iOS.cmake -DDIST_PREPARE=ON -DCMAKE_BUILD_TYPE=Debug
-make -j4
-
-mkdir -p ${BUILD_DIR}/device-${IOS_SDK_VERSION}-release &> /dev/null
-cd ${BUILD_DIR}/device-${IOS_SDK_VERSION}-release
-cmake ${DIR}/../../ -DCMAKE_TOOLCHAIN_FILE=${DIR}/../cmake/CrossCompile-iOS.cmake -DDIST_PREPARE=ON -DCMAKE_BUILD_TYPE=Release
-make -j4
+# export IOS_SDK_VERSION=5.1
+#
+# mkdir -p ${BUILD_DIR}/device-${IOS_SDK_VERSION}-debug &> /dev/null
+# cd ${BUILD_DIR}/device-${IOS_SDK_VERSION}-debug
+# cmake ${DIR}/../../ -DCMAKE_TOOLCHAIN_FILE=${DIR}/../cmake/CrossCompile-iOS.cmake -DDIST_PREPARE=ON -DCMAKE_BUILD_TYPE=Debug
+# make -j4
+#
+# mkdir -p ${BUILD_DIR}/device-${IOS_SDK_VERSION}-release &> /dev/null
+# cd ${BUILD_DIR}/device-${IOS_SDK_VERSION}-release
+# cmake ${DIR}/../../ -DCMAKE_TOOLCHAIN_FILE=${DIR}/../cmake/CrossCompile-iOS.cmake -DDIST_PREPARE=ON -DCMAKE_BUILD_TYPE=Release
+# make -j4
#
-# Build device with current SDK
+# Build device and sim with current SDK
#
-export IOS_SDK_VERSION=6.1
mkdir -p ${BUILD_DIR}/device-${IOS_SDK_VERSION}-debug &> /dev/null
cd ${BUILD_DIR}/device-${IOS_SDK_VERSION}-debug