Merge pull request #8 from andyque/testScripts

More improvement to the existing scripts

Author: minggo

build/android/build.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 set -e
+set -x
 
 info()
 {
@@ -17,10 +18,10 @@ ANDROID_ARCH=arm
 
 # TODO: configure to compile specify 3rd party libraries
 OPTIONS="
-    --disable-lua
-    --disable-freetype2
+    --enable-lua
+    --enable-freetype2
     --enable-png
-    --disable-zlib
+    --enable-zlib
 "
 
 usage()
@@ -34,6 +35,7 @@ OPTIONS:
    -k <sdk>      Use the specified Android API level (default: $ANDROID_API)
    -a <arch>     Use the specified arch (default: $ANDROID_ABI)
    -n <version>  Use the gcc version(default: $ANDROID_GCC_VERSION)
+   -l <libname>  Use the specified library name
 EOF
 }
 
@@ -47,7 +49,7 @@ spopd()
     popd > /dev/null
 }
 
-while getopts "hvk:a:" OPTION
+while getopts "hvk:a:l:" OPTION
 do
      case $OPTION in
          h)
@@ -57,16 +59,19 @@ do
          q)
              set +x
              QUIET="yes"
-         ;;
+             ;;
          a)
              ANDROID_ABI=$OPTARG
-         ;;
+             ;;
          k)
              ANDROID_API=$OPTARG
-         ;;
+             ;;
          n)
              ANDROID_GCC_VERSION=$OPTARG
-         ;;
+             ;;
+         l)
+             OPTIONS=--enable-$OPTARG
+             ;;
      esac
 done
 
@@ -106,20 +111,34 @@ cocos_root=`pwd`/../..
 
 export ANDROID_ABI
 export ANDROID_API
-export LDFLAGS="-L${ANDROID_NDK}/platforms/${ANDROID_API}/arch-${ANDROID_ARCH}/usr/lib"
-info "LD FLAGS SELECTED = '${LDFLAGS}'"
+# export LDFLAGS="-L${ANDROID_NDK}/platforms/${ANDROID_API}/arch-${ANDROID_ARCH}/usr/lib"
+# info "LD FLAGS SELECTED = '${LDFLAGS}'"
 
 export PATH="${toolchain_bin}:${cocos_root}/extras/tools/bin:$PATH"
+if [ "$ANDROID_ABI" = "armeabi-v7a" ]; then
+    export CFLAGS="-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Os -g -DNDEBUG -fomit-frame-pointer -fno-strict-aliasing -DANDROID  -Wa,--noexecstack -Wformat -Werror=format-security  "
+elif [ "$ANDROID_ABI" = "armeabi" ]; then
+    export CFLAGS="-ffunction-sections -funwind-tables -fstack-protector -no-canonical-prefixes  -march=armv5te -mtune=xscale -msoft-float -mthumb -Os -g -DNDEBUG -fomit-frame-pointer -fno-strict-aliasing -DANDROID  -Wa,--noexecstack -Wformat -Werror=format-security"
+else
+    export CFLAGS="-ffunction-sections -funwind-tables -fstack-protector -fPIC -no-canonical-prefixes -O2 -g -DNDEBUG -fomit-frame-pointer -fstrict-aliasing -DANDROID  -Wa,--noexecstack -Wformat -Werror=format-security"
+fi
+
+info "CFLAGS is ${CFLAGS}"
+
 #
 # build 3rd party libraries
 #
 info "Building static libraries"
 spushd "${cocos_root}/contrib"
 mkdir -p "Android-${ANDROID_ABI}" && cd "Android-${ANDROID_ABI}"
 
+
 ../bootstrap ${OPTIONS} \
              --host=${TARGET} \
              --prefix=${cocos_root}/contrib/${TARGET}-${ANDROID_ABI}> $out
+
+echo "ANDROID_ARCH := ${CFLAGS}" >> config.mak
+
 #
 # make
 #

build/ios/build.sh

@@ -121,7 +121,7 @@ fi
 
 BUILDDIR="${COCOSROOT}/build-ios-${PLATFORM}/${ARCH}"
 
-PREFIX="${COCOSROOT}/install-ios-${PLATFORM}/${ARCH}"
+PREFIX="${COCOSROOT}/contrib/install-ios-${PLATFORM}/${ARCH}"
 
 export PATH="/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin"
 
@@ -196,13 +196,16 @@ else
     export ASCPP="xcrun as"
 fi
 
+
+
 ../bootstrap ${OPTIONS} \
         --build=x86_64-apple-darwin14 \
         --host=${TARGET} \
-        --prefix=${COCOSROOT}/contrib/${TARGET}-${ARCH} > ${out}
+        --prefix=${PREFIX} > ${out}
 
 echo "EXTRA_CFLAGS += ${EXTRA_CFLAGS}" >> config.mak
 echo "EXTRA_LDFLAGS += ${EXTRA_LDFLAGS}" >> config.mak
+echo "IOS_ARCH := ${ARCH}" >> config.mak
 make fetch
 make list
 make

build/tizen/build.sh

@@ -83,9 +83,8 @@ info $toolchain_bin
 export PATH="${toolchain_bin}:${cocos_root}/extras/tools/bin:$PATH"
 TARGET="arm-linux-gnueabi"
 
-# FIXME: If the Tizen sdk is changeing, the version number might need also be changed
-export LDFLAGS="-L${TIZEN_SDK}/platforms/mobile-2.3/rootstraps/mobile-2.3-device.core/usr/lib"
-info "LD FLAGS SELECTED = '${LDFLAGS}'"
+# export LDFLAGS="-L${TIZEN_SDK}/platforms/mobile-2.3/rootstraps/mobile-2.3-device.core/usr/lib"
+# info "LD FLAGS SELECTED = '${LDFLAGS}'"
 
 #
 # build 3rd party libraries

contrib/src/curl/rules.mak

@@ -13,8 +13,11 @@ curl: curl-$(CURL_VERSION).tar.gz .sum-curl
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
 
+DEPS_curl = zlib $(DEPS_zlib)
 
-.curl: curl
+DEPS_curl = openssl $(DEPS_openssl)
+
+.curl: curl .zlib .openssl
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) \
 		--with-ssl \
 		--with-zlib \

contrib/src/main.mak

@@ -408,6 +408,7 @@ ifdef HAVE_CROSS_COMPILE
 ifdef HAVE_ANDROID
 # cmake will overwrite our --sysroot with a native (host) one on Darwin
 # Set it to "" right away to short-circuit this behaviour
+	echo "set(CMAKE_SYSTEM_NAME Linux)" >> $@
 	echo "set(CMAKE_CXX_SYSROOT_FLAG \"\")" >> $@
 	echo "set(CMAKE_C_SYSROOT_FLAG \"\")" >> $@
 endif

contrib/src/openssl/rules.mak

@@ -22,6 +22,18 @@ ifdef HAVE_ANDROID
 OPENSSL_COMPILER=os/compiler:$(HOST)
 endif
 
+ifeq ($(IOS_ARCH),armv7)
+OPENSSL_CONFIG_VARS="BSD-generic32"
+endif
+
+ifeq ($(IOS_ARCH),i386)
+OPENSSL_CONFIG_VARS="BSD-generic32"
+endif
+
+ifeq ($(IOS_ARCH),arm64)
+OPENSSL_CONFIG_VARS="BSD-generic64"
+endif
+
 $(TARBALLS)/openssl-$(OPENSSL_VERSION).tar.gz:
 	$(call download,$(OPENSSL_URL))
 
@@ -36,5 +48,13 @@ endif
 
 .openssl: openssl
 	cd $< && $(HOSTVARS)  ./Configure $(OPENSSL_CONFIG_VARS)  --prefix=$(PREFIX) $(OPENSSL_COMPILER)
+ifdef HAVE_IOS
+	# cd $< && perl -i -pe 's|static volatile sig_atomic_t intr_signal|static volatile int intr_signal|' crypto/ui/ui_openssl.c
+	cd $< && perl -i -pe "s|^CC= xcrun clang|CC= xcrun cc -arch ${IOS_ARCH} -miphoneos-version-min=6.0 |g" Makefile
+	cd $< && perl -i -pe "s|^CFLAG= (.*)|CFLAG= -isysroot ${IOS_SDK} |g" Makefile
+endif
+ifdef HAVE_ANDROID
+	cd $< && perl -i -pe "s|^CFLAG= (.*)|CFLAG= ${ANDROID_ARCH} |g" Makefile
+endif
 	cd $< && $(MAKE) install
 	touch $@

contrib/src/png/rules.mak

@@ -18,9 +18,7 @@ png: libpng-$(PNG_VERSION).tar.xz .sum-png
 	$(UNPACK)
 	$(MOVE)
 
-ifndef HAVE_ANDROID
 DEPS_png = zlib $(DEPS_zlib)
-endif
 
 .png: png
 	$(RECONF)

contrib/src/websockets/rules.mak

@@ -10,17 +10,23 @@ $(TARBALLS)/libwebsockets-1.3-chrome37-firefox30.zip:
 
 websockets: libwebsockets-1.3-chrome37-firefox30.zip .sum-websockets
 	$(UNPACK)
+ifdef HAVE_ANDROID
+	$(APPLY) $(SRC)/websockets/websocket_android.patch
+endif
 	$(MOVE)
 
 ifdef HAVE_TIZEN
 EX_ECFLAGS = -fPIC
 endif
 
-DEPS_websockets = zlib $(DEPS_zlib)
+#FIXME: we need to pass __ANDROID__ to cflags
+# ifdef HAVE_ANDROID
+# EX_ECFLAGS = -D__ANDROID__
+# endif
 
-DEPS_websockets = openssl $(DEPS_openssl)
+DEPS_websockets = zlib $(DEPS_zlib)
 
-.websockets: websockets .zlib .openssl toolchain.cmake
-	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(EX_ECFLAGS)" $(CMAKE) -DCMAKE_BUILD_TYPE=Release
-	cd $< && $(MAKE) install
+.websockets: websockets .zlib toolchain.cmake
+	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(EX_ECFLAGS)" $(CMAKE) -DCMAKE_BUILD_TYPE=Release -DLWS_WITH_SSL=0 -DLWS_WITHOUT_TEST_PING=1
+	cd $< && $(MAKE) VERBOSE=1 install
 	touch $@

contrib/src/websockets/websocket_android.patch

@@ -0,0 +1,13 @@
+diff --git a/lib/private-libwebsockets.h b/lib/private-libwebsockets.h
+index 6fae889..97c0d0e 100755
+--- a/lib/private-libwebsockets.h
++++ b/lib/private-libwebsockets.h
+@@ -105,7 +105,7 @@
+ #else
+  #include <ifaddrs.h>
+ #endif
+-#include <sys/syslog.h>
++#include <syslog.h>
+ #include <sys/un.h>
+ #include <sys/socket.h>
+ #include <netdb.h>