From f75bf93706ff401d7dea613a1ce047d6501dd99c Mon Sep 17 00:00:00 2001 From: zhangbin Date: Tue, 21 Apr 2015 15:30:47 +0800 Subject: [PATCH] Update the js-tests project files. --- ...vc2012.sln => cocos2d-js-win32.vc2012.sln} | 40 --------- ...al.sln => cocos2d-js-win8.1-universal.sln} | 0 .../project.pbxproj | 2 +- .../xcschemes/js-moonwarriors Mac.xcscheme | 86 ------------------- .../xcschemes/js-moonwarriors iOS.xcscheme | 86 ------------------- .../xcschemes/js-tests Mac.xcscheme | 86 ------------------- .../xcschemes/js-tests iOS.xcscheme | 86 ------------------- tests/cpp-empty-test/.cocos-project.json | 8 -- tests/cpp-tests/.cocos-project.json | 8 -- tests/js-tests/.cocos-project.json | 16 +++- .../project/proj.win32/build-cfg.json | 4 +- 11 files changed, 16 insertions(+), 406 deletions(-) rename build/{cocos2d-jsb-win32.vc2012.sln => cocos2d-js-win32.vc2012.sln} (57%) rename build/{cocos2d-jsb-win8.1-universal.sln => cocos2d-js-win8.1-universal.sln} (100%) rename build/{cocos2d_jsb_samples.xcodeproj => cocos2d_js_tests.xcodeproj}/project.pbxproj (99%) delete mode 100644 build/cocos2d_jsb_samples.xcodeproj/xcshareddata/xcschemes/js-moonwarriors Mac.xcscheme delete mode 100644 build/cocos2d_jsb_samples.xcodeproj/xcshareddata/xcschemes/js-moonwarriors iOS.xcscheme delete mode 100644 build/cocos2d_jsb_samples.xcodeproj/xcshareddata/xcschemes/js-tests Mac.xcscheme delete mode 100644 build/cocos2d_jsb_samples.xcodeproj/xcshareddata/xcschemes/js-tests iOS.xcscheme diff --git a/build/cocos2d-jsb-win32.vc2012.sln b/build/cocos2d-js-win32.vc2012.sln similarity index 57% rename from build/cocos2d-jsb-win32.vc2012.sln rename to build/cocos2d-js-win32.vc2012.sln index 56d370ec9d..6a83fb188a 100644 --- a/build/cocos2d-jsb-win32.vc2012.sln +++ b/build/cocos2d-js-win32.vc2012.sln @@ -2,18 +2,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-tests", "..\tests\cpp-tests\proj.win32\cpp-tests.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-tests", "..\tests\lua-tests\project\proj.win32\lua-tests.win32.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-empty-test", "..\tests\cpp-empty-test\proj.win32\cpp-empty-test.vcxproj", "{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-empty-test", "..\tests\lua-empty-test\project\proj.win32\lua-empty-test.vcxproj", "{13E55395-94A2-4CD9-BFC2-1A051F80C17D}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocos2d", "..\cocos\scripting\lua-bindings\proj.win32\libluacocos2d.vcxproj", "{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{92D54E36-7916-48EF-A951-224DD3B25442}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" @@ -32,42 +22,12 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Debug|ARM.ActiveCfg = Debug|Win32 - {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Debug|Win32.ActiveCfg = Debug|Win32 - {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Debug|Win32.Build.0 = Debug|Win32 - {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Release|ARM.ActiveCfg = Release|Win32 - {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Release|Win32.ActiveCfg = Release|Win32 - {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Release|Win32.Build.0 = Release|Win32 - {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|ARM.ActiveCfg = Debug|Win32 - {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.ActiveCfg = Debug|Win32 - {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.Build.0 = Debug|Win32 - {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|ARM.ActiveCfg = Release|Win32 - {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.ActiveCfg = Release|Win32 - {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.Build.0 = Release|Win32 - {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Debug|ARM.ActiveCfg = Debug|Win32 - {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Debug|Win32.ActiveCfg = Debug|Win32 - {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Debug|Win32.Build.0 = Debug|Win32 - {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Release|ARM.ActiveCfg = Release|Win32 - {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Release|Win32.ActiveCfg = Release|Win32 - {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Release|Win32.Build.0 = Release|Win32 - {13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Debug|ARM.ActiveCfg = Debug|Win32 - {13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Debug|Win32.ActiveCfg = Debug|Win32 - {13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Debug|Win32.Build.0 = Debug|Win32 - {13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Release|ARM.ActiveCfg = Release|Win32 - {13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Release|Win32.ActiveCfg = Release|Win32 - {13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Release|Win32.Build.0 = Release|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|ARM.ActiveCfg = Debug|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|ARM.ActiveCfg = Release|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32 - {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Debug|ARM.ActiveCfg = Debug|Win32 - {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Debug|Win32.ActiveCfg = Debug|Win32 - {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Debug|Win32.Build.0 = Debug|Win32 - {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Release|ARM.ActiveCfg = Release|Win32 - {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Release|Win32.ActiveCfg = Release|Win32 - {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Release|Win32.Build.0 = Release|Win32 {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|ARM.ActiveCfg = Debug|Win32 {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32 {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32 diff --git a/build/cocos2d-jsb-win8.1-universal.sln b/build/cocos2d-js-win8.1-universal.sln similarity index 100% rename from build/cocos2d-jsb-win8.1-universal.sln rename to build/cocos2d-js-win8.1-universal.sln diff --git a/build/cocos2d_jsb_samples.xcodeproj/project.pbxproj b/build/cocos2d_js_tests.xcodeproj/project.pbxproj similarity index 99% rename from build/cocos2d_jsb_samples.xcodeproj/project.pbxproj rename to build/cocos2d_js_tests.xcodeproj/project.pbxproj index 9987837726..8f218bf00a 100644 --- a/build/cocos2d_jsb_samples.xcodeproj/project.pbxproj +++ b/build/cocos2d_js_tests.xcodeproj/project.pbxproj @@ -805,7 +805,7 @@ HEADER_SEARCH_PATHS = ""; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/physics $(SRCROOT)/../cocos/math/kazmath $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/physics $(SRCROOT)/../cocos/math/kazmath $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual"; }; name = Release; }; diff --git a/build/cocos2d_jsb_samples.xcodeproj/xcshareddata/xcschemes/js-moonwarriors Mac.xcscheme b/build/cocos2d_jsb_samples.xcodeproj/xcshareddata/xcschemes/js-moonwarriors Mac.xcscheme deleted file mode 100644 index b9ad4522dc..0000000000 --- a/build/cocos2d_jsb_samples.xcodeproj/xcshareddata/xcschemes/js-moonwarriors Mac.xcscheme +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_jsb_samples.xcodeproj/xcshareddata/xcschemes/js-moonwarriors iOS.xcscheme b/build/cocos2d_jsb_samples.xcodeproj/xcshareddata/xcschemes/js-moonwarriors iOS.xcscheme deleted file mode 100644 index b1508421ba..0000000000 --- a/build/cocos2d_jsb_samples.xcodeproj/xcshareddata/xcschemes/js-moonwarriors iOS.xcscheme +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_jsb_samples.xcodeproj/xcshareddata/xcschemes/js-tests Mac.xcscheme b/build/cocos2d_jsb_samples.xcodeproj/xcshareddata/xcschemes/js-tests Mac.xcscheme deleted file mode 100644 index c64c94632b..0000000000 --- a/build/cocos2d_jsb_samples.xcodeproj/xcshareddata/xcschemes/js-tests Mac.xcscheme +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_jsb_samples.xcodeproj/xcshareddata/xcschemes/js-tests iOS.xcscheme b/build/cocos2d_jsb_samples.xcodeproj/xcshareddata/xcschemes/js-tests iOS.xcscheme deleted file mode 100644 index 0fd861ed6e..0000000000 --- a/build/cocos2d_jsb_samples.xcodeproj/xcshareddata/xcschemes/js-tests iOS.xcscheme +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cpp-empty-test/.cocos-project.json b/tests/cpp-empty-test/.cocos-project.json index 0c934452c6..083f76ad90 100644 --- a/tests/cpp-empty-test/.cocos-project.json +++ b/tests/cpp-empty-test/.cocos-project.json @@ -26,14 +26,6 @@ "android_cfg": { "project_path": "proj.android" }, - "wp8_cfg" : { - "project_path": "../../build", - "sln_file": "cocos2d-wp8.sln", - "project_name": "cpp-empty-test", - "wp8_proj_path" : "proj-wp8-xaml", - "build_folder_path": "cpp-empty-test/Bin/x86", - "manifest_path": "cpp-empty-test/Properties/WMAppManifest.xml" - }, "wp8_1_cfg" : { "project_path": "../../build", "sln_file": "cocos2d-win8.1-universal.sln", diff --git a/tests/cpp-tests/.cocos-project.json b/tests/cpp-tests/.cocos-project.json index e7c71f562f..173028a970 100644 --- a/tests/cpp-tests/.cocos-project.json +++ b/tests/cpp-tests/.cocos-project.json @@ -26,14 +26,6 @@ "android_cfg": { "project_path": "proj.android" }, - "wp8_cfg" : { - "project_path": "../../build", - "sln_file": "cocos2d-wp8.sln", - "project_name": "cpp-tests", - "wp8_proj_path" : "proj.wp8-xaml", - "build_folder_path": "cpp-tests/Bin/x86", - "manifest_path": "cpp-tests/Properties/WMAppManifest.xml" - }, "wp8_1_cfg" : { "project_path": "../../build", "sln_file": "cocos2d-win8.1-universal.sln", diff --git a/tests/js-tests/.cocos-project.json b/tests/js-tests/.cocos-project.json index c6df844e7f..a9cc782214 100644 --- a/tests/js-tests/.cocos-project.json +++ b/tests/js-tests/.cocos-project.json @@ -3,18 +3,18 @@ "has_native": true, "win32_cfg": { "project_path": "../../build", - "sln_file": "cocos2d-win32.vc2013.sln", + "sln_file": "cocos2d-js-win32.vc2012.sln", "project_name": "js-tests", "build_cfg_path": "project/proj.win32" }, "ios_cfg": { "project_path": "../../build", - "project_file": "cocos2d_jsb_samples.xcodeproj", + "project_file": "cocos2d_js_tests.xcodeproj", "target_name": "js-tests iOS" }, "mac_cfg": { "project_path": "../../build", - "project_file": "cocos2d_jsb_samples.xcodeproj", + "project_file": "cocos2d_js_tests.xcodeproj", "target_name": "js-tests Mac" }, "android_cfg": { @@ -27,5 +27,15 @@ "build_dir": "../../build/linux-build", "build_result_dir": "js-tests" }, + "wp8_1_cfg" : { + "project_path": "../../build", + "sln_file": "cocos2d-js-win8.1-universal.sln", + "project_name": "js-tests.WindowsPhone" + }, + "metro_cfg" : { + "project_path": "../../build", + "sln_file": "cocos2d-js-win8.1-universal.sln", + "project_name": "js-tests.Windows" + }, "engine_dir": "../../" } diff --git a/tests/js-tests/project/proj.win32/build-cfg.json b/tests/js-tests/project/proj.win32/build-cfg.json index 62c269b52e..d1965344bc 100644 --- a/tests/js-tests/project/proj.win32/build-cfg.json +++ b/tests/js-tests/project/proj.win32/build-cfg.json @@ -5,7 +5,7 @@ "to": "src" }, { - "from": "../../res", + "from": "../../../cpp-tests/Resources", "to": "res" }, { @@ -17,7 +17,7 @@ "to": "" }, { - "from": "../../../../frameworks/js-bindings/bindings/script", + "from": "../../../../cocos/scripting/js-bindings/script", "to": "script" } ]