Also use CXType walker to for function prototypes.

[cycript.git] / apple-configure.sh

diff --git a/apple-configure.sh b/apple-configure.sh
index c4bfd021226ead02eddd448f70308be1a5c81528..103b11ddb9d7f627e6a27391e60b79ea0f39c698 100755 (executable)
--- a/apple-configure.sh
+++ b/apple-configure.sh
@@ -1,43 +1,30 @@
 #!/usr/bin/env bash
 
 #!/usr/bin/env bash
 

-# Cycript - Optimizing JavaScript Compiler/Runtime
-# Copyright (C) 2009-2013  Jay Freeman (saurik)
+# Cycript - The Truly Universal Scripting Language
+# Copyright (C) 2009-2016  Jay Freeman (saurik)

 
 

-# GNU General Public License, Version 3 {{{
+# GNU Affero General Public License, Version 3 {{{

 #
 #

-# Cycript is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published
-# by the Free Software Foundation, either version 3 of the License,
-# or (at your option) any later version.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.

 #
 #

-# Cycript is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of

 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-# GNU General Public License for more details.
+# GNU Affero General Public License for more details.

 #
 #

-# You should have received a copy of the GNU General Public License
-# along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # }}}
 
 set -e
 
 cd "${0%%/*}"
 
 # }}}
 
 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
-    touch configure.ac; fi
-if ! which automake; then
-    touch Makefile.in; fi
-if ! which autoheader; then
-    touch config.h.in; fi
-

 flags=("$@")
 flags=("$@")

+ccf=(-g0 -O3)

 
 function path() {
     xcodebuild -sdk "$1" -version Path
 
 function path() {
     xcodebuild -sdk "$1" -version Path


@@ -45,52 +32,65 @@ function path() {
 
 xcs=$(xcode-select --print-path)
 mac=$(path macosx)
 
 xcs=$(xcode-select --print-path)
 mac=$(path macosx)

+xct="${xcs}/Toolchains/XcodeDefault.xctoolchain/usr/lib"
+
+system=1

 
 function configure() {
     local dir=$1
     local sdk=$2
 
 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++)
 
     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}"
 
     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" "$@" \
+        --with-libclang="-rpath ${xct} ${xct}/libclang.dylib" \
+        CC="${cc} ${flg}" CXX="${cxx} ${flg}" OBJCXX="${cxx} ${flg}" \
+        CFLAGS="${ccf[*]}" CXXFLAGS="${ccf[*]}" OBJCXXFLAGS="${ccf[*]} ${obc}" \
+        CPPFLAGS="${cpf}" LDFLAGS="${ldf}" CY_SYSTEM="$((1<<system++))"

 
 

-    configure "${dir}" "${sdk}" "${flg}" "$@" --enable-static --with-pic
+    cd ..

 }
 
 for arch in i386 x86_64; do
 }
 
 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" "" \
+        --with-python=/usr/bin/python-config

 done
 
 for arch in i386 x86_64; do
 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
 done
 
 for arch in armv6 armv7 armv7s arm64; do

-    cpf="-I../libffi.${arch}/include"
-    ldf="-L.."
+    cpf=""
+    ldf=""

 
     flg=()
     if [[ ${arch} != armv6 ]]; then
 
     flg=()
     if [[ ${arch} != armv6 ]]; then


@@ -107,9 +107,11 @@ for arch in armv6 armv7 armv7s arm64; do
         min=7.0
     else
         min=2.0
         min=7.0
     else
         min=2.0

+        ldf+=" -Wl,-segalign,4000"

         #cpf+=" -mthumb"
     fi
 
         #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
 done