Luajit (#16620)

* update console

* load lua according architecture

* install android-13 in travis

.travis.yml

@@ -24,7 +24,7 @@ matrix:
       sudo: required
       android:
         components:
-          - android-10
+          - android-13
     # mac lua-tests + js-tests
     # - os: osx
     #   env: BUILD_TARGET=mac

cocos/scripting/lua-bindings/proj.android/Android.mk

@@ -21,15 +21,9 @@ LOCAL_EXPORT_LDLIBS := -lGLESv2 \
                        -llog \
                        -landroid
 
-ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
-LUA_STATIC_LIB := lua_static
-LUA_IMPORT_PATH := lua/lua
-LUA_INCLUDE_PATH := $(LOCAL_PATH)/../../../../external/lua/lua
-else
 LUA_STATIC_LIB := luajit_static
 LUA_IMPORT_PATH := lua/luajit/prebuilt/android
 LUA_INCLUDE_PATH := $(LOCAL_PATH)/../../../../external/lua/luajit/include
-endif
 
 LOCAL_STATIC_LIBRARIES := $(LUA_STATIC_LIB)
 

templates/lua-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp

@@ -60,8 +60,14 @@ bool AppDelegate::applicationDidFinishLaunching()
     //register custom function
     //LuaStack* stack = engine->getLuaStack();
     //register_custom_function(stack->getLuaState());
-
-    if (engine->executeScriptFile("src/main.lua"))
+
+    #if CC_64BITS
+    FileUtils::getInstance()->addSearchPath("src/64bit");
+#else
+    FileUtils::getInstance()->addSearchPath("src");
+#endif
+    FileUtils::getInstance()->addSearchPath("res");
+    if (engine->executeScriptFile("main.lua"))
     {
         return false;
     }

templates/lua-template-default/src/main.lua

@@ -1,7 +1,5 @@
 
 cc.FileUtils:getInstance():setPopupNotify(false)
-cc.FileUtils:getInstance():addSearchPath("src/")
-cc.FileUtils:getInstance():addSearchPath("res/")
 
 require "config"
 require "cocos.init"

tests/lua-empty-test/project/Classes/AppDelegate.cpp

@@ -37,7 +37,14 @@ bool AppDelegate::applicationDidFinishLaunching()
     lua_module_register(L);
     //The call was commented because it will lead to ZeroBrane Studio can't find correct context when debugging
     //engine->executeScriptFile("src/hello.lua");
-    engine->executeString("require 'src/hello.lua'");
+
+#if CC_64BITS
+    FileUtils::getInstance()->addSearchPath("src/64bit");
+#else
+    FileUtils::getInstance()->addSearchPath("src");
+#endif
+    FileUtils::getInstance()->addSearchPath("res");
+    engine->executeString("require 'hello.lua'");
 
     return true;
 }

tests/lua-empty-test/src/hello.lua

@@ -1,5 +1,3 @@
-cc.FileUtils:getInstance():addSearchPath("src")
-cc.FileUtils:getInstance():addSearchPath("res")
 -- CC_USE_DEPRECATED_API = true
 require "cocos.init"
 

tests/lua-tests/project/Classes/AppDelegate.cpp

@@ -50,8 +50,13 @@ bool AppDelegate::applicationDidFinishLaunching()
     }
     lua_pop(L, 1);
 
-
-    pEngine->executeScriptFile("src/controller.lua");
+#if CC_64BITS
+    FileUtils::getInstance()->addSearchPath("src/64bit");
+#else
+    FileUtils::getInstance()->addSearchPath("src");
+#endif
+    FileUtils::getInstance()->addSearchPath("res");
+    pEngine->executeScriptFile("controller.lua");
 
     return true;
 }

tests/lua-tests/src/controller.lua

@@ -5,7 +5,6 @@ collectgarbage("setstepmul", 5000)
 
 ----------------
 -- run
-cc.FileUtils:getInstance():addSearchPath("src")
 CC_USE_DEPRECATED_API = true
 require "cocos.init"