From 190e1239bf0ff2e1b5da7d0557c0aeb64cdcdccb Mon Sep 17 00:00:00 2001 From: CocosRobot Date: Tue, 5 Dec 2017 18:04:27 +0800 Subject: [PATCH] [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18535) --- .../lua-bindings/auto/api/Console.lua | 34 --- .../lua-bindings/auto/lua_cocos2dx_auto.cpp | 248 ------------------ .../lua-bindings/auto/lua_cocos2dx_auto.hpp | 4 - templates/cocos2dx_files.json | 21 +- 4 files changed, 2 insertions(+), 305 deletions(-) diff --git a/cocos/scripting/lua-bindings/auto/api/Console.lua b/cocos/scripting/lua-bindings/auto/api/Console.lua index 782673b3ae..0933538266 100644 --- a/cocos/scripting/lua-bindings/auto/api/Console.lua +++ b/cocos/scripting/lua-bindings/auto/api/Console.lua @@ -4,15 +4,6 @@ -- @extend Ref -- @parent_module cc --------------------------------- --- @overload self, cc.Console::Command, cc.Console::Command --- @overload self, string, cc.Console::Command --- @function [parent=#Console] addSubCommand --- @param self --- @param #string cmdName --- @param #cc.Console::Command subCmd --- @return Console#Console self (return value: cc.Console) - -------------------------------- -- starts listening to specified TCP port -- @function [parent=#Console] listenOnTCP @@ -27,15 +18,6 @@ -- @param #char buf -- @return Console#Console self (return value: cc.Console) --------------------------------- --- @overload self, cc.Console::Command, string --- @overload self, string, string --- @function [parent=#Console] getSubCommand --- @param self --- @param #string cmdName --- @param #string subCmdName --- @return Console::Command#Console::Command ret (return value: cc.Console::Command) - -------------------------------- -- delete custom command -- @function [parent=#Console] delCommand @@ -49,13 +31,6 @@ -- @param self -- @return Console#Console self (return value: cc.Console) --------------------------------- --- get custom command --- @function [parent=#Console] getCommand --- @param self --- @param #string cmdName --- @return Console::Command#Console::Command ret (return value: cc.Console::Command) - -------------------------------- -- starts listening to specified file descriptor -- @function [parent=#Console] listenOnFileDescriptor @@ -71,15 +46,6 @@ -- @param #string address -- @return Console#Console self (return value: cc.Console) --------------------------------- --- @overload self, cc.Console::Command, string --- @overload self, string, string --- @function [parent=#Console] delSubCommand --- @param self --- @param #string cmdName --- @param #string subCmdName --- @return Console#Console self (return value: cc.Console) - -------------------------------- -- Checks whether the server for console is bound with ipv6 address -- @function [parent=#Console] isIpv6Server diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp index 498481d461..db974dcf4b 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp @@ -169,72 +169,6 @@ int lua_register_cocos2dx_Ref(lua_State* tolua_S) return 1; } -int lua_cocos2dx_Console_addSubCommand(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Console* cobj = nullptr; - bool ok = true; -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.Console",0,&tolua_err)) goto tolua_lerror; -#endif - cobj = (cocos2d::Console*)tolua_tousertype(tolua_S,1,0); -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Console_addSubCommand'", nullptr); - return 0; - } -#endif - argc = lua_gettop(tolua_S)-1; - do{ - if (argc == 2) { - cocos2d::Console::Command arg0; - #pragma warning NO CONVERSION TO NATIVE FOR Command - ok = false; - - if (!ok) { break; } - cocos2d::Console::Command arg1; - #pragma warning NO CONVERSION TO NATIVE FOR Command - ok = false; - - if (!ok) { break; } - cobj->addSubCommand(arg0, arg1); - lua_settop(tolua_S, 1); - return 1; - } - }while(0); - ok = true; - do{ - if (argc == 2) { - std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Console:addSubCommand"); - - if (!ok) { break; } - cocos2d::Console::Command arg1; - #pragma warning NO CONVERSION TO NATIVE FOR Command - ok = false; - - if (!ok) { break; } - cobj->addSubCommand(arg0, arg1); - lua_settop(tolua_S, 1); - return 1; - } - }while(0); - ok = true; - luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Console:addSubCommand",argc, 2); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Console_addSubCommand'.",&tolua_err); -#endif - - return 0; -} int lua_cocos2dx_Console_listenOnTCP(lua_State* tolua_S) { int argc = 0; @@ -335,70 +269,6 @@ int lua_cocos2dx_Console_log(lua_State* tolua_S) return 0; } -int lua_cocos2dx_Console_getSubCommand(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Console* cobj = nullptr; - bool ok = true; -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.Console",0,&tolua_err)) goto tolua_lerror; -#endif - cobj = (cocos2d::Console*)tolua_tousertype(tolua_S,1,0); -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Console_getSubCommand'", nullptr); - return 0; - } -#endif - argc = lua_gettop(tolua_S)-1; - do{ - if (argc == 2) { - cocos2d::Console::Command arg0; - #pragma warning NO CONVERSION TO NATIVE FOR Command - ok = false; - - if (!ok) { break; } - std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Console:getSubCommand"); - - if (!ok) { break; } - const cocos2d::Console::Command* ret = cobj->getSubCommand(arg0, arg1); - #pragma warning NO CONVERSION FROM NATIVE FOR Command*; - return 1; - } - }while(0); - ok = true; - do{ - if (argc == 2) { - std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Console:getSubCommand"); - - if (!ok) { break; } - std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Console:getSubCommand"); - - if (!ok) { break; } - const cocos2d::Console::Command* ret = cobj->getSubCommand(arg0, arg1); - #pragma warning NO CONVERSION FROM NATIVE FOR Command*; - return 1; - } - }while(0); - ok = true; - luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Console:getSubCommand",argc, 2); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Console_getSubCommand'.",&tolua_err); -#endif - - return 0; -} int lua_cocos2dx_Console_delCommand(lua_State* tolua_S) { int argc = 0; @@ -496,56 +366,6 @@ int lua_cocos2dx_Console_stop(lua_State* tolua_S) return 0; } -int lua_cocos2dx_Console_getCommand(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Console* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.Console",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::Console*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Console_getCommand'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - std::string arg0; - - ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Console:getCommand"); - if(!ok) - { - tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Console_getCommand'", nullptr); - return 0; - } - const cocos2d::Console::Command* ret = cobj->getCommand(arg0); - #pragma warning NO CONVERSION FROM NATIVE FOR Command*; - return 1; - } - luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Console:getCommand",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Console_getCommand'.",&tolua_err); -#endif - - return 0; -} int lua_cocos2dx_Console_listenOnFileDescriptor(lua_State* tolua_S) { int argc = 0; @@ -646,70 +466,6 @@ int lua_cocos2dx_Console_setBindAddress(lua_State* tolua_S) return 0; } -int lua_cocos2dx_Console_delSubCommand(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Console* cobj = nullptr; - bool ok = true; -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.Console",0,&tolua_err)) goto tolua_lerror; -#endif - cobj = (cocos2d::Console*)tolua_tousertype(tolua_S,1,0); -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Console_delSubCommand'", nullptr); - return 0; - } -#endif - argc = lua_gettop(tolua_S)-1; - do{ - if (argc == 2) { - cocos2d::Console::Command arg0; - #pragma warning NO CONVERSION TO NATIVE FOR Command - ok = false; - - if (!ok) { break; } - std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Console:delSubCommand"); - - if (!ok) { break; } - cobj->delSubCommand(arg0, arg1); - lua_settop(tolua_S, 1); - return 1; - } - }while(0); - ok = true; - do{ - if (argc == 2) { - std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Console:delSubCommand"); - - if (!ok) { break; } - std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Console:delSubCommand"); - - if (!ok) { break; } - cobj->delSubCommand(arg0, arg1); - lua_settop(tolua_S, 1); - return 1; - } - }while(0); - ok = true; - luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Console:delSubCommand",argc, 2); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Console_delSubCommand'.",&tolua_err); -#endif - - return 0; -} int lua_cocos2dx_Console_isIpv6Server(lua_State* tolua_S) { int argc = 0; @@ -769,16 +525,12 @@ int lua_register_cocos2dx_Console(lua_State* tolua_S) tolua_cclass(tolua_S,"Console","cc.Console","cc.Ref",nullptr); tolua_beginmodule(tolua_S,"Console"); - tolua_function(tolua_S,"addSubCommand",lua_cocos2dx_Console_addSubCommand); tolua_function(tolua_S,"listenOnTCP",lua_cocos2dx_Console_listenOnTCP); tolua_function(tolua_S,"log",lua_cocos2dx_Console_log); - tolua_function(tolua_S,"getSubCommand",lua_cocos2dx_Console_getSubCommand); tolua_function(tolua_S,"delCommand",lua_cocos2dx_Console_delCommand); tolua_function(tolua_S,"stop",lua_cocos2dx_Console_stop); - tolua_function(tolua_S,"getCommand",lua_cocos2dx_Console_getCommand); tolua_function(tolua_S,"listenOnFileDescriptor",lua_cocos2dx_Console_listenOnFileDescriptor); tolua_function(tolua_S,"setBindAddress",lua_cocos2dx_Console_setBindAddress); - tolua_function(tolua_S,"delSubCommand",lua_cocos2dx_Console_delSubCommand); tolua_function(tolua_S,"isIpv6Server",lua_cocos2dx_Console_isIpv6Server); tolua_endmodule(tolua_S); std::string typeName = typeid(cocos2d::Console).name(); diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp index 000d8da939..7cbfc4498e 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp @@ -2284,10 +2284,6 @@ int register_all_cocos2dx(lua_State* tolua_S); - - - - diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json index 30cc297033..2453fcc2ad 100644 --- a/templates/cocos2dx_files.json +++ b/templates/cocos2dx_files.json @@ -1877,7 +1877,6 @@ "external/Box2D/prebuilt/android/Android.mk", "external/Box2D/prebuilt/android/arm64-v8a/libbox2d.a", "external/Box2D/prebuilt/android/armeabi-v7a/libbox2d.a", - "external/Box2D/prebuilt/android/armeabi/libbox2d.a", "external/Box2D/prebuilt/android/x86/libbox2d.a", "external/Box2D/prebuilt/ios/libbox2d.a", "external/Box2D/prebuilt/linux/64-bit/libbox2d.a", @@ -2288,11 +2287,6 @@ "external/bullet/prebuilt/android/armeabi-v7a/libBulletMultiThreaded.a", "external/bullet/prebuilt/android/armeabi-v7a/libLinearMath.a", "external/bullet/prebuilt/android/armeabi-v7a/libMiniCL.a", - "external/bullet/prebuilt/android/armeabi/libBulletCollision.a", - "external/bullet/prebuilt/android/armeabi/libBulletDynamics.a", - "external/bullet/prebuilt/android/armeabi/libBulletMultiThreaded.a", - "external/bullet/prebuilt/android/armeabi/libLinearMath.a", - "external/bullet/prebuilt/android/armeabi/libMiniCL.a", "external/bullet/prebuilt/android/x86/libBulletCollision.a", "external/bullet/prebuilt/android/x86/libBulletDynamics.a", "external/bullet/prebuilt/android/x86/libBulletMultiThreaded.a", @@ -2347,7 +2341,6 @@ "external/chipmunk/prebuilt/android/Android.mk", "external/chipmunk/prebuilt/android/arm64-v8a/libchipmunk.a", "external/chipmunk/prebuilt/android/armeabi-v7a/libchipmunk.a", - "external/chipmunk/prebuilt/android/armeabi/libchipmunk.a", "external/chipmunk/prebuilt/android/x86/libchipmunk.a", "external/chipmunk/prebuilt/ios/libchipmunk.a", "external/chipmunk/prebuilt/linux/64-bit/libchipmunk.a", @@ -2427,7 +2420,6 @@ "external/curl/prebuilt/android/Android.mk", "external/curl/prebuilt/android/arm64-v8a/libcurl.a", "external/curl/prebuilt/android/armeabi-v7a/libcurl.a", - "external/curl/prebuilt/android/armeabi/libcurl.a", "external/curl/prebuilt/android/x86/libcurl.a", "external/curl/prebuilt/ios/libcurl.a", "external/curl/prebuilt/mac/libcurl.a", @@ -2851,7 +2843,6 @@ "external/freetype2/prebuilt/android/Android.mk", "external/freetype2/prebuilt/android/arm64-v8a/libfreetype.a", "external/freetype2/prebuilt/android/armeabi-v7a/libfreetype.a", - "external/freetype2/prebuilt/android/armeabi/libfreetype.a", "external/freetype2/prebuilt/android/x86/libfreetype.a", "external/freetype2/prebuilt/ios/libfreetype.a", "external/freetype2/prebuilt/linux/64-bit/libfreetype.a", @@ -2898,7 +2889,6 @@ "external/jpeg/prebuilt/android/Android.mk", "external/jpeg/prebuilt/android/arm64-v8a/libjpeg.a", "external/jpeg/prebuilt/android/armeabi-v7a/libjpeg.a", - "external/jpeg/prebuilt/android/armeabi/libjpeg.a", "external/jpeg/prebuilt/android/x86/libjpeg.a", "external/jpeg/prebuilt/ios/libjpeg.a", "external/jpeg/prebuilt/linux/64-bit/libjpeg.a", @@ -2952,7 +2942,9 @@ "external/linux-specific/fmod/include/fmod_errors.h", "external/linux-specific/fmod/include/fmod_output.h", "external/linux-specific/fmod/prebuilt/64-bit/libfmod.so", + "external/linux-specific/fmod/prebuilt/64-bit/libfmod.so.6", "external/linux-specific/fmod/prebuilt/64-bit/libfmodL.so", + "external/linux-specific/fmod/prebuilt/64-bit/libfmodL.so.6", "external/md5/md5.c", "external/md5/md5.h", "external/openssl/include/android/openssl/aes.h", @@ -3559,8 +3551,6 @@ "external/openssl/prebuilt/android/arm64-v8a/libssl.a", "external/openssl/prebuilt/android/armeabi-v7a/libcrypto.a", "external/openssl/prebuilt/android/armeabi-v7a/libssl.a", - "external/openssl/prebuilt/android/armeabi/libcrypto.a", - "external/openssl/prebuilt/android/armeabi/libssl.a", "external/openssl/prebuilt/android/x86/libcrypto.a", "external/openssl/prebuilt/android/x86/libssl.a", "external/openssl/prebuilt/ios/libcrypto.a", @@ -3606,7 +3596,6 @@ "external/png/prebuilt/android/Android.mk", "external/png/prebuilt/android/arm64-v8a/libpng.a", "external/png/prebuilt/android/armeabi-v7a/libpng.a", - "external/png/prebuilt/android/armeabi/libpng.a", "external/png/prebuilt/android/x86/libpng.a", "external/png/prebuilt/ios/libpng.a", "external/png/prebuilt/mac/libpng.a", @@ -3738,7 +3727,6 @@ "external/tiff/prebuilt/android/Android.mk", "external/tiff/prebuilt/android/arm64-v8a/libtiff.a", "external/tiff/prebuilt/android/armeabi-v7a/libtiff.a", - "external/tiff/prebuilt/android/armeabi/libtiff.a", "external/tiff/prebuilt/android/x86/libtiff.a", "external/tiff/prebuilt/ios/libtiff.a", "external/tiff/prebuilt/linux/64-bit/libtiff.a", @@ -3787,7 +3775,6 @@ "external/webp/prebuilt/android/Android.mk", "external/webp/prebuilt/android/arm64-v8a/libwebp.a", "external/webp/prebuilt/android/armeabi-v7a/libwebp.a", - "external/webp/prebuilt/android/armeabi/libwebp.a", "external/webp/prebuilt/android/x86/libwebp.a", "external/webp/prebuilt/ios/libwebp.a", "external/webp/prebuilt/linux/64-bit/libwebp.a", @@ -3819,7 +3806,6 @@ "external/websockets/prebuilt/android/Android.mk", "external/websockets/prebuilt/android/arm64-v8a/libwebsockets.a", "external/websockets/prebuilt/android/armeabi-v7a/libwebsockets.a", - "external/websockets/prebuilt/android/armeabi/libwebsockets.a", "external/websockets/prebuilt/android/x86/libwebsockets.a", "external/websockets/prebuilt/ios/libwebsockets.a", "external/websockets/prebuilt/linux/64-bit/libwebsockets.a", @@ -3938,7 +3924,6 @@ "external/zlib/prebuilt/android/Android.mk", "external/zlib/prebuilt/android/arm64-v8a/libz.a", "external/zlib/prebuilt/android/armeabi-v7a/libz.a", - "external/zlib/prebuilt/android/armeabi/libz.a", "external/zlib/prebuilt/android/x86/libz.a", "external/zlib/prebuilt/mac/libz.a", "issue_template.md", @@ -4939,7 +4924,6 @@ "external/spidermonkey/prebuilt/android/Android.mk", "external/spidermonkey/prebuilt/android/arm64-v8a/libjs_static.a", "external/spidermonkey/prebuilt/android/armeabi-v7a/libjs_static.a", - "external/spidermonkey/prebuilt/android/armeabi/libjs_static.a", "external/spidermonkey/prebuilt/android/x86/libjs_static.a", "external/spidermonkey/prebuilt/ios/libjs_static.a", "external/spidermonkey/prebuilt/linux/64-bit/libjs_static.a", @@ -5701,7 +5685,6 @@ "external/lua/luajit/prebuilt/android/Android.mk", "external/lua/luajit/prebuilt/android/arm64-v8a/libluajit.a", "external/lua/luajit/prebuilt/android/armeabi-v7a/libluajit.a", - "external/lua/luajit/prebuilt/android/armeabi/libluajit.a", "external/lua/luajit/prebuilt/android/x86/libluajit.a", "external/lua/luajit/prebuilt/ios/libluajit.a", "external/lua/luajit/prebuilt/linux/64-bit/libluajit.a",