From e3f0924c467bcf4c090421724387c32b5322a138 Mon Sep 17 00:00:00 2001 From: DAI Zhiwei Date: Wed, 16 May 2012 21:07:12 +0800 Subject: [PATCH 1/3] updated platform path; updated module versions; commented out modules other than libevent --- .gitignore | 36 ++++++++++++++++++++++++++++++++++++ build.sh | 50 +++++++++++++++++++++++++------------------------- configuration | 5 +++-- 3 files changed, 64 insertions(+), 27 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..29d63c3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,36 @@ +# Compiled source # +################### +*.com +*.class +*.dll +*.exe +*.o +*.so + +# Packages # +############ +# it's better to unpack these files and commit the raw source +# git has its own built in compression methods +*.7z +*.dmg +*.gz +*.iso +*.jar +*.rar +*.tar +*.zip + +# Logs and databases # +###################### +*.log +*.sql +*.sqlite + +# OS generated files # +###################### +.DS_Store* +ehthumbs.db +Icon? +Thumbs.db +*~ + diff --git a/build.sh b/build.sh index 4a2bc64..c94dd59 100755 --- a/build.sh +++ b/build.sh @@ -38,8 +38,8 @@ function do_loadenv { function do_export { unset CFLAGS if [[ ${ARCH} != "system" ]]; then - export DEVROOT="/Developer/Platforms/${PLATFORM}.platform/Developer" - export SDKROOT="/Developer/Platforms/${PLATFORM}.platform/Developer/SDKs/${PLATFORM}$SDK_VERSION.sdk" + export DEVROOT="/Applications/Xcode.app/Contents/Developer/Platforms/${PLATFORM}.platform/Developer" + export SDKROOT="/Applications/Xcode.app/Contents/Developer/Platforms/${PLATFORM}.platform/Developer/SDKs/${PLATFORM}$SDK_VERSION.sdk" export LD=${DEVROOT}/usr/bin/ld export CPP=/usr/bin/cpp export CXX="${DEVROOT}/usr/bin/g++" @@ -133,24 +133,24 @@ function do_curl { } function do_libevent { - export PACKAGE_NAME="libevent-${LIBEVENT_VERSION}" - pushd ${TEMP_DIR} - if [ ! -e "${PACKAGE_NAME}.tar.gz" ] - then - /usr/bin/curl -O -L "https://github.com/downloads/libevent/libevent/${PACKAGE_NAME}.tar.gz" || do_abort "$FUNCNAME: fetch failed " - fi - - if [[ -z $DONT_OVERWRITE ]]; then - rm -rf "${PACKAGE_NAME}" - tar zxvf "${PACKAGE_NAME}.tar.gz" || do_abort "$FUNCNAME: unpack failed " - fi - - pushd ${PACKAGE_NAME} + #export PACKAGE_NAME="libevent-${LIBEVENT_VERSION}" + #pushd ${TEMP_DIR} + #if [ ! -e "${PACKAGE_NAME}.tar.gz" ] + #then + # /usr/bin/curl -O -L "https://github.com/downloads/libevent/libevent/${PACKAGE_NAME}.tar.gz" || do_abort "$FUNCNAME: fetch failed " + #fi + + #if [[ -z $DONT_OVERWRITE ]]; then + # rm -rf "${PACKAGE_NAME}" + # tar zxvf "${PACKAGE_NAME}.tar.gz" || do_abort "$FUNCNAME: unpack failed " + #fi + # + #pushd ${PACKAGE_NAME} # libevent patch to hardcode google public dns servers for iOS # as there is no /etc/resolv.conf in iOS # (TODO... it properly.. XD) - patch -N < ${PATCH_DIR}/libevent-nameservers.patch + #patch -N < ${PATCH_DIR}/libevent-nameservers.patch do_export @@ -239,15 +239,15 @@ done mkdir -p ${TEMP_DIR} -if [[ $BUILD_FILTER == *ssl* ]]; then - do_openssl -fi -if [[ $BUILD_FILTER == *curl* ]]; then - do_curl -fi +#if [[ $BUILD_FILTER == *ssl* ]]; then +# do_openssl +#fi +#if [[ $BUILD_FILTER == *curl* ]]; then +# do_curl +#fi if [[ $BUILD_FILTER == *libev* ]]; then do_libevent fi -if [[ $BUILD_FILTER == *trans* ]]; then - do_transmission -fi +#if [[ $BUILD_FILTER == *trans* ]]; then +# do_transmission +#fi diff --git a/configuration b/configuration index 3eedf85..89069ce 100644 --- a/configuration +++ b/configuration @@ -3,12 +3,13 @@ ######################### ARCH="armv7" +#ARCH="i386" -SDK_VERSION="5.0" +SDK_VERSION="5.1" PARALLEL_NUM=1 CURL_VERSION=7.21.5 -LIBEVENT_VERSION="2.0.16-stable" +LIBEVENT_VERSION="2.0.19-stable" OPENSSL_VERSION=1.0.0e TRANSMISSION_VERSION=2.50 From da3be843eba1feb2f629969289d4edc94a6d7cac Mon Sep 17 00:00:00 2001 From: DAI Zhiwei Date: Wed, 16 May 2012 21:15:00 +0800 Subject: [PATCH 2/3] updated gitignore --- .gitignore | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 29d63c3..36d26b4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,9 @@ +# Editors leave these lying around +\#*\# +.#* +*~ +*.swp + # Compiled source # ################### *.com @@ -6,6 +12,14 @@ *.exe *.o *.so +*.obj +*.lib +*.dylib +*.a + +# Patch leaves these lying arround +*.orig +*.rej # Packages # ############ @@ -32,5 +46,5 @@ ehthumbs.db Icon? Thumbs.db -*~ + From e179423636c3e11939160fb202bf0ce3ad48e9bb Mon Sep 17 00:00:00 2001 From: DAI Zhiwei Date: Wed, 16 May 2012 21:51:05 +0800 Subject: [PATCH 3/3] updated openssl version --- build.sh | 34 +++++++++++++++++----------------- configuration | 6 +++--- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/build.sh b/build.sh index c94dd59..a416ac4 100755 --- a/build.sh +++ b/build.sh @@ -133,24 +133,24 @@ function do_curl { } function do_libevent { - #export PACKAGE_NAME="libevent-${LIBEVENT_VERSION}" - #pushd ${TEMP_DIR} - #if [ ! -e "${PACKAGE_NAME}.tar.gz" ] - #then - # /usr/bin/curl -O -L "https://github.com/downloads/libevent/libevent/${PACKAGE_NAME}.tar.gz" || do_abort "$FUNCNAME: fetch failed " - #fi - - #if [[ -z $DONT_OVERWRITE ]]; then - # rm -rf "${PACKAGE_NAME}" - # tar zxvf "${PACKAGE_NAME}.tar.gz" || do_abort "$FUNCNAME: unpack failed " - #fi - # - #pushd ${PACKAGE_NAME} + export PACKAGE_NAME="libevent-${LIBEVENT_VERSION}" + pushd ${TEMP_DIR} + if [ ! -e "${PACKAGE_NAME}.tar.gz" ] + then + /usr/bin/curl -O -L "https://github.com/downloads/libevent/libevent/${PACKAGE_NAME}.tar.gz" || do_abort "$FUNCNAME: fetch failed " + fi + + if [[ -z $DONT_OVERWRITE ]]; then + rm -rf "${PACKAGE_NAME}" + tar zxvf "${PACKAGE_NAME}.tar.gz" || do_abort "$FUNCNAME: unpack failed " + fi + + pushd ${PACKAGE_NAME} # libevent patch to hardcode google public dns servers for iOS # as there is no /etc/resolv.conf in iOS # (TODO... it properly.. XD) - #patch -N < ${PATCH_DIR}/libevent-nameservers.patch + patch -N < ${PATCH_DIR}/libevent-nameservers.patch do_export @@ -239,9 +239,9 @@ done mkdir -p ${TEMP_DIR} -#if [[ $BUILD_FILTER == *ssl* ]]; then -# do_openssl -#fi +if [[ $BUILD_FILTER == *ssl* ]]; then + do_openssl +fi #if [[ $BUILD_FILTER == *curl* ]]; then # do_curl #fi diff --git a/configuration b/configuration index 89069ce..ad179f2 100644 --- a/configuration +++ b/configuration @@ -2,15 +2,15 @@ ######################### -ARCH="armv7" -#ARCH="i386" +#ARCH="armv7" +ARCH="i386" SDK_VERSION="5.1" PARALLEL_NUM=1 CURL_VERSION=7.21.5 LIBEVENT_VERSION="2.0.19-stable" -OPENSSL_VERSION=1.0.0e +OPENSSL_VERSION=1.0.1c TRANSMISSION_VERSION=2.50 #########################