Remove ?syntax and set failure exit code on throw.

[cycript.git] / apple-configure.sh

diff --git a/apple-configure.sh b/apple-configure.sh
index d89d4cf0ffd7ba4aba3310f7b487a677a6ac76f1..68625e591267acfacc5d12aba5544b6b3dd2278d 100755 (executable)
--- a/apple-configure.sh
+++ b/apple-configure.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Cycript - Optimizing JavaScript Compiler/Runtime
-# Copyright (C) 2009-2014  Jay Freeman (saurik)
+# Copyright (C) 2009-2015  Jay Freeman (saurik)
 
 # GNU Affero General Public License, Version 3 {{{
 #
@@ -23,11 +23,6 @@ set -e
 
 cd "${0%%/*}"
 
-if [[ ! -e readline.osx/libreadline.a ]]; then
-    ./apple-readline.sh; fi
-if [[ ! -e libffi.a ]]; then
-    ./libffi.sh; fi
-
 if ! which aclocal; then
     touch aclocal.m4; fi
 if ! which autoconf; then
@@ -38,6 +33,7 @@ if ! which autoheader; then
     touch config.h.in; fi
 
 flags=("$@")
+ccf=(-g0 -O3)
 
 function path() {
     xcodebuild -sdk "$1" -version Path
@@ -49,48 +45,56 @@ mac=$(path macosx)
 function configure() {
     local dir=$1
     local sdk=$2
-    local flg=$3
-    shift 3
+    local arc=$3
+    local min=$4
+    local ffi=$5
+    local cpf=$6
+    local ldf=$7
+    local obc=$8
+    shift 8
+
+    set -- "$@" --enable-static --with-pic
 
     cc=$(xcrun --sdk "${sdk}" -f clang)
     cxx=$(xcrun --sdk "${sdk}" -f clang++)
+
+    flg="-arch ${arc} ${min}"
     flg+=" -isysroot $(path "${sdk}")"
 
     rm -rf build."${dir}"
     mkdir build."${dir}"
     cd build."${dir}"
 
-    CC="${cc} ${flg}" CXX="${cxx} ${flg}" OBJCXX="${cxx} ${flg}" \
-        ../configure --enable-maintainer-mode "${flags[@]}" --prefix="/usr" "$@"
+    if "${ffi}"; then
+        cpf+=" -I../libffi.${arch}/include"
+        ldf+=" -L../libffi.${arch}/.libs"
+    fi
 
-    cd ..
-}
+    cpf+=" -I../libuv/include"
+    ldf+=" -L../libuv.${arch}/.libs"
 
-function build() {
-    local dir=$1
-    local sdk=$2
-    local flg=$3
-    shift 3
+    ../configure --enable-maintainer-mode "${flags[@]}" --prefix="/usr" "$@" \
+        CC="${cc} ${flg}" CXX="${cxx} ${flg}" OBJCXX="${cxx} ${flg}" \
+        CFLAGS="${ccf[*]}" CXXFLAGS="${ccf[*]}" OBJCXXFLAGS="${ccf[*]} ${obc}" \
+        CPPFLAGS="${cpf}" LDFLAGS="${ldf}"
 
-    configure "${dir}" "${sdk}" "${flg}" "$@" --enable-static --with-pic
+    cd ..
 }
 
 for arch in i386 x86_64; do
-    build "osx-${arch}" "${mac}" "-arch ${arch} -mmacosx-version-min=10.6" \
-        CPPFLAGS="-I../readline.osx" LDFLAGS="-L../readline.osx"
+    configure "osx-${arch}" "${mac}" "${arch}" "-mmacosx-version-min=10.6" \
+        false "-I../readline.osx" "-L../readline.osx" ""
 done
 
 for arch in i386 x86_64; do
-    build "sim-${arch}" iphonesimulator "-arch ${arch} -mios-simulator-version-min=4.0" \
-        OBJCXXFLAGS="-fobjc-abi-version=2 -fobjc-legacy-dispatch" \
-        CPPFLAGS="-I../libffi.${arch}/include" \
-        LDFLAGS="-L.." \
-    --disable-console
+    configure "sim-${arch}" iphonesimulator "${arch}" "-mios-simulator-version-min=4.0" \
+        true "" "" "-fobjc-abi-version=2 -fobjc-legacy-dispatch" \
+        --disable-console
 done
 
 for arch in armv6 armv7 armv7s arm64; do
-    cpf="-I../libffi.${arch}/include"
-    ldf="-L.."
+    cpf=""
+    ldf=""
 
     flg=()
     if [[ ${arch} != armv6 ]]; then
@@ -111,6 +115,7 @@ for arch in armv6 armv7 armv7s arm64; do
         #cpf+=" -mthumb"
     fi
 
-    build "ios-${arch}" iphoneos "-arch ${arch} -miphoneos-version-min=${min}" --host=arm-apple-darwin10 \
-        CPPFLAGS="${cpf}" LDFLAGS="${ldf}" "${flg[@]}" --host=arm-apple-darwin10
+    configure "ios-${arch}" iphoneos "${arch}" "-miphoneos-version-min=${min}" \
+        true "${cpf[*]}" "${ldf[*]}" "" \
+        --host=arm-apple-darwin10 LFLAGS="--ecs --meta-ecs" "${flg[@]}"
 done