Merge pull request #17 from andyque/testScripts

Improve the build scripts

Author: ricardoquesada

README.md

@@ -5,7 +5,7 @@ This repository includes the source code of the 3rd party libraries (binary) tha
 
 This repository is needed for cocos2d-x developers and/or people who want to:
 
-* generate a updated version of a certain library (eg: upgrade libpng 1.2.2 to 1.2.14)
+* generate a updated version of a certain library (eg: upgrade libpng 1.6.2 to 1.6.14)
 * port cocos2d-x to other platforms (eg: port it to Android ARM64, or Xbox One, etc)
 * generate DEBUG versions of all the 3rd party library
 
@@ -66,7 +66,7 @@ pacman -S mingw-w64-i686-toolchain
 ```
 
 ## How to use
-We have one build script for each platform, they are under `build/platform{ios/mac/android/tizen}` directory.
+We have one build script for each platform, they are under `build` directory.
 
 All of them share the same usage:
 
@@ -81,15 +81,15 @@ All of them share the same usage:
     - use comma separated library names, for example, `png,lua,jpeg,webp`,  no space between the comma.
 
 - param2:
-    - use `all` to build all the supported arches. For iOS, they are "armv7, arm64, i386, x86_64", for Android, they are "armeabi, armeabi-v7a, x86, arm64", for Mac, they are "x86_64", for Tizen, they are "armv7"
+    - use `all` to build all the supported arches. For iOS, they are "armv7, arm64, i386, x86_64", for Android, they are "arm,armv7,arm64,x86", for Mac, they are "x86_64", for Tizen, they are "armv7"
     - use comma separated arch name, for example, `armv7, arm64`, no space between the comma.
 
 - param3:
     - release:  Build library on release mode. This is the default option. We use `-O3 -DNDEBUG` flags to build release library.
     - debug:  Build library on debug mode. we use `-O0 -g -DDEBUG` flag to build debug library.
 
 - list:
-    - Use these option to list all the supported libraries.
+    - Use these option to list all the supported library names and versions.
 
 ### Build png on iOS platform
 For building libpng fat library with all arch x86_64, i386, armv7, arm64 on release mode:
@@ -126,15 +126,17 @@ cd build
 
 3. Pass `--arch=64` to build the libraries with arm64 support.
 
-
-For other platforms and other libraries, it is more or less the same way except for some minor changes in `--arch` parameter and `-p` parameter.
+Note:
+If you build `webp` with arm64, you will get `cpu-features.h` header file not found error. This is a known issue of Android NDK r10c. You could simply create a empty header file
+named `cpu-features.h` under `{ANDROID_NDK}/platforms/android-21/arch-arm64/usr/include`.
 
 
 ## How to build a DEBUG and RELEASE version
 You can add flag "--mode=[debug | release]" for building DEBUG and RELEASE version.
 
 ## How to do build clean?
-If you use `./build.sh` to build static libraries, there is no need to do clean. After generating the static library, script will delete the intermediate files.
+You could simply turn on the flag `cfg_is_cleanup_after_build` to "yes" in `main.ini` file.
+After each build, you could also delete the generated folders under `contrib` directory.
 
 
 ## How to upgrade a existing library

build/android.ini

@@ -4,8 +4,12 @@ cfg_default_build_arches="all"
 cfg_default_build_mode="release"
 cfg_default_build_libraries="all"
 #specific default values
-cfg_default_build_api=19
-cfg_default_gcc_version=4.8
+cfg_default_build_api=21
+cfg_default_gcc_version=4.9
+cfg_arm_alias_folder_name="armeabi"
+cfg_armv7_alias_folder_name="armeabi-v7a"
+cfg_arm64_alias_folder_name="armeabi-v8a"
+
 
 #help message strings goes here
 cfg_help_arch_string="arm,armv7,x86,arm64"

build/build.sh

@@ -270,27 +270,27 @@ function set_build_mode_cflags()
 for lib in "${build_library[@]}"
 do
     library_name=$lib
-    archive_name=$lib
 
-    # parser_lib_archive_alias=${lib}_archive_alias
-    # archive_name=${!parser_lib_archive_alias}
-
-    if [ $lib = "zlib" ]; then
-        archive_name=z
-    fi
-
-    if [ $lib = "openssl" ];then
-        archive_name=ssl
+    parser_lib_archive_alias=${lib}_archive_alias
+    archive_name=${!parser_lib_archive_alias}
+    if [ -z $archive_name ];then
+        archive_name=$lib
     fi
 
     mkdir -p $cfg_platform_name/$archive_name/include/
 
     for arch in "${build_arches[@]}"
     do
-        #skip certain arch libraries
-        #because luajit doesn't support arm64!
-        if [ $lib = "luajit" ] && [ $arch = "arm64" ]; then
-            continue
+        #skip build libraries with certain arch
+        ignore_arch_library=${lib}_ignore_arch_list
+        ignore_arch_list=(${!ignore_arch_library})
+        ignore_arch_list_array=(${ignore_arch_list//,/ })
+        if [ ! -z ${ignore_arch_list} ]; then
+            echo ${ignore_arch_list}
+            if [ $(contains "${ignore_arch_list_array[@]}" $arch) == "y" ];then
+                echo "ingore $lib for $arch"
+                continue
+            fi
         fi
 
         #set build mode flags -- debug or release
@@ -302,7 +302,13 @@ do
 
         echo "build $arch for $lib in $cfg_platform_name"
 
-        MY_TARGET_ARCH=$arch
+        parse_arch_folder_name=cfg_${arch}_alias_folder_name
+        original_arch_name=${!parse_arch_folder_name}
+        if [ -z $original_arch_name ];then
+            original_arch_name=$arch
+        fi
+        
+        MY_TARGET_ARCH=$original_arch_name
         export MY_TARGET_ARCH
 
         if [ ${cfg_is_cross_compile} = "yes" ];then
@@ -338,42 +344,46 @@ do
                      --host=${!my_target_host} \
                      --prefix=${PREFIX}
 
-        make fetch
-        make list
-        make
 
         echo "MY_TARGET_ARCH := ${MY_TARGET_ARCH}" >> config.mak
         echo "OPTIM := ${OPTIM}" >> config.mak
+        
+        make
 
         cd -    
 
-        local_library_install_path=$cfg_platform_name/$archive_name/prebuilt/$arch
+        local_library_install_path=$cfg_platform_name/$archive_name/prebuilt/$original_arch_name
         if [ ! -d $local_library_install_path ]; then
             echo "create folder for library with specify arch. $local_library_install_path"
             mkdir -p $local_library_install_path
         fi
 
-        cp $top_dir/contrib/$install_library_path/$arch/lib/lib$archive_name.a $local_library_install_path/lib$archive_name.a
-        cp $top_dir/contrib/$install_library_path/$arch/lib/lib$archive_name*.a $local_library_install_path/lib$archive_name.a
+        #determine the .a achive name with a specified libraries
+        parse_original_lib_name=${lib}_original_name
+        original_archive_name=${!parse_original_lib_name}
+        if [ -z $original_archive_name ];then
+            original_archive_name=$archive_name
+        fi
 
+        #copy .a archive from install-platform folder
+        cp $top_dir/contrib/$install_library_path/$arch/lib/lib$original_archive_name.a $local_library_install_path/lib$archive_name.a
 
-        if [ $lib = "curl" ]; then
-            local_library_install_path=$cfg_platform_name/ssl/prebuilt/$arch 
-            mkdir -p $local_library_install_path
-            cp $top_dir/contrib/$install_library_path/$arch/lib/libssl.a $local_library_install_path/libssl.a
+        #copy dependent .a archive
+        parse_dependent_archive_list=${lib}_dependent_archive_list
+        original_dependent_archive_list=${!parse_dependent_archive_list}
+        if [ ! -z $original_dependent_archive_list ];then
+            echo "copying dependent archives..."
+            original_dependent_archive_list=(${original_dependent_archive_list//,/ })            
 
-            local_library_install_path=$cfg_platform_name/crypto/prebuilt/$arch
-            mkdir -p $local_library_install_path
-            cp $top_dir/contrib/$install_library_path/$arch/lib/libcrypto.a $local_library_install_path/libcrypto.a
+            for dep_archive in ${original_dependent_archive_list[@]}
+            do
+                local_library_install_path=$cfg_platform_name/${dep_archive}/prebuilt/$original_arch_name
+                mkdir -p $local_library_install_path
+                cp $top_dir/contrib/$install_library_path/$arch/lib/lib${dep_archive}.a $local_library_install_path/lib${dep_archive}.a
 
+            done
         fi
 
-        if [ $lib = "png" ] || [ $lib = "freetype" ] || [ $lib = "websockets" ] || [ $lib = "curl" ];  then
-            echo "copying libz..."
-            local_install_path=$cfg_platform_name/z/prebuilt/$arch
-            mkdir -p $local_install_path
-            cp $top_dir/contrib/$install_library_path/$arch/lib/libz.a $local_install_path/libz.a
-        fi
 
         echo "Copying needed heder files"
         copy_include_file_path=${lib}_header_files
@@ -392,13 +402,16 @@ do
 
         create_fat_library $archive_name
 
-        if [ $lib = "curl" ]; then
-            create_fat_library ssl
-            create_fat_library crypto
-        fi
+        parse_dependent_archive_list=${lib}_dependent_archive_list
+        original_dependent_archive_list=${!parse_dependent_archive_list}
+        if [ ! -z $original_dependent_archive_list ];then
+            echo "create fat library for dependent archives..."
+            original_dependent_archive_list=(${original_dependent_archive_list//,/ })            
 
-        if [ $lib = "png" ] || [ $lib = "curl" ] || [ $lib = "freetype" ] || [ $lib = "websockets" ]; then
-            create_fat_library z
+            for dep_archive in ${original_dependent_archive_list[@]}
+            do
+                create_fat_library $dep_archive                
+            done
         fi
     fi
 

build/main.ini

@@ -2,23 +2,41 @@
 # xxx_header_files
 cfg_all_valid_platforms=(ios mac android linux win32 tizen)
 
+#copy libraries header files
 png_header_files=png*.h
-luajit_header_files=luajit-2.0/
+luajit_header_files=luajit-2.0
 lua_header_files=l*.h*
-curl_header_files=curl/
-freetyp2_header_files=freetype2/
+curl_header_files=curl
+freetype_header_files=freetype2
 jpeg_header_files=j*.h
 tiff_header_files=tif*.h
-webp_header_files=webp/
+webp_header_files=webp
 websockets_header_files=libwebsockets.h
 zlib_header_files=z*.h
+chipmunk_header_files=chipmunk
+
+
+##archive prebuilt name
+luajit_original_name=luajit-5.1
 
 ##archive_alias
 zlib_archive_alias=z
-freetype2_archive_alias=freetype
+openssl_archive_alias=ssl
+
+##copy dpendent archives
+png_dependent_archive_list=z
+freetype_dependent_archive_list=z
+websockets_dependent_archive_list=z
+curl_dependent_archive_list=z,ssl,crypto
+
+
+##ignore arch list for specify libraries
+#because luajit doesn't support arm64!
+#luajit_ignore_arch_list=armv7,armv7s,arm64
+luajit_ignore_arch_list=arm64
 
 #clean up flag
-cfg_is_cleanup_after_build=yes
+cfg_is_cleanup_after_build=no
 
 ##valide options
 cfg_valid_build_mode=(release debug)

contrib/bootstrap

@@ -227,14 +227,14 @@ check_android_sdk()
         ## FIXME: the android toolchain path is hardcoded, only MACOSX will work.
         if [ ${ANDROID_ABI} = "x86" ]; then
             toolchain_path_prefix=x86
-        elif [ ${ANDROID_ABI} = "arm64" ];then
+        elif [ ${ANDROID_ABI} = "armeabi-v8a" ];then
             toolchain_path_prefix=aarch64-linux-android
         else
             toolchain_path_prefix=arm-linux-androideabi
         fi
 
         # check whether sysroot is exists
-        if [ $ANDROID_ABI = "arm64" ]; then
+        if [ $ANDROID_ABI = "armeabi-v8a" ]; then
             if [ ! -d ${ANDROID_NDK}/platforms/${ANDROID_API}/arch-arm64 ];then
                 echo "${ANDROID_NDK} ${ANDROID_API} doesn't support build arm64 architecture!"
                 exit $? 
@@ -248,19 +248,19 @@ check_android_sdk()
         fi
 
 
-	if [ ${ANDROID_ABI} = "armv7" ]; then
+	if [ ${ANDROID_ABI} = "armeabi-v7a" ]; then
             add_make_enabled "HAVE_NEON"
             add_make_enabled "HAVE_ARMV7A"
             add_make "EXTRA_CFLAGS := -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -fomit-frame-pointer -fno-strict-aliasing -DANDROID  -Wa,--noexecstack -Wformat "
             add_make "EXTRA_LDFLAGS := -march=armv7-a -Wl,--fix-cortex-a8"
         fi
 
-	if [ ${ANDROID_ABI} = "arm" -a -z "${NO_ARMV6}" ];then
+	if [ ${ANDROID_ABI} = "armeabi" -a -z "${NO_ARMV6}" ];then
             add_make_enabled "HAVE_ARMV6"
             add_make "EXTRA_CFLAGS := -ffunction-sections -funwind-tables -fstack-protector -no-canonical-prefixes  -march=armv5te -mtune=xscale -msoft-float -mthumb -fomit-frame-pointer -fno-strict-aliasing -DANDROID  -Wa,--noexecstack -Wformat "
         fi
 
-	if [ ${ANDROID_ABI} = "arm64" ]; then
+	if [ ${ANDROID_ABI} = "armeabi-v8a" ]; then
             add_make_enabled "HAVE_NEON"
             add_make_enabled "HAVE_ARMV8A"
             add_make "EXTRA_CFLAGS :=  -fpic -ffunction-sections  -funwind-tables  -fstack-protector  -no-canonical-prefixes"

contrib/src/luajit/rules.mak

@@ -38,7 +38,7 @@ endif
 
 .luajit: luajit
 ifdef HAVE_ANDROID
-	cd $< && $(MAKE) HOST_CC="gcc -m32 $(OPTIM)" CROSS=$(HOST)- TARGET_SYS=Linux TARGET_FLAGS="${MY_TARGET_ARCH} ${NDKF}" TARGET_LDFLAGS=$(LUAJIT_LDFLAGS)
+	cd $< && $(MAKE) HOST_CC="gcc -m32 $(OPTIM)" CROSS=$(HOST)- TARGET_SYS=Linux TARGET_FLAGS="${NDKF} ${EXTRA_CFLAGS}" TARGET_LDFLAGS=$(LUAJIT_LDFLAGS)
 endif
 ifdef HAVE_MACOSX
 	cd $< && $(HOSTVARS_PIC) $(MAKE) HOST_CC="$(CC)" HOST_CFLAGS="$(CFLAGS)"