Merge pull request #12 from andyque/testScripts

minggo · minggo · commit 242386910bd2 · 2014-11-13T18:11:31.000+08:00
Make all the supported 3rd party libraries working on iOS platform
diff --git a/build/ios/build.sh b/build/ios/build.sh
@@ -88,7 +88,7 @@ function contains() {
 }
 
 all_arches=("armv7" "arm64" "i386" "x86_64" "armv7s")
-all_libraries=("png" "zlib" "lua" "luajit" "websockets" "curl" "box2d" "chipmunk" "freetype2" "jpeg" "protobuf" "tiff" "webp")
+all_libraries=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype2" "jpeg"  "tiff" "webp")
 
 # TODO: we only build a fat library with armv7, arm64, i386 and x86_64 arch. If you want to build armv7s into the fat lib, please add it into the following array.
 if [ $build_arches = "all" ]; then
@@ -99,7 +99,7 @@ fi
 
 if [ $build_library = "all" ]; then
     # TODO: more libraries need to be added here
-    declare -a build_library=("png" "zlib" "lua" "luajit" "websockets" "curl" "box2d" "chipmunk" "freetype2" "jpeg" "protobuf" "tiff" "webp")
+    declare -a build_library=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype2" "jpeg" "tiff" "webp")
 else
     build_library=(${build_library//,/ })
 fi
@@ -163,8 +163,8 @@ function create_fat_library()
 
     rm $all_static_libs
 
-    # remove debugging info
-    $STRIP -S $library_name/prebuilt/lib$library_name.a
+    # remove debugging info don't strip
+    # $STRIP -S $library_name/prebuilt/lib$library_name.a
     $LIPO -info $library_name/prebuilt/lib$library_name.a
 }
 
@@ -186,6 +186,10 @@ do
         archive_name=z
     fi
 
+    if [ $lib = "freetype2" ]; then
+        archive_name=freetype
+    fi
+
     mkdir -p $archive_name/prebuilt/
     mkdir -p $archive_name/include/
 
@@ -200,6 +204,7 @@ do
             continue
         fi
 
+
         is_simulator=""
         install_library_path="install-ios-OS"
         build_library_path="iPhoneOS"
@@ -229,28 +234,57 @@ do
             cp $top_dir/contrib/$install_library_path/$arch/lib/libz.a z/prebuilt/libz-$arch.a
         fi
 
-        if [ $lib = "png" ]; then
+        if [ $lib = "png" ] || [ $lib = "freetype2" ] || [ $lib = "websockets" ];  then
             echo "copying libz..."
             mkdir -p z/prebuilt/
             cp $top_dir/contrib/$install_library_path/$arch/lib/libz.a z/prebuilt/libz-$arch.a
         fi
 
         echo "Copying needed heder files"
         if [ $lib = "png" ]; then
-            cp  $top_dir/contrib/$install_library_path/$arch/include/png*.h  $library_name/include/
+            cp  $top_dir/contrib/$install_library_path/$arch/include/png*.h  $archive_name/include/
         fi
 
         if [ $lib = "luajit" ]; then
-            cp -r $top_dir/contrib/$install_library_path/$arch/include/luajit-2.0/  $library_name/include/
+            cp -r $top_dir/contrib/$install_library_path/$arch/include/luajit-2.0/  $archive_name/include/
+        fi
+
+        if [ $lib = "lua" ]; then
+            cp -r $top_dir/contrib/$install_library_path/$arch/include/l*.h*  $archive_name/include/
         fi
 
         if [ $lib = "curl" ]; then
-            cp -r $top_dir/contrib/$install_library_path/$arch/include/curl/  $library_name/include/
+            cp -r $top_dir/contrib/$install_library_path/$arch/include/curl/  $archive_name/include/
+        fi
+
+        if [ $lib = "freetype2" ]; then
+            cp -r $top_dir/contrib/$install_library_path/$arch/include/freetype2  $archive_name/include
+        fi
+
+        if [ $lib = "jpeg" ]; then
+            cp -r $top_dir/contrib/$install_library_path/$arch/include/j*.h  $archive_name/include/
+        fi
+
+        if [ $lib = "tiff" ]; then
+            cp -r $top_dir/contrib/$install_library_path/$arch/include/tif*.h  $archive_name/include/
+        fi
+
+        if [ $lib = "webp" ]; then
+            cp -r $top_dir/contrib/$install_library_path/$arch/include/webp/  $archive_name/include/
+        fi
+
+        if [ $lib = "websockets" ]; then
+            cp -r $top_dir/contrib/$install_library_path/$arch/include/libwebsockets.h  $archive_name/include/
+        fi
+
+        if [ $lib = "zlib" ]; then
+            cp -r $top_dir/contrib/$install_library_path/$arch/include/z*.h  $archive_name/include/
         fi
 
         # TODO: add more header files decides here
 
         echo "cleaning up"
+        # FIXME: uncomment it for debug purpose
         rm -rf $top_dir/contrib/$install_library_path
         rm -rf $top_dir/contrib/$build_library_path-$arch
     done
@@ -260,10 +294,9 @@ do
     if [ $lib = "curl" ]; then
         create_fat_library ssl
         create_fat_library crypto
-        create_fat_library z
     fi
 
-    if [ $lib = "png" ]; then
+    if [ $lib = "png" ] || [ $lib = "curl" ] || [ $lib = "freetype2" ] || [ $lib = "websockets" ]; then
         create_fat_library z
     fi
 
diff --git a/contrib/build_ios.sh b/contrib/build_ios.sh
@@ -174,19 +174,6 @@ fi
 export LDFLAGS="-L${SDKROOT}/usr/lib -arch ${ARCH} -isysroot ${SDKROOT} -miphoneos-version-min=${SDK_MIN}"
 
 EXTRA_CFLAGS=""
-# if [ "$PLATFORM" = "OS" ]; then
-#     EXTRA_CFLAGS="-arch ${ARCH}"
-# if [ "$ARCH" != "arm64" ]; then
-#     EXTRA_CFLAGS+=" -mcpu=cortex-a8"
-# fi
-#     EXTRA_LDFLAGS="-arch ${ARCH}"
-# else
-#     EXTRA_CFLAGS="-arch ${ARCH}"
-#     EXTRA_LDFLAGS="-arch ${ARCH}"
-# fi
-
-# EXTRA_CFLAGS+=" -miphoneos-version-min=${SDK_MIN}"
-# EXTRA_LDFLAGS+=" -miphoneos-version-min=${SDK_MIN}"
 
 info "LD FLAGS SELECTED = '${LDFLAGS}'"
 
@@ -219,6 +206,7 @@ echo "EXTRA_CFLAGS = ${EXTRA_CFLAGS}" >> config.mak
 echo "EXTRA_LDFLAGS = ${EXTRA_LDFLAGS}" >> config.mak
 echo "IOS_ARCH := ${ARCH}" >> config.mak
 echo "BUILD_MODE := ${BUILD_MODE}" >> config.mak
+echo "OPTIM := ${OPTIM}" >> config.mak
 
 make fetch
 make list
diff --git a/contrib/build_ios_without_export.sh b/contrib/build_ios_without_export.sh
@@ -175,6 +175,9 @@ fi
 echo "EXTRA_CFLAGS = ${EXTRA_CFLAGS}" >> config.mak
 echo "EXTRA_LDFLAGS = ${EXTRA_LDFLAGS}" >> config.mak
 echo "IOS_ARCH := ${ARCH}" >> config.mak
+echo "OPTIM := ${OPTIM}" >> config.mak
+echo "BUILD_MODE := ${BUILD_MODE}" >> config.mak
+
 make fetch
 make list
 make
diff --git a/contrib/src/curl/rules.mak b/contrib/src/curl/rules.mak
@@ -18,7 +18,7 @@ DEPS_curl = zlib $(DEPS_zlib)
 DEPS_curl = openssl $(DEPS_openssl)
 
 .curl: curl .zlib .openssl
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) \
+	cd $< && $(HOSTVARS_PIC) ./configure $(HOSTCONF) \
 		--with-ssl \
 		--with-zlib \
 	cd $< && $(MAKE)
diff --git a/contrib/src/lua/lua-ios-support.patch b/contrib/src/lua/lua-ios-support.patch
@@ -3,11 +3,11 @@ diff -ru lua/Makefile lua-f/Makefile
 +++ lua-f/Makefile	2012-03-21 13:58:30.000000000 +0100
 @@ -38,7 +38,7 @@
  # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
- 
+
  # Convenience platforms targets.
 -PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
 +PLATS= aix ansi bsd freebsd generic linux ios macosx mingw posix solaris
- 
+
  # What to install.
  TO_BIN= lua luac
 diff -ru lua/src/Makefile lua-f/src/Makefile
@@ -16,9 +16,9 @@ diff -ru lua/src/Makefile lua-f/src/Makefile
 @@ -98,6 +98,9 @@
  linux:
  	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl"
- 
+
 +ios:
-+	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX
++	$(MAKE) all
 +
  macosx:
  	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline"
diff --git a/contrib/src/lua/rules.mak b/contrib/src/lua/rules.mak
@@ -51,14 +51,12 @@ lua: lua-$(LUA_VERSION).tar.gz .sum-lua
 ifdef HAVE_DARWIN_OS
 	(cd $(UNPACK_DIR) && \
 	sed -e 's%gcc%$(CC)%' \
-		-e 's%LDFLAGS=%LDFLAGS=$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)%' \
-		-i.orig src/Makefile)
-endif
-ifdef HAVE_SOLARIS
-	(cd $(UNPACK_DIR) && \
-	sed -e 's%LIBS="-ldl"$$%LIBS="-ldl" MYLDFLAGS="$(EXTRA_LDFLAGS)"%' \
+		-e 's%LDFLAGS=%LDFLAGS=$(LDFLAGS)%' \
+		-e 's%CFLAGS= -O2 -Wall $(MYCFLAGS)%CFLAGS=$(MYCFLAGS)%' \
+		-e 's%MYCFLAGS=%MYCFLAGS=$(CFLAGS)%' \
 		-i.orig src/Makefile)
 endif
+
 ifdef HAVE_WIN32
 	cd $(UNPACK_DIR) && sed -i.orig -e 's/lua luac/lua.exe luac.exe/' Makefile
 endif
@@ -70,7 +68,7 @@ endif
 	$(MOVE)
 
 .lua: lua
-	cd $< && $(HOSTVARS_PIC) $(MAKE) $(LUA_TARGET)
+	cd $< && $(HOSTVARS_PIC) $(MAKE) VERBOS=1 $(LUA_TARGET)
 ifdef HAVE_WIN32
 	cd $</src && $(HOSTVARS) $(MAKE) liblua.a
 endif
diff --git a/contrib/src/luajit/rules.mak b/contrib/src/luajit/rules.mak
@@ -17,12 +17,12 @@ endif
 
 #FIXME: arm64 is not supported
 ifeq ($(IOS_ARCH),armv7)
-LUAJIT_TARGET_FLAGS="-arch armv7 -isysroot $(IOS_SDK)"
+LUAJIT_TARGET_FLAGS="-arch armv7 -isysroot $(IOS_SDK) $(OPTIM)"
 LUAJIT_HOST_CC="gcc -m32 -arch i386"
 endif
 
 ifeq ($(IOS_ARCH),armv7s)
-LUAJIT_TARGET_FLAGS="-arch armv7s -isysroot $(IOS_SDK)"
+LUAJIT_TARGET_FLAGS="-arch armv7s -isysroot $(IOS_SDK) $(OPTIM)"
 LUAJIT_HOST_CC="gcc -m32 -arch i386"
 endif
 
@@ -36,7 +36,7 @@ endif
 
 .luajit: luajit
 ifdef HAVE_ANDROID
-	cd $< && $(MAKE) HOST_CC="gcc -m32" CROSS=$(HOST)- TARGET_SYS=Linux TARGET_FLAGS="${ANDROID_ARCH} ${NDKF}" TARGET_LDFLAGS=$(LUAJIT_LDFLAGS)
+	cd $< && $(MAKE) HOST_CC="gcc -m32 $(OPTIM)" CROSS=$(HOST)- TARGET_SYS=Linux TARGET_FLAGS="${ANDROID_ARCH} ${NDKF}" TARGET_LDFLAGS=$(LUAJIT_LDFLAGS)
 endif
 ifdef HAVE_MACOSX
 	cd $< && $(MAKE) HOST_CC="$(CC)" HOST_CFLAGS="$(CFLAGS)"
@@ -49,7 +49,7 @@ ifeq ($(IOS_ARCH),armv7s)
 	cd $< && make HOST_CC=$(LUAJIT_HOST_CC) TARGET_FLAGS=$(LUAJIT_TARGET_FLAGS) TARGET=arm TARGET_SYS=iOS
 endif
 ifeq ($(IOS_ARCH),i386)
-	cd $< && make CC="gcc -m32 -arch i386"
+	cd $< && make CC="gcc -m32 -arch i386 $(OPTIM)"
 endif
 endif
 	cd $< && make install PREFIX=$(PREFIX)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
@@ -164,9 +164,9 @@ endif
 cppcheck = $(shell $(CC) $(CFLAGS) -E -dM - < /dev/null | grep -E $(1))
 
 EXTRA_CFLAGS += -I$(PREFIX)/include
-CPPFLAGS := $(CPPFLAGS) $(EXTRA_CFLAGS)
+CPPFLAGS := $(CPPFLAGS) $(CFLAGS)
 CFLAGS := $(CFLAGS) $(EXTRA_CFLAGS)
-CXXFLAGS := $(CXXFLAGS) $(EXTRA_CFLAGS)
+CXXFLAGS := $(CXXFLAGS) $(CFLAGS)
 EXTRA_LDFLAGS += -L$(PREFIX)/lib
 LDFLAGS := $(LDFLAGS) $(EXTRA_LDFLAGS)
 # Do not export those! Use HOSTVARS.
diff --git a/contrib/src/openssl/rules.mak b/contrib/src/openssl/rules.mak
@@ -50,15 +50,10 @@ endif
 	cd $< && $(HOSTVARS)  ./Configure $(OPENSSL_CONFIG_VARS)  --prefix=$(PREFIX) $(OPENSSL_COMPILER)
 ifdef HAVE_IOS
 	cd $< && perl -i -pe "s|^CC= xcrun clang|CC= xcrun cc -arch ${IOS_ARCH} -miphoneos-version-min=6.0 |g" Makefile
-ifeq ($(BUILD_MODE),release)
-	cd $< && perl -i -pe "s|^CFLAG= (.*)|CFLAG= -isysroot ${IOS_SDK} -O3 -DNDEBUG |g" Makefile
-endif
-ifeq ($(BUILD_MODE),debug)
-	cd $< && perl -i -pe "s|^CFLAG= (.*)|CFLAG= -isysroot ${IOS_SDK} -O0 -g -DNDEBUG |g" Makefile
-endif
+	cd $< && perl -i -pe "s|^CFLAG= (.*)|CFLAG= -isysroot ${IOS_SDK} ${OPTIM} |g" Makefile
 endif
 ifdef HAVE_ANDROID
-	cd $< && perl -i -pe "s|^CFLAG= (.*)|CFLAG= ${ANDROID_ARCH} -O3 |g" Makefile
+	cd $< && perl -i -pe "s|^CFLAG= (.*)|CFLAG= ${ANDROID_ARCH} ${OPTIM} |g" Makefile
 endif
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/websockets/rules.mak b/contrib/src/websockets/rules.mak
@@ -27,6 +27,6 @@ endif
 DEPS_websockets = zlib $(DEPS_zlib)
 
 .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 $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(EX_ECFLAGS)" $(CMAKE) -DLWS_WITH_SSL=0 -DLWS_WITHOUT_TEST_PING=1
 	cd $< && $(MAKE) VERBOSE=1 install
 	touch $@
