Merge pull request #36 from andyque/fix-lua-compile

upgrade luajit to 2.0.3 and improve the output

Author: zilongshanren

.gitignore

@@ -19,3 +19,27 @@
 *.exe
 *.out
 *.app
+/build/android/
+/build/ios/
+/build/mac/
+/build/tizen/
+/contrib/android-arm/
+/contrib/android-armv7/
+/contrib/android-x86/
+/contrib/install-android/
+/contrib/install-ios/
+/contrib/install-mac/
+/contrib/ios-arm64/
+/contrib/ios-armv7/
+/contrib/ios-armv7s/
+/contrib/ios-i386/
+/contrib/ios-x86_64/
+/contrib/mac-x86_64/
+/contrib/tarballs/Chipmunk-6.2.1/
+/contrib/tarballs/cjson/
+/contrib/tarballs/curl-7.39.0/
+/contrib/tarballs/libwebp-0.4.2/
+/contrib/tarballs/libwebsockets-1.3-chrome37-firefox30/
+/build/tizen.zip
+/build/log.txt
+/contrib/tarballs/LuaJIT-2.0.3/

build/build.sh

@@ -243,25 +243,21 @@ function create_fat_library()
     LIPO="xcrun -sdk iphoneos lipo"
     STRIP="xcrun -sdk iphoneos strip"
 
-    if [ -f $cfg_platform_name/$library_name/prebuilt/lib$library_name.a ]; then
-        echo "removing old fat library..."
-        rm $cfg_platform_name/$library_name/prebuilt/lib$library_name.a
-    fi
-
-    all_static_libs=$(find $cfg_platform_name/$library_name/prebuilt -type f -name "lib$library_name.a")
+    all_static_libs=$(find $cfg_platform_name  -type f -name "lib$library_name.a")
 
     echo "create fat library lib$library_name for $all_static_libs"
+    if [ ! -d $cfg_platform_name/libs ];then
+        mkdir -p $cfg_platform_name/libs
+    fi
+
     $LIPO -create  $all_static_libs \
-          -output $cfg_platform_name/lib$library_name.a
+          -output $cfg_platform_name/libs/lib$library_name.a
 
     # rm $all_static_libs
 
     # remove debugging info don't strip
     # $STRIP -S $library_name/prebuilt/lib$library_name.a
-    $LIPO -info $cfg_platform_name/lib$library_name.a
-
-    rm $all_static_libs
-    rm -rf $cfg_platform_name/$library_name/prebuilt
+    $LIPO -info $cfg_platform_name/libs/lib$library_name.a
 }
 
 
@@ -298,7 +294,7 @@ do
         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
+        if [ ! -z ${ignore_arch_list} ] && [ $cfg_platform_name = "ios" ]; then
             echo ${ignore_arch_list}
             if [ $(contains "${ignore_arch_list_array[@]}" $arch) == "y" ];then
                 echo "ingore $lib for $arch"
@@ -374,7 +370,7 @@ do
 
         cd -
 
-        local_library_install_path=$cfg_platform_name/$original_arch_name
+        local_library_install_path=$cfg_platform_name/$original_arch_name/libs
 
         if [ ! -d $local_library_install_path ]; then
             echo "create folder for library with specify arch. $local_library_install_path"
@@ -400,10 +396,7 @@ do
 
             for dep_archive in ${original_dependent_archive_list[@]}
             do
-                local_library_install_path=$cfg_platform_name/${dep_archive}/prebuilt/$original_arch_name
-                if [ $cfg_platform_name = "android"] || [ $cfg_platform_name = "linux" ];then
-                    local_library_install_path=$cfg_platform_name/$original_arch_name
-                fi
+                local_library_install_path=$cfg_platform_name/$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
 
@@ -412,11 +405,24 @@ do
 
 
         echo "Copying needed heder files"
-        mkdir -p $cfg_platform_name/$arch/include/$archive_name
+        #copy header files for ios & mac
+        if [ $cfg_platform_name = "ios" ] || [ $cfg_platform_name = "mac" ];then
+            if [ ! -d $top_dir/build/$cfg_platform_name/include/$archive_name ];then
+                mkdir -p $top_dir/build/$cfg_platform_name/include/$archive_name
+            fi
+        fi
+        
+        mkdir -p $cfg_platform_name/$original_arch_name/include/$archive_name
         copy_include_file_path=${lib}_header_files
         src_directory=$top_dir/contrib/$install_library_path/$arch/include/${!copy_include_file_path}
         echo $src_directory
-        destination_header_path=$cfg_platform_name/$arch/include/$archive_name/
+        destination_header_path=$cfg_platform_name/$original_arch_name/include/$archive_name/
+
+        if [ $cfg_platform_name = "ios" ] || [ $cfg_platform_name = "mac" ];then
+            destination_header_path=$cfg_platform_name/include/$archive_name
+        fi
+
+        
         if [ -d $src_directory ];then
             cp  -r $src_directory/* $destination_header_path
         else
@@ -450,3 +456,12 @@ do
     fi
 
 done
+
+# do some cleanup work
+if [ $cfg_platform_name = "ios" ] || [ $cfg_platform_name = "mac" ];then
+    build_arches=("arm64" "armv7" "armv7s" "i386" "x86_64")
+    for arch in ${build_arches[@]}
+    do
+       rm -rf $cfg_platform_name/$arch
+    done
+fi

build/main.ini

@@ -5,7 +5,7 @@ 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*
+lua_header_files=l[au]*.h*
 curl_header_files=curl
 freetype_header_files=freetype2
 jpeg_header_files=j*.h
@@ -49,7 +49,8 @@ openssl_dependent_archive_list=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
+luajit_ignore_arch_list=arm64,x86_64
+lua_ignore_arch_list=i386,armv7,armv7s
 
 #clean up flag
 cfg_is_cleanup_after_build=no

contrib/src/luajit/SHA512SUMS

@@ -1 +1 @@
-a5af5772d00dfedcf1c3449b1d74d45af25d111c91931735ad80f2c7a3b7837b51807eb3a0ce12688e38352ad32cdd70bea35b53906c945ddf86dfd706118518  luajit-2.0.1.tar.gz
+7b3e3de22ac3602299b5918b60801e45a3278e547a15c16fdae7359538d4ada27ba664935d5f97c7409f330c2f8efeaae9ea03415f5e9d5a9d81e022cd5d36e0  luajit-2.0.3.tar.gz

contrib/src/luajit/ldsize-512.patch

@@ -0,0 +1,13 @@
+diff --git a/src/luaconf.h b/src/luaconf.h
+index affb7da..52abe0e 100644
+--- a/src/luaconf.h
++++ b/src/luaconf.h
+@@ -106,7 +106,7 @@
+ 
+ /* Note: changing the following defines breaks the Lua 5.1 ABI. */
+ #define LUA_INTEGER	ptrdiff_t
+-#define LUA_IDSIZE	60	/* Size of lua_Debug.short_src. */
++#define LUA_IDSIZE	512	/* Size of lua_Debug.short_src. */
+ /*
+ ** Size of lauxlib and io.* on-stack buffers. Weird workaround to avoid using
+ ** unreasonable amounts of stack space, but still retain ABI compatibility.

contrib/src/luajit/rules.mak

@@ -1,6 +1,6 @@
 # luajit
 
-LUAJIT_VERSION := 2.0.1
+LUAJIT_VERSION := 2.0.3
 LUAJIT_URL := http://luajit.org/download/LuaJIT-$(LUAJIT_VERSION).tar.gz
 
 $(TARBALLS)/luajit-$(LUAJIT_VERSION).tar.gz:
@@ -12,6 +12,9 @@ luajit: luajit-$(LUAJIT_VERSION).tar.gz .sum-luajit
 	$(UNPACK)
 ifeq ($(LUAJIT_VERSION),2.0.1)
 	$(APPLY) $(SRC)/luajit/v2.0.1_hotfix1.patch
+endif
+ifeq ($(LUAJIT_VERSION),2.0.3)
+	$(APPLY) $(SRC)/luajit/ldsize-512.patch
 endif
 	$(MOVE)