Numerous updates for people trying to use this environment.

git-svn-id: http://svn.telesphoreo.org/trunk@545 514c082c-b64e-11dc-b46d-3d985efe055d

6 files changed, 48 insertions, 28 deletions

diff --git a/build.sh b/build.sh
index 14913ff72..041468428 100755
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@
 set -e
 shopt -s extglob
 #for package in coreutils berkeleydb bzip2 apt adv-cmds libutil gettext gawk tar network-cmds shell-cmds odcctools readline modmyifone darwintools sed pcre gnupg grep inetutils saurik gzip dpkg iphonesurge unzip libarmfp nano base bash system-cmds libresolv zip ncurses less; do
-for package in data/!(*_|cydia|iphone-python|mobileterminal|jocstrap|iphone-java|uicaboodle|pyobjc|python|setuptools|uicaboodle.py); do
+for package in data/!(*_|apptapptools|gdata-objectivec-client|iphone-python|metasploit3|mobileterminal|jocstrap|iphone-java|uicaboodle|uicaboodle.py|uikittools|x264); do
 #for package in data/!(*_); do
     PKG_NAME=$(basename "${package}")
     echo "========== ${PKG_NAME} =========="
diff --git a/control.sh b/control.sh
index c52aef3ba..8a1f2c7ff 100755
--- a/control.sh
+++ b/control.sh
@@ -139,6 +139,12 @@ Homepage: $(cat "${PKG_DATA}/_metadata/homepage")
 EOF
 fi
 
+if [[ -e ${PKG_DATA}/_metadata/depiction ]]; then
+    cat <<EOF
+Depiction: $(cat "${PKG_DATA}/_metadata/depiction")
+EOF
+fi
+
 if [[ $1 == status || $1 == available ]]; then
     echo
 fi
diff --git a/exec.sh b/exec.sh
index 300557fbb..c7bf7c995 100755
--- a/exec.sh
+++ b/exec.sh
@@ -16,9 +16,15 @@ PKG_INCL=
 PKG_LIBS=
 PKG_PKGS=
 
-for dep in $({
-    find -L "${PKG_DATA}"/_metadata -name '*.dep' | cut -d '/' -f -
-} | sort -u); do
+case "${PKG_NAME}" in
+    (-) deps=();;
+    (:*) deps=(${PKG_NAME//:/ });;
+    (*) deps=($({
+        find -L "${PKG_DATA}"/_metadata -name '*.dep' | cut -d '/' -f -
+    } | sort -u));;
+esac
+
+for dep in ${deps[@]}; do
     DEP_NAME=$(basename "${dep}" .dep)
     DEP_DEST=$(PKG_DEST_ "${DEP_NAME}")
     PKG_PATH=${PKG_PATH}:${DEP_DEST}
@@ -43,11 +49,11 @@ PKG_INCL=${PKG_INCL%:}
 PKG_LIBS=${PKG_LIBS%:}
 PKG_PKGS=${PKG_PKGS%:}
 
+CODESIGN_ALLOCATE=$(which "${PKG_TARG}"-codesign_allocate) \
 C_INCLUDE_PATH= \
 COMPILER_PATH=${PKG_BASE}/util \
-CPATH=${PKG_INCL} \
+CPATH=/dat/git/iphone-api:${PKG_INCL} \
 CPLUS_INCLUDE_PATH= \
-GCC_EXEC_PREFIX=${PKG_CCPF}/lib/gcc \
 LD_LIBRARY_PATH=${PKG_LIBS} \
 LIBRARY_PATH=${PKG_LIBS} \
 MIGCC=${PKG_TARG}-gcc \
diff --git a/helper.sh b/helper.sh
index 69dc93089..04af080f7 100755
--- a/helper.sh
+++ b/helper.sh
@@ -7,22 +7,24 @@ export PKG_CCPF=$("${PKG_TARG}-gcc" -v 2>&1 | grep -- --prefix | sed -e 's/.*--p
 
 source "${PKG_BASE}/folders.sh"
 
-export PKG_DATA=$(PKG_DATA_ "${PKG_NAME}")
-export PKG_WORK=$(PKG_WORK_ "${PKG_NAME}")
-export PKG_DEST=$(PKG_DEST_ "${PKG_NAME}")
+if [[ ${PKG_NAME} != @(-|:*) ]]; then
+    export PKG_DATA=$(PKG_DATA_ "${PKG_NAME}")
+    export PKG_WORK=$(PKG_WORK_ "${PKG_NAME}")
+    export PKG_DEST=$(PKG_DEST_ "${PKG_NAME}")
 
-export PKG_STAT=${PKG_BASE}/stat/${PKG_ARCH}/${PKG_NAME}
-export PKG_DATA=$(echo "${PKG_BASE}"/data/"${PKG_NAME}"?(_))
-export PKG_VRSN=$(cat "${PKG_DATA}/_metadata/version")
-export PKG_PRIO=$(cat "${PKG_DATA}/_metadata/priority")
-export PKG_RVSN=$(cat "${PKG_STAT}/dest-ver" 2>/dev/null)
+    export PKG_STAT=${PKG_BASE}/stat/${PKG_ARCH}/${PKG_NAME}
+    export PKG_DATA=$(echo "${PKG_BASE}"/data/"${PKG_NAME}"?(_))
+    export PKG_VRSN=$(cat "${PKG_DATA}/_metadata/version")
+    export PKG_PRIO=$(cat "${PKG_DATA}/_metadata/priority")
+    export PKG_RVSN=$(cat "${PKG_STAT}/dest-ver" 2>/dev/null)
 
-if [[ ! -e ${PKG_DATA} ]]; then
-    echo "unknown package: ${PKG_NAME}" 1>&2
-    exit 1
-fi
+    if [[ ! -e ${PKG_DATA} ]]; then
+        echo "unknown package: ${PKG_NAME}" 1>&2
+        exit 1
+    fi
 
-declare -a PKG_DEPS
-for dep in "${PKG_DATA}"/_metadata/*.dep; do
-    PKG_DEPS[${#PKG_DEPS[@]}]=$(basename "${dep}" .dep)
-done
+    declare -a PKG_DEPS
+    for dep in "${PKG_DATA}"/_metadata/*.dep; do
+        PKG_DEPS[${#PKG_DEPS[@]}]=$(basename "${dep}" .dep)
+    done
+fi
diff --git a/make.sh b/make.sh
index c95161282..0d6d00f19 100755
--- a/make.sh
+++ b/make.sh
@@ -21,6 +21,8 @@ if [[ ! -x ${PKG_BASE}/util/ldid || ${PKG_BASE}/util/ldid -ot ${PKG_BASE}/util/l
     g++ -I ~/menes -o "${PKG_BASE}"/util/ldid{,.cpp} -x c "${PKG_BASE}"/util/{lookup2,sha1}.c
 fi
 
+export CODESIGN_ALLOCATE=$(which arm-apple-darwin9-codesign_allocate)
+
 for DEP_NAME in "${PKG_DEPS[@]}"; do
     "${PKG_MAKE}" "${DEP_NAME}"
 done
@@ -54,6 +56,10 @@ function pkg:patch() {
     pkg:libtool_ ltmain.sh
 
     for diff in "${PKG_DATA}"/*.diff; do
+        if [[ ${diff} == */_*.diff ]]; then
+            continue;
+        fi
+
         echo "patching with ${diff}..."
         patch -p1 <"${diff}"
     done
@@ -100,7 +106,7 @@ export -f pkg:libtool_
 
 function pkg:setup() {
     pkg:extract
-    cd *
+    cd */
     pkg:patch
 }
 
@@ -108,8 +114,7 @@ export -f pkg:setup
 
 function pkg:configure() {
     PKG_CONFIG="$(realpath "${PKG_BASE}/util/pkg-config.sh")" \
-    ac_cv_prog_cc_g=no \
-    ac_cv_prog_cxx_g=no \
+    ac_cv_prog_cc_g=no ac_cv_prog_cxx_g=no \
     "${PKG_CONF}" \
         --build=x86_64-unknown-linux-gnu \
         --host="${PKG_TARG}" \
diff --git a/package.sh b/package.sh
index 7d9e84382..387072e40 100755
--- a/package.sh
+++ b/package.sh
@@ -30,9 +30,9 @@ if [[ -e "${PKG_DATA}"/_metadata/prerm ]]; then
     cp -a "${PKG_DATA}"/_metadata/prerm "$(pkg_ /DEBIAN)"
 fi
 
-#if [[ -e "${PKG_DATA}"/_metadata/conffiles ]]; then
-#    cp -a "${PKG_DATA}"/_metadata/conffiles "$(pkg_ /DEBIAN)"
-#fi
+if [[ -e "${PKG_DATA}"/_metadata/conffiles ]]; then
+    cp -a "${PKG_DATA}"/_metadata/conffiles "$(pkg_ /DEBIAN)"
+fi
 
 export PKG_HASH=$(util/catdir.sh "${PKG_DEST}" | md5sum | cut -d ' ' -f 1)
 echo "hashed dest ${PKG_NAME} to: ${PKG_HASH}"
@@ -54,6 +54,7 @@ else
         dpkg-deb -b "${PKG_DEST}" "${PKG_PACK}"
         echo "${PKG_HASH}" >"${PKG_STAT}/dest-md5"
         echo "${PKG_RVSN}" >"${PKG_STAT}/dest-ver"
+        "${PKG_BASE}"/upload.sh debs "${PKG_PACK}"
     fi
 fi