From 42311506d531ad98d674cbaa4768453cf8950451 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Sat, 11 Oct 2014 01:57:34 -0700 Subject: [PATCH] Give Xcode/Apple/iOS build scripts a common prefix. --- .gitignore | 1 + xcode.sh => apple-configure.sh | 6 +++--- libffi.sh => apple-libffi.sh | 0 make.sh => apple-make.sh | 2 +- readline.sh => apple-readline.sh | 6 ++++-- xcode.mk => apple.mk | 0 6 files changed, 9 insertions(+), 6 deletions(-) rename xcode.sh => apple-configure.sh (95%) rename libffi.sh => apple-libffi.sh (100%) rename make.sh => apple-make.sh (96%) rename readline.sh => apple-readline.sh (86%) rename xcode.mk => apple.mk (100%) diff --git a/.gitignore b/.gitignore index 96b2ad4..bb5c540 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ aclocal.m4 stamp-h1 readline-6.2 readline-6.2.tar.gz +readline.* libffi.* build.* Cycript.ios diff --git a/xcode.sh b/apple-configure.sh similarity index 95% rename from xcode.sh rename to apple-configure.sh index f6ab534..c4bfd02 100755 --- a/xcode.sh +++ b/apple-configure.sh @@ -23,8 +23,8 @@ set -e cd "${0%%/*}" -if [[ ! -e readline/libreadline.a ]]; then - ./readline.sh; fi +if [[ ! -e readline.osx/libreadline.a ]]; then + ./apple-readline.sh; fi if [[ ! -e libffi.a ]]; then ./libffi.sh; fi @@ -77,7 +77,7 @@ function build() { for arch in i386 x86_64; do build "osx-${arch}" "${mac}" "-arch ${arch} -mmacosx-version-min=10.6" \ - CPPFLAGS="-I../readline" LDFLAGS="-L../readline" + CPPFLAGS="-I../readline.osx" LDFLAGS="-L../readline.osx" done for arch in i386 x86_64; do diff --git a/libffi.sh b/apple-libffi.sh similarity index 100% rename from libffi.sh rename to apple-libffi.sh diff --git a/make.sh b/apple-make.sh similarity index 96% rename from make.sh rename to apple-make.sh index a30c27c..0f552ba 100755 --- a/make.sh +++ b/apple-make.sh @@ -19,4 +19,4 @@ # along with Cycript. If not, see . # }}} -exec make -f xcode.mk "$@" +exec make -f apple.mk "$@" diff --git a/readline.sh b/apple-readline.sh similarity index 86% rename from readline.sh rename to apple-readline.sh index cd11152..185db6c 100755 --- a/readline.sh +++ b/apple-readline.sh @@ -23,7 +23,9 @@ set -e arch="-arch i386 -arch x86_64" -cd readline -CFLAGS="-g -O2 ${arch}" ./configure --disable-shared --enable-static +rm -rf readline.osx +mkdir readline.osx +cd readline.osx +CFLAGS="-g -O2 ${arch}" ../readline/configure --disable-shared --enable-static make ln -sf . readline diff --git a/xcode.mk b/apple.mk similarity index 100% rename from xcode.mk rename to apple.mk -- 2.45.2