Provide more guarantees against merge catastrophe.

[cydia.git] / sysroot.sh

diff --git a/sysroot.sh b/sysroot.sh
index 607de65a9c6f272e0da9d55192502b81cbc92bc9..286070701a3d2ef4592282e71ce26f002b4c02f6 100755 (executable)
--- a/sysroot.sh
+++ b/sysroot.sh
@@ -23,6 +23,8 @@ if tar --help | grep bsdtar &>/dev/null; then
     exit 1
 fi
 
+xcode=$(xcodebuild -sdk macosx -version Path)
+
 rm -rf sysroot
 mkdir sysroot
 cd sysroot
@@ -62,7 +64,11 @@ function extract() {
 
 declare -A urls
 
-if [[ 1 ]]; then
+urls[apt7]=http://apt.saurik.com/debs/apt7_0.7.25.3-7_iphoneos-arm.deb
+urls[apt7-lib]=http://apt.saurik.com/debs/apt7-lib_0.7.25.3-12_iphoneos-arm.deb
+urls[coreutils]=http://apt.saurik.com/debs/coreutils_7.4-11_iphoneos-arm.deb
+
+if [[ 0 ]]; then
     wget -qO- "${repository}dists/${distribution}/${component}/binary-${architecture}/Packages.bz2" | bzcat | {
         regex='^([^ \t]*): *(.*)'
         declare -A fields
@@ -70,7 +76,7 @@ if [[ 1 ]]; then
         while IFS= read -r line; do
             if [[ ${line} == '' ]]; then
                 package=${fields[package]}
-                if [[ ${package} == *(apr|apr-lib|apt7|apt7-lib|coreutils|mobilesubstrate|pcre) ]]; then
+                if [[ -n ${urls[${package}]} ]]; then
                     filename=${fields[filename]}
                     urls[${package}]=${repository}${filename}
                 fi
@@ -92,23 +98,17 @@ done
 
 rm -f *.deb
 
-if substrate=$(readlink usr/include/substrate.h); then
-    if [[ ${substrate} == /* ]]; then
-        ln -sf "../..${substrate}" usr/include/substrate.h
-    fi
-fi
-
 mkdir -p usr/include
 cd usr/include
 
 mkdir CoreFoundation
 wget -O CoreFoundation/CFBundlePriv.h "http://www.opensource.apple.com/source/CF/CF-550/CFBundlePriv.h?txt"
-wget -O CoreFoundation/CFPriv.h "http://www.opensource.apple.com/source/CF/CF-550/CFPriv.h?txt"
 wget -O CoreFoundation/CFUniChar.h "http://www.opensource.apple.com/source/CF/CF-550/CFUniChar.h?txt"
 
 if true; then
     mkdir -p WebCore
     wget -O WebCore/WebCoreThread.h 'http://www.opensource.apple.com/source/WebCore/WebCore-658.28/wak/WebCoreThread.h?txt'
+    wget -O WebCore/WebEvent.h 'http://www.opensource.apple.com/source/WebCore/WebCore-658.28/platform/iphone/WebEvent.h?txt'
 else
     wget -O WebCore.tgz http://www.opensource.apple.com/tarballs/WebCore/WebCore-658.28.tar.gz
     tar -zx --transform 's@^[^/]*/@WebCore.d/@' -f WebCore.tgz
@@ -134,14 +134,14 @@ else
 fi
 
 for framework in ApplicationServices CoreServices IOKit IOSurface JavaScriptCore WebKit; do
-    ln -s /System/Library/Frameworks/"${framework}".framework/Headers "${framework}"
+    ln -s "${xcode}"/System/Library/Frameworks/"${framework}".framework/Headers "${framework}"
 done
 
 for framework in /System/Library/Frameworks/CoreServices.framework/Frameworks/*.framework; do
     name=${framework}
     name=${name%.framework}
     name=${name##*/}
-    ln -s "${framework}/Headers" "${name}"
+    ln -s "${xcode}/${framework}/Headers" "${name}"
 done
 
 mkdir -p Cocoa