Merge pull request #8644 from samuele3hu/v3_compile_error

Fix the lua-tests compile error

build/android-build.py

@@ -162,7 +162,7 @@ def copy_resources(target, app_android_root):
             copy_files(os.path.join(common_script_dir, "cocos2d"), assets_dir)
             copy_files(os.path.join(common_script_dir, "cocosbuilder"), assets_dir)
             copy_files(os.path.join(common_script_dir, "cocosdenshion"), assets_dir)
-            copy_files(os.path.join(common_script_dir, "cocostudio"), assets_dir)
+            copy_files(os.path.join(common_script_dir, "cocosstudio"), assets_dir)
             copy_files(os.path.join(common_script_dir, "extension"), assets_dir)
             copy_files(os.path.join(common_script_dir, "network"), assets_dir)
             copy_files(os.path.join(common_script_dir, "ui"), assets_dir)

build/cocos2d_tests.xcodeproj/project.pbxproj

@@ -199,14 +199,6 @@
 		15D1FD3E199863CA00302043 /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD39199863CA00302043 /* DeprecatedCocosDenshionClass.lua */; };
 		15D1FD3F199863CA00302043 /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD3A199863CA00302043 /* DeprecatedCocosDenshionFunc.lua */; };
 		15D1FD40199863CA00302043 /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD3A199863CA00302043 /* DeprecatedCocosDenshionFunc.lua */; };
-		15D1FD45199863E800302043 /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD41199863E800302043 /* CocoStudio.lua */; };
-		15D1FD46199863E800302043 /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD41199863E800302043 /* CocoStudio.lua */; };
-		15D1FD47199863E800302043 /* DeprecatedCocoStudioClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD42199863E800302043 /* DeprecatedCocoStudioClass.lua */; };
-		15D1FD48199863E800302043 /* DeprecatedCocoStudioClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD42199863E800302043 /* DeprecatedCocoStudioClass.lua */; };
-		15D1FD49199863E800302043 /* DeprecatedCocoStudioFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD43199863E800302043 /* DeprecatedCocoStudioFunc.lua */; };
-		15D1FD4A199863E800302043 /* DeprecatedCocoStudioFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD43199863E800302043 /* DeprecatedCocoStudioFunc.lua */; };
-		15D1FD4B199863E800302043 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD44199863E800302043 /* StudioConstants.lua */; };
-		15D1FD4C199863E800302043 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD44199863E800302043 /* StudioConstants.lua */; };
 		15D1FD51199863F900302043 /* DeprecatedExtensionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4D199863F900302043 /* DeprecatedExtensionClass.lua */; };
 		15D1FD52199863F900302043 /* DeprecatedExtensionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4D199863F900302043 /* DeprecatedExtensionClass.lua */; };
 		15D1FD53199863F900302043 /* DeprecatedExtensionEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4E199863F900302043 /* DeprecatedExtensionEnum.lua */; };
@@ -239,6 +231,22 @@
 		15D1FD761998642800302043 /* experimentalUIConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6F1998642800302043 /* experimentalUIConstants.lua */; };
 		15D1FD771998642800302043 /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD701998642800302043 /* GuiConstants.lua */; };
 		15D1FD781998642800302043 /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD701998642800302043 /* GuiConstants.lua */; };
+		15D7638219E8FC980069EAE8 /* CocosStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7637E19E8FC980069EAE8 /* CocosStudio.lua */; };
+		15D7638319E8FC980069EAE8 /* CocosStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7637E19E8FC980069EAE8 /* CocosStudio.lua */; };
+		15D7638419E8FC980069EAE8 /* CocosStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7637E19E8FC980069EAE8 /* CocosStudio.lua */; };
+		15D7638519E8FC980069EAE8 /* CocosStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7637E19E8FC980069EAE8 /* CocosStudio.lua */; };
+		15D7638619E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7637F19E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua */; };
+		15D7638719E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7637F19E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua */; };
+		15D7638819E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7637F19E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua */; };
+		15D7638919E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7637F19E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua */; };
+		15D7638A19E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7638019E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua */; };
+		15D7638B19E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7638019E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua */; };
+		15D7638C19E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7638019E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua */; };
+		15D7638D19E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7638019E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua */; };
+		15D7638E19E8FC980069EAE8 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7638119E8FC980069EAE8 /* StudioConstants.lua */; };
+		15D7638F19E8FC980069EAE8 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7638119E8FC980069EAE8 /* StudioConstants.lua */; };
+		15D7639019E8FC980069EAE8 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7638119E8FC980069EAE8 /* StudioConstants.lua */; };
+		15D7639119E8FC980069EAE8 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7638119E8FC980069EAE8 /* StudioConstants.lua */; };
 		15E66FC8192D957100C20A52 /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; };
 		15E66FD6192DC8C700C20A52 /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; };
 		15EE465B19A7200300AF29F1 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EE465A19A7200300AF29F1 /* libcurl.a */; };
@@ -2310,10 +2318,6 @@
 		15D1FD38199863CA00302043 /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = "../cocos/scripting/lua-bindings/script/cocosdenshion/AudioEngine.lua"; sourceTree = "<group>"; };
 		15D1FD39199863CA00302043 /* DeprecatedCocosDenshionClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionClass.lua; path = "../cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionClass.lua"; sourceTree = "<group>"; };
 		15D1FD3A199863CA00302043 /* DeprecatedCocosDenshionFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionFunc.lua; path = "../cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionFunc.lua"; sourceTree = "<group>"; };
-		15D1FD41199863E800302043 /* CocoStudio.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CocoStudio.lua; path = "../cocos/scripting/lua-bindings/script/cocostudio/CocoStudio.lua"; sourceTree = "<group>"; };
-		15D1FD42199863E800302043 /* DeprecatedCocoStudioClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocoStudioClass.lua; path = "../cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioClass.lua"; sourceTree = "<group>"; };
-		15D1FD43199863E800302043 /* DeprecatedCocoStudioFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocoStudioFunc.lua; path = "../cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioFunc.lua"; sourceTree = "<group>"; };
-		15D1FD44199863E800302043 /* StudioConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = StudioConstants.lua; path = "../cocos/scripting/lua-bindings/script/cocostudio/StudioConstants.lua"; sourceTree = "<group>"; };
 		15D1FD4D199863F900302043 /* DeprecatedExtensionClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionClass.lua; path = "../cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionClass.lua"; sourceTree = "<group>"; };
 		15D1FD4E199863F900302043 /* DeprecatedExtensionEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionEnum.lua; path = "../cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionEnum.lua"; sourceTree = "<group>"; };
 		15D1FD4F199863F900302043 /* DeprecatedExtensionFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionFunc.lua; path = "../cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionFunc.lua"; sourceTree = "<group>"; };
@@ -2326,6 +2330,10 @@
 		15D1FD6E1998642800302043 /* DeprecatedUIFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedUIFunc.lua; path = "../cocos/scripting/lua-bindings/script/ui/DeprecatedUIFunc.lua"; sourceTree = "<group>"; };
 		15D1FD6F1998642800302043 /* experimentalUIConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = experimentalUIConstants.lua; path = "../cocos/scripting/lua-bindings/script/ui/experimentalUIConstants.lua"; sourceTree = "<group>"; };
 		15D1FD701998642800302043 /* GuiConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = GuiConstants.lua; path = "../cocos/scripting/lua-bindings/script/ui/GuiConstants.lua"; sourceTree = "<group>"; };
+		15D7637E19E8FC980069EAE8 /* CocosStudio.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CocosStudio.lua; path = "../cocos/scripting/lua-bindings/script/cocosstudio/CocosStudio.lua"; sourceTree = "<group>"; };
+		15D7637F19E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocoStudioClass.lua; path = "../cocos/scripting/lua-bindings/script/cocosstudio/DeprecatedCocoStudioClass.lua"; sourceTree = "<group>"; };
+		15D7638019E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocoStudioFunc.lua; path = "../cocos/scripting/lua-bindings/script/cocosstudio/DeprecatedCocoStudioFunc.lua"; sourceTree = "<group>"; };
+		15D7638119E8FC980069EAE8 /* StudioConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = StudioConstants.lua; path = "../cocos/scripting/lua-bindings/script/cocosstudio/StudioConstants.lua"; sourceTree = "<group>"; };
 		15EE465A19A7200300AF29F1 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../external/curl/prebuilt/ios/libcurl.a; sourceTree = "<group>"; };
 		1A0EE2B218CDF6DA004CD58F /* cpp-empty-test Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "cpp-empty-test Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		1A0EE31418CDF733004CD58F /* lua-empty-test Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "lua-empty-test Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -5312,6 +5320,10 @@
 		1ABCA36418CD9E060087CE3A /* Lua Common */ = {
 			isa = PBXGroup;
 			children = (
+				15D7637E19E8FC980069EAE8 /* CocosStudio.lua */,
+				15D7637F19E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua */,
+				15D7638019E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua */,
+				15D7638119E8FC980069EAE8 /* StudioConstants.lua */,
 				15D1FD6D1998642800302043 /* DeprecatedUIEnum.lua */,
 				15D1FD6E1998642800302043 /* DeprecatedUIFunc.lua */,
 				15D1FD6F1998642800302043 /* experimentalUIConstants.lua */,
@@ -5324,10 +5336,6 @@
 				15D1FD4E199863F900302043 /* DeprecatedExtensionEnum.lua */,
 				15D1FD4F199863F900302043 /* DeprecatedExtensionFunc.lua */,
 				15D1FD50199863F900302043 /* ExtensionConstants.lua */,
-				15D1FD41199863E800302043 /* CocoStudio.lua */,
-				15D1FD42199863E800302043 /* DeprecatedCocoStudioClass.lua */,
-				15D1FD43199863E800302043 /* DeprecatedCocoStudioFunc.lua */,
-				15D1FD44199863E800302043 /* StudioConstants.lua */,
 				15D1FD38199863CA00302043 /* AudioEngine.lua */,
 				15D1FD39199863CA00302043 /* DeprecatedCocosDenshionClass.lua */,
 				15D1FD3A199863CA00302043 /* DeprecatedCocosDenshionFunc.lua */,
@@ -7515,6 +7523,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				15D7638719E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua in Resources */,
 				1AC35D5C18CEDE9E00F37B72 /* InfoPlist.strings in Resources */,
 				1AC35D5D18CEDE9E00F37B72 /* MainMenu.xib in Resources */,
 				15D1FD621998641200302043 /* DeprecatedNetworkEnum.lua in Resources */,
@@ -7525,12 +7534,15 @@
 				15D1FCED1998637C00302043 /* bitExtend.lua in Resources */,
 				1503FABF18DA8B6C00F6518C /* smtp.lua in Resources */,
 				15D1FD291998637C00302043 /* Opengl.lua in Resources */,
+				15D7638F19E8FC980069EAE8 /* StudioConstants.lua in Resources */,
 				1503FAB318DA8B6C00F6518C /* ftp.lua in Resources */,
 				1503FAB718DA8B6C00F6518C /* http.lua in Resources */,
 				15D1FCF71998637C00302043 /* Cocos2dConstants.lua in Resources */,
 				1503FAC118DA8B6C00F6518C /* socket.lua in Resources */,
 				1503FAB918DA8B6C00F6518C /* ltn12.lua in Resources */,
 				15D1FD0B1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */,
+				15D7638B19E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua in Resources */,
+				15D7638319E8FC980069EAE8 /* CocosStudio.lua in Resources */,
 				15D1FD661998641200302043 /* DeprecatedNetworkFunc.lua in Resources */,
 				15D1FD241998637C00302043 /* luaoc.lua in Resources */,
 				1AC35D5E18CEDE9E00F37B72 /* Icon.icns in Resources */,
@@ -7583,7 +7595,9 @@
 			files = (
 				15D1FD171998637C00302043 /* extern.lua in Resources */,
 				15D1FD641998641200302043 /* DeprecatedNetworkEnum.lua in Resources */,
+				15D7638D19E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua in Resources */,
 				15D1FCF41998637C00302043 /* Cocos2d.lua in Resources */,
+				15D7638519E8FC980069EAE8 /* CocosStudio.lua in Resources */,
 				1AC35D4A18CEDE9400F37B72 /* Icon-120.png in Resources */,
 				1503FAC018DA8B6C00F6518C /* smtp.lua in Resources */,
 				15D1FD681998641200302043 /* DeprecatedNetworkFunc.lua in Resources */,
@@ -7599,6 +7613,7 @@
 				1503FABE18DA8B6C00F6518C /* mime.lua in Resources */,
 				15D1FD601998641200302043 /* DeprecatedNetworkClass.lua in Resources */,
 				15D1FD2B1998637C00302043 /* Opengl.lua in Resources */,
+				15D7639119E8FC980069EAE8 /* StudioConstants.lua in Resources */,
 				1AC35D4E18CEDE9400F37B72 /* Icon-72.png in Resources */,
 				1AC35D4F18CEDE9400F37B72 /* Icon-76.png in Resources */,
 				1503FAC218DA8B6C00F6518C /* socket.lua in Resources */,
@@ -7608,6 +7623,7 @@
 				15D1FD301998637C00302043 /* OpenglConstants.lua in Resources */,
 				1503FAB618DA8B6C00F6518C /* headers.lua in Resources */,
 				1AC35D4918CEDE9400F37B72 /* Icon-114.png in Resources */,
+				15D7638919E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua in Resources */,
 				1503FAB418DA8B6C00F6518C /* ftp.lua in Resources */,
 				15D1FCEF1998637C00302043 /* bitExtend.lua in Resources */,
 				1AC35D2A18CEDE7200F37B72 /* res in Resources */,
@@ -7630,16 +7646,17 @@
 			files = (
 				15D1FD751998642800302043 /* experimentalUIConstants.lua in Resources */,
 				156EAE071977D0BD00F53709 /* ActionTimeline in Resources */,
+				15D7638219E8FC980069EAE8 /* CocosStudio.lua in Resources */,
 				15E66FD6192DC8C700C20A52 /* Sprite3DTest in Resources */,
 				15D1FD001998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */,
 				15D1FD2D1998637C00302043 /* OpenglConstants.lua in Resources */,
 				15D1FCF11998637C00302043 /* Cocos2d.lua in Resources */,
-				15D1FD47199863E800302043 /* DeprecatedCocoStudioClass.lua in Resources */,
 				3E2F27BC19D00D7200E7C490 /* audio in Resources */,
 				1AC35DC318CEE65100F37B72 /* Misc in Resources */,
 				1AC35DC618CEE65100F37B72 /* Shaders in Resources */,
 				15D1FD141998637C00302043 /* extern.lua in Resources */,
 				1AC35DBB18CEE65100F37B72 /* components in Resources */,
+				15D7638E19E8FC980069EAE8 /* StudioConstants.lua in Resources */,
 				1AC35DE218CEE65900F37B72 /* effect2.ogg in Resources */,
 				15C90B4318E66C1700D69802 /* mime.lua in Resources */,
 				15D1FD651998641200302043 /* DeprecatedNetworkFunc.lua in Resources */,
@@ -7650,6 +7667,7 @@
 				1AC35DBF18CEE65100F37B72 /* hd in Resources */,
 				1AC35DC818CEE65100F37B72 /* TileMaps in Resources */,
 				1AC35DBE18CEE65100F37B72 /* fonts in Resources */,
+				15D7638619E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua in Resources */,
 				15D1FD691998641200302043 /* NetworkConstants.lua in Resources */,
 				1AC35DDE18CEE65900F37B72 /* CocosBuilderExample.ccbresourcelog in Resources */,
 				15D1FD34199863BA00302043 /* CCBReaderLoad.lua in Resources */,
@@ -7664,6 +7682,7 @@
 				C08689C218D370C90093E810 /* background.caf in Resources */,
 				15D1FD0A1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */,
 				15C90B4918E66C2A00D69802 /* tp.lua in Resources */,
+				15D7638A19E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua in Resources */,
 				15D1FD281998637C00302043 /* Opengl.lua in Resources */,
 				1AC35DE918CEE65900F37B72 /* effect1.wav in Resources */,
 				3E2F27BD19D00D7D00E7C490 /* background.wav in Resources */,
@@ -7676,9 +7695,7 @@
 				1AC35DC418CEE65100F37B72 /* Particles in Resources */,
 				15D1FD3F199863CA00302043 /* DeprecatedCocosDenshionFunc.lua in Resources */,
 				15D1FD191998637C00302043 /* json.lua in Resources */,
-				15D1FD4B199863E800302043 /* StudioConstants.lua in Resources */,
 				1AC35DB918CEE65100F37B72 /* ccb in Resources */,
-				15D1FD49199863E800302043 /* DeprecatedCocoStudioFunc.lua in Resources */,
 				15C90B4118E66C1100D69802 /* mbox.lua in Resources */,
 				15D1FD55199863F900302043 /* DeprecatedExtensionFunc.lua in Resources */,
 				15D1FD3B199863CA00302043 /* AudioEngine.lua in Resources */,
@@ -7703,7 +7720,6 @@
 				15D1FD51199863F900302043 /* DeprecatedExtensionClass.lua in Resources */,
 				1AC35DBD18CEE65100F37B72 /* extensions in Resources */,
 				15D1FD771998642800302043 /* GuiConstants.lua in Resources */,
-				15D1FD45199863E800302043 /* CocoStudio.lua in Resources */,
 				15D1FD1E1998637C00302043 /* luaj.lua in Resources */,
 				1AC35DC718CEE65100F37B72 /* spine in Resources */,
 				15C90B4518E66C1E00D69802 /* smtp.lua in Resources */,
@@ -7729,7 +7745,6 @@
 				1AC35DF718CEE65B00F37B72 /* effect1.wav in Resources */,
 				C08689C418D370C90093E810 /* background.caf in Resources */,
 				1AC35DD118CEE65200F37B72 /* fonts in Resources */,
-				15D1FD4C199863E800302043 /* StudioConstants.lua in Resources */,
 				1AC35DCC18CEE65200F37B72 /* ccb in Resources */,
 				1AC35DD218CEE65200F37B72 /* hd in Resources */,
 				15D1FD251998637C00302043 /* luaoc.lua in Resources */,
@@ -7746,7 +7761,6 @@
 				15D1FD021998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */,
 				1AC35DF818CEE65B00F37B72 /* pew-pew-lei.wav in Resources */,
 				1AC35D9918CEE5D100F37B72 /* Default-568h@2x.png in Resources */,
-				15D1FD4A199863E800302043 /* DeprecatedCocoStudioFunc.lua in Resources */,
 				15D1FD071998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */,
 				15C90B4218E66C1200D69802 /* mbox.lua in Resources */,
 				15D1FD201998637C00302043 /* luaj.lua in Resources */,
@@ -7780,16 +7794,16 @@
 				15D1FD2F1998637C00302043 /* OpenglConstants.lua in Resources */,
 				15D1FD671998641200302043 /* DeprecatedNetworkFunc.lua in Resources */,
 				1A1645A9191B6283008C7C7F /* ccs-res in Resources */,
-				15D1FD46199863E800302043 /* CocoStudio.lua in Resources */,
 				15D1FD37199863BA00302043 /* DeprecatedCocosBuilderClass.lua in Resources */,
 				1AC35DA118CEE5D100F37B72 /* Icon-72.png in Resources */,
+				15D7638819E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua in Resources */,
 				15C90B4018E66C0D00D69802 /* ltn12.lua in Resources */,
-				15D1FD48199863E800302043 /* DeprecatedCocoStudioClass.lua in Resources */,
 				15D1FD161998637C00302043 /* extern.lua in Resources */,
 				1AC35DA218CEE5D100F37B72 /* Icon-76.png in Resources */,
 				15C90B4818E66C2500D69802 /* socket.lua in Resources */,
 				15D1FD40199863CA00302043 /* DeprecatedCocosDenshionFunc.lua in Resources */,
 				15C90B3C18E66BEC00D69802 /* headers.lua in Resources */,
+				15D7638419E8FC980069EAE8 /* CocosStudio.lua in Resources */,
 				1AC35DF418CEE65B00F37B72 /* effect1.raw in Resources */,
 				1AC35DD918CEE65200F37B72 /* Shaders in Resources */,
 				1AC35DCF18CEE65200F37B72 /* configs in Resources */,
@@ -7803,7 +7817,9 @@
 				1AC35D9C18CEE5D100F37B72 /* Icon-114.png in Resources */,
 				15D1FD52199863F900302043 /* DeprecatedExtensionClass.lua in Resources */,
 				1AC35D9F18CEE5D100F37B72 /* Icon-152.png in Resources */,
+				15D7638C19E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua in Resources */,
 				1AC35DEE18CEE65B00F37B72 /* background.mp3 in Resources */,
+				15D7639019E8FC980069EAE8 /* StudioConstants.lua in Resources */,
 				1AC35D9A18CEE5D100F37B72 /* Default.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

tests/lua-tests/project/CMakeLists.txt

@@ -49,7 +49,7 @@ pre_build(${APP_NAME}
   COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/cocosdenshion ${APP_BIN_DIR}/Resources
   COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/network ${APP_BIN_DIR}/Resources
   COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/cocosbuilder ${APP_BIN_DIR}/Resources
-  COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/cocostudio ${APP_BIN_DIR}/Resources
+  COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/cocosstudio ${APP_BIN_DIR}/Resources
   COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/extension ${APP_BIN_DIR}/Resources
   COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/ui ${APP_BIN_DIR}/Resources
   COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/tests/cpp-tests/Resources ${APP_BIN_DIR}/Resources/res

tests/lua-tests/project/proj.android/build-cfg.json

@@ -33,7 +33,7 @@
             "to": ""
         },
         {
-            "from": "../../../../cocos/scripting/lua-bindings/script/cocostudio",
+            "from": "../../../../cocos/scripting/lua-bindings/script/cocosstudio",
             "to": ""
         },
         {

tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj

@@ -112,7 +112,7 @@
 xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocosdenshion" "$(ProjectDir)..\..\" /e /Y
 xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\network" "$(ProjectDir)..\..\" /e /Y
 xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocosbuilder" "$(ProjectDir)..\..\" /e /Y
-xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocostudio" "$(ProjectDir)..\..\" /e /Y
+xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocosstudio" "$(ProjectDir)..\..\" /e /Y
 xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\extension" "$(ProjectDir)..\..\" /e /Y
 xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\ui" "$(ProjectDir)..\..\" /e /Y
 xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\*.lua" "$(ProjectDir)..\..\" /e /Y
@@ -167,7 +167,7 @@ xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(ProjectDir)..\..\res" /e /Y
 xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocosdenshion" "$(ProjectDir)..\..\" /e /Y
 xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\network" "$(ProjectDir)..\..\" /e /Y
 xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocosbuilder" "$(ProjectDir)..\..\" /e /Y
-xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocostudio" "$(ProjectDir)..\..\" /e /Y
+xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocosstudio" "$(ProjectDir)..\..\" /e /Y
 xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\extension" "$(ProjectDir)..\..\" /e /Y
 xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\ui" "$(ProjectDir)..\..\" /e /Y
 xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\*.lua" "$(ProjectDir)..\..\" /e /Y