diff --git a/.travis.yml b/.travis.yml index 3aabe738ec..4c07791079 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: cpp env: matrix: - GEN_COCOS_FILES=YES - - GEN_JSB=YES - PLATFORM=linux DEBUG=1 CC_COMPILER=gcc CXX_COMPILER=g++ - PLATFORM=linux DEBUG=1 CC_COMPILER=clang CXX_COMPILER=clang++ # Since switching to C++11 only the ARM version of the nactive client diff --git a/CMakeLists.txt b/CMakeLists.txt index eadd3826fa..d6947ff305 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,8 +37,6 @@ if(WIN32 OR APPLE) option(USE_CHIPMUNK "Use chipmunk for physics library" ON) option(USE_BOX2D "Use box2d for physics library" OFF) option(DEBUG_MODE "Debug or release?" ON) -option(BUILD_LIBS_LUA "Build lua libraries" OFF) -option(BUILD_LIBS_JS "Build javascript libraries" OFF) option(BUILD_GUI "Build GUI library" ON) option(BUILD_NETWORK "Build network library" ON) option(BUILD_STORAGE "Build storage library" ON) @@ -48,16 +46,12 @@ option(BUILD_EDITOR_COCOSTUDIO "Build editor support for cocostudio" ON) option(BUILD_EDITOR_COCOSBUILDER "Build editor support for cocosbuilder" ON) option(BUILD_TestCpp "Only build TestCpp sample" ON) -option(BUILD_TestJs "Only build TestJavascript sample" OFF) -option(BUILD_TestLua "Only build TestLua sample" OFF) else()#temp option(USE_CHIPMUNK "Use chipmunk for physics library" ON) option(USE_BOX2D "Use box2d for physics library" OFF) option(DEBUG_MODE "Debug or release?" ON) -option(BUILD_LIBS_LUA "Build lua libraries" ON) -option(BUILD_LIBS_JS "Build javascript libraries" ON) option(BUILD_GUI "Build GUI library" ON) option(BUILD_NETWORK "Build network library" ON) option(BUILD_STORAGE "Build storage library" ON) @@ -67,8 +61,6 @@ option(BUILD_EDITOR_COCOSTUDIO "Build editor support for cocostudio" ON) option(BUILD_EDITOR_COCOSBUILDER "Build editor support for cocosbuilder" ON) option(BUILD_TestCpp "Only build TestCpp sample" ON) -option(BUILD_TestJs "Only build TestJavascript sample" ON) -option(BUILD_TestLua "Only build TestLua sample" ON) endif()#temp @@ -165,7 +157,6 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/external/glfw3/include/${PLATFORM_FOLDER} ${CMAKE_CURRENT_SOURCE_DIR}/external/freetype2/include/${PLATFORM_FOLDER} ${CMAKE_CURRENT_SOURCE_DIR}/external/websockets/include/${PLATFORM_FOLDER} - ${CMAKE_CURRENT_SOURCE_DIR}/external/spidermonkey/include/${PLATFORM_FOLDER} ) if(WIN32) @@ -215,7 +206,6 @@ else() ${CMAKE_CURRENT_SOURCE_DIR}/external/png/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/external/freetype2/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/external/websockets/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/external/spidermonkey/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/external/${PLATFORM_FOLDER}-specific/fmod/prebuilt/${ARCH_DIR} ) @@ -283,34 +273,10 @@ if(BUILD_EDITOR_COCOSTUDIO) add_subdirectory(cocos/editor-support/cocostudio) endif(BUILD_EDITOR_COCOSTUDIO) -## Scripting -if(BUILD_LIBS_LUA) -# lua -add_subdirectory(external/lua/lua) - -# tolua -add_subdirectory(external/lua/tolua) - -# luabinding -add_subdirectory(cocos/scripting/lua) -endif(BUILD_LIBS_LUA) - -if(BUILD_LIBS_JS) -# jsbinding -add_subdirectory(cocos/scripting/javascript) -endif(BUILD_LIBS_JS) - # build tests if(BUILD_TestCpp) -add_subdirectory(tests/test-cpp) +add_subdirectory(tests) endif(BUILD_TestCpp) -if(BUILD_TestJs) -add_subdirectory(tests/test-javascript) -endif(BUILD_TestJs) - -if(BUILD_TestLua) -add_subdirectory(tests/test-lua) -endif(BUILD_TestLua) diff --git a/build/android-build.py b/build/android-build.py index b3b035799a..a4e6d18313 100755 --- a/build/android-build.py +++ b/build/android-build.py @@ -8,8 +8,8 @@ import shutil from optparse import OptionParser CPP_SAMPLES = ['testcpp'] -LUA_SAMPLES = ['testlua'] -JSB_SAMPLES = ['testjavascript'] +LUA_SAMPLES = [] +JSB_SAMPLES = [] ALL_SAMPLES = CPP_SAMPLES + LUA_SAMPLES + JSB_SAMPLES def get_num_of_cpu(): @@ -204,7 +204,7 @@ def build_samples(target,ndk_build_param,android_platform,build_mode): app_android_root = '' for target in build_targets: if target == 'testcpp': - app_android_root = os.path.join(cocos_root, 'tests/test-cpp/proj.android') + app_android_root = os.path.join(cocos_root, 'tests/proj.android') elif target == 'testlua': app_android_root = os.path.join(cocos_root, 'tests/test-lua/proj.android') elif target == 'testjavascript': diff --git a/build/cocos2d-win32.vc2012.sln b/build/cocos2d-win32.vc2012.sln index 37798a321a..51552ce619 100644 --- a/build/cocos2d-win32.vc2012.sln +++ b/build/cocos2d-win32.vc2012.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +# Visual Studio Express 2012 for Windows Desktop Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAudio", "..\cocos\audio\proj.win32\CocosDenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\cocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" @@ -11,7 +11,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\external\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "..\extensions\proj.win32\libExtensions.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCpp", "..\tests\test-cpp\proj.win32\TestCpp.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCpp", "..\tests\proj.win32\TestCpp.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}" EndProject @@ -23,34 +23,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libNetwork", "..\cocos\netw EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libJSBinding", "..\cocos\scripting\javascript\bindings\proj.win32\libJSBinding.vcxproj", "{39379840-825A-45A0-B363-C09FFEF864BD}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestJavascript", "..\tests\test-javascript\proj.win32\TestJavascript.vcxproj", "{D0F06A44-A245-4D13-A498-0120C203B539}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libLocalStorage", "..\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj", "{632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\cocos\scripting\lua\bindings\liblua.vcxproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLua", "..\tests\test-lua\proj.win32\TestLua.win32.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libJSBindingForBuilder", "..\cocos\scripting\javascript\bindings\cocosbuilder\libJSBindingForBuilder.vcxproj", "{F9DA0FC1-651B-457B-962E-A4D61CEBF5FD}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libJSBindingForStudio", "..\cocos\scripting\javascript\bindings\cocostudio\libJSBindingForStudio.vcxproj", "{79D34511-E54E-410A-8BBA-EF175AD6C695}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libJSBindingForNetwork", "..\cocos\scripting\javascript\bindings\network\libJSBindingForNetwork.vcxproj", "{3BEC13F5-E227-4D80-BC77-1C857F83BCFC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libJSBindingForExtension", "..\cocos\scripting\javascript\bindings\extension\libJSBindingForExtension.vcxproj", "{625F7391-9A91-48A1-8CFC-79508C822637}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libJSBinding", "libJSBinding", "{10F98A57-B9A1-47DA-9FBA-12D328E72ED1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libJSBindingForChipmunk", "..\cocos\scripting\javascript\bindings\chipmunk\libJSBindingForChipmunk.vcxproj", "{21070E58-EEC6-4E16-8B4F-6D083DF55790}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libJSBindingForLocalStorage", "..\cocos\scripting\javascript\bindings\localstorage\libJSBindingForLocalStorage.vcxproj", "{68F5F371-BD7B-4C30-AE5B-0B08F22E0CDE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libJSBindingForGui", "..\cocos\scripting\javascript\bindings\gui\libJSBindingForGui.vcxproj", "{9A844C88-97E8-4E2D-B09A-E138C67D338B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libJSBindingForSpine", "..\cocos\scripting\javascript\bindings\spine\libJSBindingForSpine.vcxproj", "{E78CDC6B-F37D-48D2-AD91-1DB549497E32}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -65,10 +39,6 @@ Global {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|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|Win32.ActiveCfg = Release|Win32 - {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Release|Win32.Build.0 = Release|Win32 {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.ActiveCfg = Debug|Win32 {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.Build.0 = Debug|Win32 {929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.ActiveCfg = Release|Win32 @@ -105,101 +75,14 @@ Global {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32 {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32 {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32 - {6D37505F-A890-441D-BD3F-A61E2C0469CE}.Debug|Win32.ActiveCfg = Debug|Win32 - {6D37505F-A890-441D-BD3F-A61E2C0469CE}.Debug|Win32.Build.0 = Debug|Win32 - {6D37505F-A890-441D-BD3F-A61E2C0469CE}.Release|Win32.ActiveCfg = Release|Win32 - {6D37505F-A890-441D-BD3F-A61E2C0469CE}.Release|Win32.Build.0 = Release|Win32 - {39379840-825A-45A0-B363-C09FFEF864BD}.Debug|Win32.ActiveCfg = Debug|Win32 - {39379840-825A-45A0-B363-C09FFEF864BD}.Debug|Win32.Build.0 = Debug|Win32 - {39379840-825A-45A0-B363-C09FFEF864BD}.Release|Win32.ActiveCfg = Release|Win32 - {39379840-825A-45A0-B363-C09FFEF864BD}.Release|Win32.Build.0 = Release|Win32 - {D0F06A44-A245-4D13-A498-0120C203B539}.Debug|Win32.ActiveCfg = Debug|Win32 - {D0F06A44-A245-4D13-A498-0120C203B539}.Debug|Win32.Build.0 = Debug|Win32 - {D0F06A44-A245-4D13-A498-0120C203B539}.Release|Win32.ActiveCfg = Release|Win32 - {D0F06A44-A245-4D13-A498-0120C203B539}.Release|Win32.Build.0 = Release|Win32 {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Debug|Win32.ActiveCfg = Debug|Win32 {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Debug|Win32.Build.0 = Debug|Win32 {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Release|Win32.ActiveCfg = Release|Win32 {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Release|Win32.Build.0 = Release|Win32 - {68ED0B4E-2BCA-45D2-9648-CEABEBD3B9D7}.Debug|Win32.ActiveCfg = Debug|Win32 - {68ED0B4E-2BCA-45D2-9648-CEABEBD3B9D7}.Debug|Win32.Build.0 = Debug|Win32 - {68ED0B4E-2BCA-45D2-9648-CEABEBD3B9D7}.Release|Win32.ActiveCfg = Release|Win32 - {68ED0B4E-2BCA-45D2-9648-CEABEBD3B9D7}.Release|Win32.Build.0 = Release|Win32 - {9A17D9A4-4B11-4E32-94F6-895FF4909EC5}.Debug|Win32.ActiveCfg = Debug|Win32 - {9A17D9A4-4B11-4E32-94F6-895FF4909EC5}.Debug|Win32.Build.0 = Debug|Win32 - {9A17D9A4-4B11-4E32-94F6-895FF4909EC5}.Release|Win32.ActiveCfg = Release|Win32 - {9A17D9A4-4B11-4E32-94F6-895FF4909EC5}.Release|Win32.Build.0 = Release|Win32 - {1DB7C0FC-46FF-4A1B-82E0-C6244EEEC4C2}.Debug|Win32.ActiveCfg = Debug|Win32 - {1DB7C0FC-46FF-4A1B-82E0-C6244EEEC4C2}.Debug|Win32.Build.0 = Debug|Win32 - {1DB7C0FC-46FF-4A1B-82E0-C6244EEEC4C2}.Release|Win32.ActiveCfg = Release|Win32 - {1DB7C0FC-46FF-4A1B-82E0-C6244EEEC4C2}.Release|Win32.Build.0 = Release|Win32 - {BE092D9E-95AE-4F86-84CE-F4519E4F3F15}.Debug|Win32.ActiveCfg = Debug|Win32 - {BE092D9E-95AE-4F86-84CE-F4519E4F3F15}.Debug|Win32.Build.0 = Debug|Win32 - {BE092D9E-95AE-4F86-84CE-F4519E4F3F15}.Release|Win32.ActiveCfg = Release|Win32 - {BE092D9E-95AE-4F86-84CE-F4519E4F3F15}.Release|Win32.Build.0 = Release|Win32 - {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Debug|Win32.ActiveCfg = Debug|Win32 - {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Debug|Win32.Build.0 = Debug|Win32 - {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Release|Win32.ActiveCfg = Release|Win32 - {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Release|Win32.Build.0 = Release|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|Win32.ActiveCfg = Release|Win32 - {13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Release|Win32.Build.0 = Release|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|Win32.ActiveCfg = Release|Win32 - {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.Build.0 = Release|Win32 - {E0E282F4-8487-452C-BFAB-CB960EB4D22F}.Debug|Win32.ActiveCfg = Debug|Win32 - {E0E282F4-8487-452C-BFAB-CB960EB4D22F}.Debug|Win32.Build.0 = Debug|Win32 - {E0E282F4-8487-452C-BFAB-CB960EB4D22F}.Release|Win32.ActiveCfg = Release|Win32 - {E0E282F4-8487-452C-BFAB-CB960EB4D22F}.Release|Win32.Build.0 = Release|Win32 - {F9DA0FC1-651B-457B-962E-A4D61CEBF5FD}.Debug|Win32.ActiveCfg = Debug|Win32 - {F9DA0FC1-651B-457B-962E-A4D61CEBF5FD}.Debug|Win32.Build.0 = Debug|Win32 - {F9DA0FC1-651B-457B-962E-A4D61CEBF5FD}.Release|Win32.ActiveCfg = Release|Win32 - {F9DA0FC1-651B-457B-962E-A4D61CEBF5FD}.Release|Win32.Build.0 = Release|Win32 - {79D34511-E54E-410A-8BBA-EF175AD6C695}.Debug|Win32.ActiveCfg = Debug|Win32 - {79D34511-E54E-410A-8BBA-EF175AD6C695}.Debug|Win32.Build.0 = Debug|Win32 - {79D34511-E54E-410A-8BBA-EF175AD6C695}.Release|Win32.ActiveCfg = Release|Win32 - {79D34511-E54E-410A-8BBA-EF175AD6C695}.Release|Win32.Build.0 = Release|Win32 - {3BEC13F5-E227-4D80-BC77-1C857F83BCFC}.Debug|Win32.ActiveCfg = Debug|Win32 - {3BEC13F5-E227-4D80-BC77-1C857F83BCFC}.Debug|Win32.Build.0 = Debug|Win32 - {3BEC13F5-E227-4D80-BC77-1C857F83BCFC}.Release|Win32.ActiveCfg = Release|Win32 - {3BEC13F5-E227-4D80-BC77-1C857F83BCFC}.Release|Win32.Build.0 = Release|Win32 - {625F7391-9A91-48A1-8CFC-79508C822637}.Debug|Win32.ActiveCfg = Debug|Win32 - {625F7391-9A91-48A1-8CFC-79508C822637}.Debug|Win32.Build.0 = Debug|Win32 - {625F7391-9A91-48A1-8CFC-79508C822637}.Release|Win32.ActiveCfg = Release|Win32 - {625F7391-9A91-48A1-8CFC-79508C822637}.Release|Win32.Build.0 = Release|Win32 - {21070E58-EEC6-4E16-8B4F-6D083DF55790}.Debug|Win32.ActiveCfg = Debug|Win32 - {21070E58-EEC6-4E16-8B4F-6D083DF55790}.Debug|Win32.Build.0 = Debug|Win32 - {21070E58-EEC6-4E16-8B4F-6D083DF55790}.Release|Win32.ActiveCfg = Release|Win32 - {21070E58-EEC6-4E16-8B4F-6D083DF55790}.Release|Win32.Build.0 = Release|Win32 - {68F5F371-BD7B-4C30-AE5B-0B08F22E0CDE}.Debug|Win32.ActiveCfg = Debug|Win32 - {68F5F371-BD7B-4C30-AE5B-0B08F22E0CDE}.Debug|Win32.Build.0 = Debug|Win32 - {68F5F371-BD7B-4C30-AE5B-0B08F22E0CDE}.Release|Win32.ActiveCfg = Release|Win32 - {68F5F371-BD7B-4C30-AE5B-0B08F22E0CDE}.Release|Win32.Build.0 = Release|Win32 - {9A844C88-97E8-4E2D-B09A-E138C67D338B}.Debug|Win32.ActiveCfg = Debug|Win32 - {9A844C88-97E8-4E2D-B09A-E138C67D338B}.Debug|Win32.Build.0 = Debug|Win32 - {9A844C88-97E8-4E2D-B09A-E138C67D338B}.Release|Win32.ActiveCfg = Release|Win32 - {9A844C88-97E8-4E2D-B09A-E138C67D338B}.Release|Win32.Build.0 = Release|Win32 - {E78CDC6B-F37D-48D2-AD91-1DB549497E32}.Debug|Win32.ActiveCfg = Debug|Win32 - {E78CDC6B-F37D-48D2-AD91-1DB549497E32}.Debug|Win32.Build.0 = Debug|Win32 - {E78CDC6B-F37D-48D2-AD91-1DB549497E32}.Release|Win32.ActiveCfg = Release|Win32 - {E78CDC6B-F37D-48D2-AD91-1DB549497E32}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {F9DA0FC1-651B-457B-962E-A4D61CEBF5FD} = {10F98A57-B9A1-47DA-9FBA-12D328E72ED1} - {79D34511-E54E-410A-8BBA-EF175AD6C695} = {10F98A57-B9A1-47DA-9FBA-12D328E72ED1} - {3BEC13F5-E227-4D80-BC77-1C857F83BCFC} = {10F98A57-B9A1-47DA-9FBA-12D328E72ED1} - {625F7391-9A91-48A1-8CFC-79508C822637} = {10F98A57-B9A1-47DA-9FBA-12D328E72ED1} - {39379840-825A-45A0-B363-C09FFEF864BD} = {10F98A57-B9A1-47DA-9FBA-12D328E72ED1} - {21070E58-EEC6-4E16-8B4F-6D083DF55790} = {10F98A57-B9A1-47DA-9FBA-12D328E72ED1} - {68F5F371-BD7B-4C30-AE5B-0B08F22E0CDE} = {10F98A57-B9A1-47DA-9FBA-12D328E72ED1} - {9A844C88-97E8-4E2D-B09A-E138C67D338B} = {10F98A57-B9A1-47DA-9FBA-12D328E72ED1} - {E78CDC6B-F37D-48D2-AD91-1DB549497E32} = {10F98A57-B9A1-47DA-9FBA-12D328E72ED1} - EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id index d2f0f87889..fd3bd1e43b 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -96ebe58c64783ed2e976ff504db835a397475f00 \ No newline at end of file +3e5af93e674100c3fcff441051ba5d9d6f3be7bb \ No newline at end of file diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/jsbindings Mac.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/jsbindings Mac.xcscheme deleted file mode 100644 index b2a829d44e..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/jsbindings Mac.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/jsbindings iOS.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/jsbindings iOS.xcscheme deleted file mode 100644 index 942b0b5e8e..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/jsbindings iOS.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/luabindings Mac.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/luabindings Mac.xcscheme deleted file mode 100644 index d090757755..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/luabindings Mac.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/luabindings iOS.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/luabindings iOS.xcscheme deleted file mode 100644 index d89dac4c13..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/luabindings iOS.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_tests.xcodeproj/project.pbxproj.REMOVED.git-id index 70e27f059c..b1cd94ee9c 100644 --- a/build/cocos2d_tests.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/build/cocos2d_tests.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -2b6e0f0359921c6f1328c545b48ff94e6575e332 \ No newline at end of file +79eadc9e9af6436978a19d203a68362479979c9f \ No newline at end of file diff --git a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/Test JavaScript Mac.xcscheme b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/Test JavaScript Mac.xcscheme deleted file mode 100644 index 28f898622e..0000000000 --- a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/Test JavaScript Mac.xcscheme +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/Test JavaScript iOS.xcscheme b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/Test JavaScript iOS.xcscheme deleted file mode 100644 index 133414e7f6..0000000000 --- a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/Test JavaScript iOS.xcscheme +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/Test lua Mac.xcscheme b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/Test lua Mac.xcscheme deleted file mode 100644 index be135ee298..0000000000 --- a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/Test lua Mac.xcscheme +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/Test lua iOS.xcscheme b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/Test lua iOS.xcscheme deleted file mode 100644 index 5491ffde08..0000000000 --- a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/Test lua iOS.xcscheme +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/proj.android/jni/Android.mk b/tests/proj.android/jni/Android.mk index 2b8eac6532..099186e88c 100644 --- a/tests/proj.android/jni/Android.mk +++ b/tests/proj.android/jni/Android.mk @@ -14,4 +14,4 @@ LOCAL_WHOLE_STATIC_LIBRARIES := cocos_testcpp_common include $(BUILD_SHARED_LIBRARY) -$(call import-module,tests/test-cpp) +$(call import-module,tests) diff --git a/tests/proj.win32/TestCpp.vcxproj b/tests/proj.win32/TestCpp.vcxproj index 835c7c2385..6ce929538e 100644 --- a/tests/proj.win32/TestCpp.vcxproj +++ b/tests/proj.win32/TestCpp.vcxproj @@ -36,13 +36,13 @@ - - + + - - + + @@ -94,7 +94,7 @@ if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" @@ -130,7 +130,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(Ou if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" @@ -487,41 +487,41 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(Ou - + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} false - + {f8edd7fa-9a51-4e80-baeb-860825d2eac6} false - + {811c0dab-7b96-4bd3-a154-b7572b58e4ab} - + {b57cf53f-2e49-4031-9822-047cc0e6bde2} - + {b7c2a162-dec9-4418-972e-240ab3cbfcae} - + {7e06e92c-537a-442b-9e4a-4761c84f8a1a} - + {df2638c0-8128-4847-867c-6eafe3dee7b5} - + {632a8f38-d0f0-4d22-86b3-d69f5e6bf63a} - + {21b2c324-891f-48ea-ad1a-5ae13de12e28} false - + {929480e7-23c0-4df6-8456-096d71547116} false - + {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} false diff --git a/tools/travis-scripts/generate-jsbindings.sh b/tools/travis-scripts/generate-jsbindings.sh deleted file mode 100755 index 5e36d6c5fb..0000000000 --- a/tools/travis-scripts/generate-jsbindings.sh +++ /dev/null @@ -1,175 +0,0 @@ -#!/bin/bash - -# Generate JS and Lua bindings for Cocos2D-X -# ... using Android NDK system headers -# ... and automatically update submodule references -# ... and push these changes to remote repos - -# Dependencies -# -# For bindings generator: -# (see ../../../tojs/genbindings.py and ../../../tolua/genbindings.py -# ... for the defaults used if the environment is not customized) -# -# * $PYTHON_BIN -# * $CLANG_ROOT -# * $NDK_ROOT -# - -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -COCOS2DX_ROOT="$DIR"/../.. -TOJS_ROOT=$COCOS2DX_ROOT/tools/tojs -TOLUA_ROOT=$COCOS2DX_ROOT/tools/tolua -GENERATED_WORKTREE="$COCOS2DX_ROOT"/cocos/scripting/auto-generated -COMMITTAG="[AUTO]" - -# Exit on error -set -e - -if [ "$PLATFORM"x = "ios"x ]; then - mkdir -p $HOME/bin - pushd $HOME/bin - curl -O http://pyyaml.org/download/pyyaml/PyYAML-3.10.zip - unzip PyYAML-3.10.zip 2> /dev/null > /dev/null - cd PyYAML-3.10 - sudo python setup.py install 2> /dev/null > /dev/null - cd .. - curl -O https://pypi.python.org/packages/source/C/Cheetah/Cheetah-2.4.4.tar.gz - tar xzf Cheetah-2.4.4.tar.gz - cd Cheetah-2.4.4 - sudo python setup.py install 2> /dev/null > /dev/null - popd -elif [ $(command -v apt-get) ]; then - sudo apt-get --force-yes --yes install python-yaml python-cheetah -fi - -generate_bindings_glue_codes() -{ - echo "Create auto-generated jsbinding glue codes." - pushd "$TOJS_ROOT" - ./genbindings.py - popd - - echo "Create auto-generated luabinding glue codes." - pushd "$TOLUA_ROOT" - ./genbindings.py - popd -} - -if [ "$GEN_JSB"x != "YES"x ]; then - generate_bindings_glue_codes - exit 0 -fi - -pushd "$COCOS2DX_ROOT" -#Set git user for cocos2d-x repo -git config user.email ${GH_EMAIL} -git config user.name ${GH_USER} -popd - -# Update submodule of auto-gen Binding repo. -pushd "$GENERATED_WORKTREE" - -git checkout -B master -echo "Set git user for the submodule of ${GENERATED_WORKTREE}" -git config user.email ${GH_EMAIL} -git config user.name ${GH_USER} -#Set remotes -git remote add upstream https://${GH_USER}:${GH_PASSWORD}@github.com/cocos2d-x/bindings-auto-generated.git 2> /dev/null > /dev/null - -echo "Delete all directories and files except '.git' and 'README.md'." -ls -a | grep -E -v ^\[.\]\{1,2\}$ | grep -E -v ^\.git$ | grep -E -v ^README\.md$ | xargs -I{} rm -rf {} -echo "Show files in ${GENERATED_WORKTREE} folder." -ls -a -popd - - - -# 1. Generate JS bindings -generate_bindings_glue_codes - -echo -echo Bindings generated successfully -echo - - -if [ -z "${COMMITTAG+aaa}" ]; then -# ... if COMMITTAG is not set, use this machine's hostname - COMMITTAG=`hostname -s` -fi - -echo -echo Using "'$COMMITTAG'" in the commit messages -echo - -ELAPSEDSECS=`date +%s` -echo Using "$ELAPSEDSECS" in the branch names for pseudo-uniqueness - -GENERATED_BRANCH=autogeneratedbindings_"$ELAPSEDSECS" - - -# 2. In Bindings repo, Check if there are any files that are different from the index - -pushd "$GENERATED_WORKTREE" - -# Run status to record the output in the log -git status - -echo -echo Comparing with HEAD ... -echo - -# Don't exit on non-zero return value -set +e -git diff --stat --exit-code - -DIFF_RETVAL=$? -if [ $DIFF_RETVAL -eq 0 ] -then - echo - echo "No differences in generated files" - echo "Exiting with success." - echo - exit 0 -else - echo - echo "Generated files differ from HEAD. Continuing." - echo -fi - -# Exit on error -set -e - -# 3. In Bindings repo, Check out a branch named "autogeneratedbindings" and commit the auto generated bindings to it -git checkout -b "$GENERATED_BRANCH" -git add --verbose . -git add --verbose -u . -git commit --verbose -m "$COMMITTAG : autogenerated bindings" - -# 4. In Bindings repo, Push the commit with generated bindings to "master" of the auto generated bindings repository -git push -fq upstream "$GENERATED_BRANCH":${TRAVIS_BRANCH}_${ELAPSEDSECS} 2> /dev/null - -popd - - -COCOS_BRANCH=updategeneratedsubmodule_"$ELAPSEDSECS" - -pushd "${DIR}" - -# 5. In Cocos2D-X repo, Checkout a branch named "updategeneratedsubmodule" Update the submodule reference to point to the commit with generated bindings -cd "${COCOS2DX_ROOT}" -git add ${GENERATED_WORKTREE} -git checkout -b "$COCOS_BRANCH" -git commit -m "$COMMITTAG : updating submodule reference to latest autogenerated bindings" -#Set remotes -git remote add upstream https://${GH_USER}:${GH_PASSWORD}@github.com/${GH_USER}/cocos2d-x.git 2> /dev/null > /dev/null -# 6. In Cocos2D-X repo, Push the commit with updated submodule to "master" of the cocos2d-x repository -echo "Pushing to Robot's repo ..." -git push -fq upstream "$COCOS_BRANCH" 2> /dev/null - - -# 7. -echo "Sending Pull Request to base repo ..." -curl --user "${GH_USER}:${GH_PASSWORD}" --request POST --data "{ \"title\": \"$COMMITTAG : updating submodule reference to latest autogenerated bindings\", \"body\": \"\", \"head\": \"${GH_USER}:${COCOS_BRANCH}\", \"base\": \"${TRAVIS_BRANCH}\"}" https://api.github.com/repos/cocos2d/cocos2d-x/pulls 2> /dev/null > /dev/null - -popd diff --git a/tools/travis-scripts/run-script.sh b/tools/travis-scripts/run-script.sh index 378d72affb..83d7fd05f7 100755 --- a/tools/travis-scripts/run-script.sh +++ b/tools/travis-scripts/run-script.sh @@ -33,61 +33,29 @@ if [ "$GEN_COCOS_FILES"x = "YES"x ]; then cd $COCOS2DX_ROOT/tools/travis-scripts ./generate-cocosfiles.sh -elif [ "$GEN_JSB"x = "YES"x ]; then - # Re-generation of the javascript bindings can perform push of the new - # version back to github. We don't do this for pull requests, or if - # GH_USER/GH_EMAIL/GH_PASSWORD environment variables are not set correctly - # by the encoded variables in the .travis.yml file. (e.g. if cloned repo's - # want to use travis). - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then - exit 0 - fi - if [ -z "${GH_EMAIL}" ]; then - echo "GH_EMAIL not set" - exit 0 - fi - if [ -z "${GH_USER}" ]; then - echo "GH_USER not set" - exit 0 - fi - if [ -z "${GH_PASSWORD}" ]; then - echo "GH_USER not set" - exit 0 - fi - - cd $COCOS2DX_ROOT/tools/travis-scripts - ./generate-jsbindings.sh elif [ "$PLATFORM"x = "android"x ]; then export NDK_ROOT=$HOME/bin/android-ndk # Generate binding glue codes echo "Generating bindings glue codes ..." cd $COCOS2DX_ROOT/tools/travis-scripts - ./generate-jsbindings.sh ./generate-cocosfiles.sh cd $COCOS2DX_ROOT # Create a directory for temporary objects - mkdir android_build_objs + # mkdir android_build_objs - PROJECTS=("test-cpp" "test-javascript" "test-lua") - for i in ${PROJECTS[*]}; do - ln -s $COCOS2DX_ROOT/android_build_objs $COCOS2DX_ROOT/tests/$i/proj.android/obj - done + # PROJECTS=("test-cpp" "test-javascript" "test-lua") + # for i in ${PROJECTS[*]}; do + # ln -s $COCOS2DX_ROOT/android_build_objs $COCOS2DX_ROOT/tests/$i/proj.android/obj + # done # Build all samples echo "Building all samples ..." cd $COCOS2DX_ROOT/build ./android-build.py -n "NDK_BUG=0 -j10" all - # Build template - # echo "Building template ..." - # cd $COCOS2DX_ROOT/template - # build_android multi-platform-cpp - # build_android multi-platform-js - # build_android multi-platform-lua - elif [ "$PLATFORM"x = "nacl"x ]; then export NACL_SDK_ROOT=$HOME/bin/nacl_sdk/pepper_canary export PATH=$PATH:$NACL_SDK_ROOT/toolchain/linux_x86_newlib/bin @@ -98,7 +66,6 @@ elif [ "$PLATFORM"x = "linux"x ]; then # Generate binding glue codes echo "Generating bindings glue codes ..." cd $COCOS2DX_ROOT/tools/travis-scripts - ./generate-jsbindings.sh ./generate-cocosfiles.sh echo "Building cocos2d-x" @@ -107,35 +74,11 @@ elif [ "$PLATFORM"x = "linux"x ]; then cd linux-build cmake ../.. make -j10 - # build template - echo "Building template projects for linux ..." - cd $COCOS2DX_ROOT/tools/project-creator - ./create_project.py -n MyGameCpp -k com.MyCompany.AwesomeGameCpp -l cpp -p $HOME - ./create_project.py -n MyGameLua -k com.MyCompany.AwesomeGameLua -l lua -p $HOME - ./create_project.py -n MyGameJs -k com.MyCompany.AwesomeGameJs -l javascript -p $HOME - cd $HOME/MyGameCpp - mkdir build - cd build - cmake .. - make -j10 - - cd $HOME/MyGameLua - mkdir build - cd build - cmake .. - make -j10 - - cd $HOME/MyGameJs - mkdir build - cd build - cmake .. - make -j10 elif [ "$PLATFORM"x = "emscripten"x ]; then # Generate binding glue codes echo "Generating bindings glue codes ..." cd $COCOS2DX_ROOT/tools/travis-scripts - ./generate-jsbindings.sh ./generate-cocosfiles.sh cd $COCOS2DX_ROOT/build @@ -145,7 +88,6 @@ elif [ "$PLATFORM"x = "emscripten"x ]; then EMCC_DEBUG=1 make PLATFORM=emscripten -j 8 elif [ "$PLATFORM"x = "ios"x ]; then cd $COCOS2DX_ROOT/tools/travis-scripts - ./generate-jsbindings.sh ./generate-cocosfiles.sh cd $COCOS2DX_ROOT diff --git a/tools/travis-scripts/travis_mac.yml b/tools/travis-scripts/travis_mac.yml deleted file mode 100644 index f6092491bd..0000000000 --- a/tools/travis-scripts/travis_mac.yml +++ /dev/null @@ -1,11 +0,0 @@ -language: objective-c -script: - - export PYTHON_BIN=/usr/bin/python - - ./tools/travis-scripts/run-script.sh -before_install: - - ./tools/travis-scripts/before-install.sh -env: - - PLATFORM=ios -branches: - only: - - mac-travis