Merge pull request #20 from andyque/testScripts

improve the help string and reduce the unneeded configs

Author: ricardoquesada

README.md

@@ -66,9 +66,9 @@ pacman -S mingw-w64-i686-toolchain
 ```
 
 ## How to use
-We have one build script for each platform, they are under `build` directory.
+We have one build script for each platform, it is under `build` directory.
 
-All of them share the same usage:
+The usage would be:
 
 ```
 ./build.sh -p=platform --libs=libs --arch=arch --mode=mode --list

build/android.ini

@@ -11,10 +11,6 @@ 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"
-cfg_help_sample_string="./build.sh -p=android --libs=png --arch=arm,armv7,arm64 --mode=debug"
-
 #build machine & build host
 cfg_build_machine="x86_64-apple-darwin14"
 cfg_x86_host_machine="i686-linux-android"

build/build.sh

@@ -29,18 +29,25 @@ function contains() {
 
 function usage()
 {
-    echo "You should follow the instructions here to build static library for $cfg_platform_name"
+    echo "Helper to build all the 3rd party libraries for Cocos2D-X on various platform."
     echo ""
-    echo "./build_png.sh"
-    echo "\t[-h --help]  "
-    echo "\t--libs=[all | png,lua,tiff,jpeg,webp,zlib etc]"
-    echo "\t[--arch | -a]=[all | $cfg_help_arch_string etc]"
-    echo "\t[--mode | -m]=[release | debug]"
-    echo "\t[--list | -l]"
+    echo "Usage:"
+    echo "    ./build.sh  -p=PLATFORM [--libs=LIBRARY...] [-a=ARCH...] [-mode=MODE]"
+    echo "    ./build.sh  --platform=PLATFORM [--libs=LIBRARY...] [--arch=ARCH...] [--mode=MODE]"
+    echo "    ./build.sh  -p=PLATFORM (-h | --help)"
+    echo "    ./build.sh  -p=PLATFORM (-l | --list)"
     echo ""
-    echo "Sample:"
-    echo "$cfg_help_sample_string"
+    echo "Arguments:"
+    echo "    PLATFORM:    Platform names, valid values are: mac,ios,android,win32,tizen,linux"
+    echo "    LIBRARY:     Library names, valid values are platform dependent(png,jpeg,lua,chipmunk,etc)"
+    echo "    ARCH:        Build arches, valid values are platform dependent(arm,arm64,armv7,i386,etc)"
+    echo "    MODE:        Build mode, valid values are: release and debug"
     echo ""
+    echo "Options:"
+    echo "    --platform   Specify a target platform, one platform a time."
+    echo "    --libs:      Specify a few target libraries,all the libraries should be comma separated.[default: all]"
+    echo "    --arch:      Specify a few arches to build,all the arches should be comma separated. [default: all]"
+    echo "    --mode:      Specify the build mode.[default: release]"
 }
 
 
@@ -81,7 +88,7 @@ function check_invalid_platform()
 {
     # echo "checking ${build_platform} is in ${cfg_all_valid_platforms[@]}"
     if [ $(contains "${cfg_all_valid_platforms[@]}" $build_platform) == "n" ]; then
-        echo "Invalid platform! Only ${cfg_all_valid_platforms[@]} is acceptable."
+        usage
         exit 1
     fi
 }
@@ -109,11 +116,10 @@ function list_all_supported_libraries()
 {
 
     echo "Supported libraries and versions:"
-    echo "\t"
 
     for lib in ${cfg_all_supported_libraries[@]}
     do
-        all_supported_libraries=$(find  ../contrib/src -type f | grep SHA512SUMS | xargs cat | awk 'match ($0, /.tgz|.tar.gz|.zip|.tar.xz/) { print substr($2,0,length($2)-RLENGTH)}' | grep $lib | awk '{print $1}')
+        all_supported_libraries=$(find  ../contrib/src -type f | grep SHA512SUMS | xargs cat | awk 'match ($0, /.tgz|.tar.gz|.zip|.tar.xz/) { print substr($2,0,length($2)-RLENGTH)}' | grep -i $lib | awk '{print $1}')
         echo $all_supported_libraries | awk '{ print $1}'
     done
 }

build/ios.ini

@@ -5,9 +5,6 @@ cfg_default_build_arches="all"
 cfg_default_build_mode="release"
 cfg_default_build_libraries="all"
 
-#help message strings goes here
-cfg_help_arch_string="armv7,armv7s,arm64,i386,x86_64"
-cfg_help_sample_string="./build.sh -p=ios --libs=png --arch=armv7,arm64,i368  --mode=debug"
 
 cfg_build_machine="x86_64-apple-darwin14"
 cfg_x86_64_host_machine="x86_64-apple-darwin"

build/linux.ini

@@ -9,9 +9,6 @@ cfg_default_build_libraries="all"
 # cfg_default_gcc_version=4.8
 # cfg_android_ndk_path=/Users/guanghui/AndroidDev/android-ndk-r9d
 
-#help message strings goes here
-cfg_help_arch_string="i386,x86_64"
-cfg_help_sample_string="./build.sh -p=linux --libs=png --arch=i368,x86_64  --mode=debug"
 
 cfg_is_cross_compile=no
 cfg_build_machine="x86_64-linux-gnu"

build/mac.ini

@@ -6,9 +6,6 @@ cfg_default_build_mode="release"
 cfg_default_build_libraries="all"
 #specific default values
 
-#help message strings goes here
-cfg_help_arch_string="i386,x86_64"
-cfg_help_sample_string="./build.sh -p=mac --libs=png --arch=i368,x86_64  --mode=debug"
 
 #build machine & build host
 cfg_build_machine="x86_64-apple-darwin14"

build/tizen.ini

@@ -5,9 +5,6 @@ cfg_default_build_arches="all"
 cfg_default_build_mode="release"
 cfg_default_build_libraries="all"
 
-#help message strings goes here
-cfg_help_arch_string="armv7"
-cfg_help_sample_string="./build.sh -p=tizen --libs=png --arch=armv7  --mode=debug"
 
 #build machine & build host
 cfg_build_machine="x86_64-apple-darwin14"