UnionFolder clobbered sub-paths in nested bundles.

[ldid.git] / make.sh

diff --git a/make.sh b/make.sh
index 67122091c91f05a7c8aa3695f8ffe339afd3c2ca..d574ae7b898e48cf88b2fd94e36dcc68f133a816 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1,12 +1,65 @@
 #!/bin/bash
 
 set -e
 #!/bin/bash
 
 set -e

+shopt -s extglob

 
 

-flags=()
+if [[ $# == 0 ]]; then
+    ios=false
+else
+    ios=$1
+    shift
+fi
+
+if "${ios}"; then
+
+out=ios
+sudo xcode-select --switch /Applications/Xcode-4.6.3.app
+flags=(cycc -- -miphoneos-version-min=2.0 -arch armv6)
+
+else
+
+out=out
+sudo xcode-select --switch /Applications/Xcode-5.1.1.app
+
+if which xcrun &>/dev/null; then
+    flags=(xcrun -sdk macosx g++)
+    flags+=(-mmacosx-version-min=10.4)
+
+    for arch in i386 x86_64; do
+        flags+=(-arch "${arch}")
+    done
+else
+    flags=(g++)
+fi

 
 

-sdk=/Developer/SDKs/MacOSX10.4u.sdk
-if [[ -e $sdk ]]; then
-    flags+=(-mmacosx-version-min=10.4 -isysroot "$sdk")

 fi
 
 fi
 

-g++ -arch ppc -arch i386 -arch x86_64 "${flags[@]}" -o ldid ldid.cpp -I. -x c lookup2.c sha1.c
+sdk=$(xcodebuild -sdk iphoneos -version Path)
+
+flags+=(-I.)
+flags+=(-I"${sdk}"/usr/include/libxml2)
+flags+=(-Ilibplist/include)
+flags+=(-Ilibplist/libcnary/include)
+
+flags+=("$@")
+
+mkdir -p "${out}"
+os=()
+
+for c in libplist/libcnary/!(cnary).c libplist/src/*.c; do
+    o=${c%.c}.o
+    o="${out}"/${o##*/}
+    os+=("${o}")
+    if [[ "${c}" -nt "${o}" ]]; then
+        "${flags[@]}" -c -o "${o}" -x c "${c}"
+    fi
+done
+
+set -x
+
+"${flags[@]}" -c -std=c++11 -o "${out}"/ldid.o ldid.cpp
+"${flags[@]}" -o "${out}"/ldid "${out}"/ldid.o "${os[@]}" -x c lookup2.c -lxml2 -framework Security -lcrypto
+
+if ! "${ios}"; then
+    ln -sf out/ldid .
+fi