refactor some hardcoded values

Author: zilongshanren

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 libraries and versions.
 
 ### Build png on iOS platform
 For building libpng fat library with all arch x86_64, i386, armv7, arm64 on release mode:
@@ -127,9 +127,6 @@ 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.
-
-
 ## How to build a DEBUG and RELEASE version
 You can add flag "--mode=[debug | release]" for building DEBUG and RELEASE version.
 

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
@@ -353,27 +353,32 @@ do
             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/$arch 
+                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 +397,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,6 +2,7 @@
 # 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/
 lua_header_files=l*.h*
@@ -13,12 +14,28 @@ webp_header_files=webp/
 websockets_header_files=libwebsockets.h
 zlib_header_files=z*.h
 
+
+##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)