Merge commit 'bb32eee94438f92b61799781211ddd3f5afd7736' into scgamex-v3

STEVE: removed js/lua new files from merge

* commit 'bb32eee94438f92b61799781211ddd3f5afd7736':
  make code more clean and make comment more clear (cocos2d#19155)
  [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19152)
  prevent cmake in-source-build friendly (cocos2d#19151)
  UIButton fix setTitleLabel memleaks (cocos2d#19148)
  correct lua template cmake build (cocos2d#19149)
  modern cmake, cmake_cleanup_remove_unused_variables (cocos2d#19146)
  refine CCDevice-win32 BitmapDC (cocos2d#19144)
  modern cmake, improve cmake_compiler_flags (cocos2d#19145)
  add ui::LoadingBar support to Progress actions (cocos2d#18748)
  [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19142)
  modern cmake, compile definitions improvement (cocos2d#19139)
  [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19141)
  Add `GLView::setCursor` for desktop platforms (cocos2d#19129)
  add line spacing support for system font on iOS and Android (cocos2d#18993)
  Bugfix for aviod reading outside of the buffer. (cocos2d#19098)
  Fix bug: Not support sprite frame when ignoreContentAdaptWithSize is true (cocos2d#19107)
  iPhone X home indicator handling (cocos2d#19132)

# Conflicts:
#	build/cocos2d_tests.xcodeproj/project.pbxproj
#	cocos/base/CCConsole.cpp
#	cocos/scripting/js-bindings/CMakeLists.txt
#	cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp
#	cocos/scripting/js-bindings/proj.android/CMakeLists.txt
#	cocos/scripting/lua-bindings/CMakeLists.txt
#	cocos/scripting/lua-bindings/auto/api/GLView.lua
#	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
#	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
#	templates/js-template-default/CMakeLists.txt
#	templates/js-template-default/frameworks/runtime-src/proj.android/app/build.gradle
#	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.mm
#	templates/lua-template-default/CMakeLists.txt
#	templates/lua-template-default/frameworks/runtime-src/proj.android/app/build.gradle
#	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.mm
#	tests/js-tests/project/CMakeLists.txt
#	tests/js-tests/project/proj.android/app/build.gradle
#	tests/lua-empty-test/project/CMakeLists.txt
#	tests/lua-empty-test/project/proj.android/app/build.gradle
#	tests/lua-tests/project/CMakeLists.txt
#	tests/lua-tests/project/proj.android/app/build.gradle

Author: stevetranby

.gitignore

@@ -171,3 +171,14 @@ android-backup.zip
 cmake-build-*/
 .vs
 cmake_build*
+
+# tmp android build files
+cocos/platform/android/libcocos2dx/.project
+tests/lua-tests/project/proj.android/.project
+tests/lua-tests/project/proj.android/app/.project
+tests/*/proj.android/.settings/org.eclipse.buildship.core.prefs
+tests/*/project/proj.android/.settings/org.eclipse.buildship.core.prefs
+
+# tmp folder for temp usage
+tmp/
+temp/

CMakeLists.txt

@@ -34,15 +34,17 @@ project(Cocos2d-x)
 set(COCOS2DX_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 set(CMAKE_MODULE_PATH ${COCOS2DX_ROOT_PATH}/cmake/Modules/)
 
+# prevent in-source-build
+include(PreventInSourceBuilds)
+AssureOutOfSourceBuilds()
+
 # works before build libcocos2d
 include(CocosBuildSet)
 
 # default tests include lua, js test project, so we set those option on to build libs
 set(BUILD_LUA_LIBS ON)
 set(BUILD_JS_LIBS ON)
 
-if(NOT USE_COCOS_PREBUILT)
-    add_subdirectory(${COCOS2DX_ROOT_PATH}/cocos ${ENGINE_BINARY_PATH}/cocos/core)
-endif()
+add_subdirectory(${COCOS2DX_ROOT_PATH}/cocos ${ENGINE_BINARY_PATH}/cocos/core)
 add_subdirectory(${COCOS2DX_ROOT_PATH}/tests ${ENGINE_BINARY_PATH}/tests)
 

build/cocos2d_tests.xcodeproj/project.pbxproj

@@ -382,6 +382,9 @@
 		50921EB01B746D5F00C085CC /* DownloaderTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50921EAD1B746D5F00C085CC /* DownloaderTest.cpp */; };
 		52B47A341A534B2B004E4C60 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52B47A331A534B2B004E4C60 /* Security.framework */; };
 		53367D561DC22891005862DE /* WindowTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53367D541DC22891005862DE /* WindowTest.cpp */; };
+		53E6A008218FA06E002BE515 /* InputTest in Resources */ = {isa = PBXBuildFile; fileRef = 53E6A007218FA06D002BE515 /* InputTest */; };
+		53E6A009218FA06E002BE515 /* InputTest in Resources */ = {isa = PBXBuildFile; fileRef = 53E6A007218FA06D002BE515 /* InputTest */; };
+		53E6A00A218FA06E002BE515 /* InputTest in Resources */ = {isa = PBXBuildFile; fileRef = 53E6A007218FA06D002BE515 /* InputTest */; };
 		59620E8F1921E5CF002021B6 /* Bug-Child.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59620E8D1921E5CF002021B6 /* Bug-Child.cpp */; };
 		59620E901921E5CF002021B6 /* Bug-Child.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59620E8D1921E5CF002021B6 /* Bug-Child.cpp */; };
 		688669711AE8E8B500C2CFD9 /* SpritePolygonTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6886696F1AE8E8B500C2CFD9 /* SpritePolygonTest.cpp */; };
@@ -850,6 +853,7 @@
 		52B47A331A534B2B004E4C60 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
 		53367D541DC22891005862DE /* WindowTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WindowTest.cpp; sourceTree = "<group>"; };
 		53367D551DC22891005862DE /* WindowTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowTest.h; sourceTree = "<group>"; };
+		53E6A007218FA06D002BE515 /* InputTest */ = {isa = PBXFileReference; lastKnownFileType = folder; name = InputTest; path = "../tests/cpp-tests/Resources/InputTest"; sourceTree = "<group>"; };
 		59620E8D1921E5CF002021B6 /* Bug-Child.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "Bug-Child.cpp"; sourceTree = "<group>"; };
 		59620E8E1921E5CF002021B6 /* Bug-Child.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bug-Child.h"; sourceTree = "<group>"; };
 		6886696F1AE8E8B500C2CFD9 /* SpritePolygonTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpritePolygonTest.cpp; sourceTree = "<group>"; };
@@ -1747,6 +1751,7 @@
 				1AC35CBC18CED84500F37B72 /* hd */,
 				1AC35CBD18CED84500F37B72 /* Hello.png */,
 				1AC35CBE18CED84500F37B72 /* Images */,
+				53E6A007218FA06D002BE515 /* InputTest */,
 				15B3709219EE5D1000ABE682 /* Manifests */,
 				5046AB5A1AF2C4180060550B /* Materials */,
 				1AC35CC118CED84500F37B72 /* Misc */,
@@ -2399,6 +2404,7 @@
 				5046AB5B1AF2C4180060550B /* Materials in Resources */,
 				B63993311A49359F00B07923 /* Particle3D in Resources */,
 				1AC35CEC18CED84500F37B72 /* fonts in Resources */,
+				53E6A008218FA06E002BE515 /* InputTest in Resources */,
 				460629781CDB4DBA00B44058 /* ccs-res in Resources */,
 				1AC35CCA18CED84500F37B72 /* animations in Resources */,
 				1AC35CEA18CED84500F37B72 /* fileLookup.plist in Resources */,
@@ -2439,6 +2445,7 @@
 				1AC35CE918CED84500F37B72 /* extensions in Resources */,
 				3E2BDAD219BEA3E20055CDCD /* audio in Resources */,
 				5046AB5C1AF2C4180060550B /* Materials in Resources */,
+				53E6A009218FA06E002BE515 /* InputTest in Resources */,
 				C08689C318D370C90093E810 /* background.caf in Resources */,
 				15B3709419EE5D1000ABE682 /* Manifests in Resources */,
 				1AC35D0B18CED84500F37B72 /* zwoptex in Resources */,

cmake/Modules/CocosBuildSet.cmake

@@ -1,53 +1,35 @@
-# Disable in-source builds to prevent source tree corruption.
-if(" ${CMAKE_SOURCE_DIR}" STREQUAL " ${CMAKE_BINARY_DIR}")
-    message(FATAL_ERROR "
-        FATAL: In-source builds are not allowed.
-            You should create a separate directory for build files.
-        ")
-endif()
-
 # print cmake debug info
 set(CMAKE_DEBUG_TARGET_PROPERTIES
     # INCLUDE_DIRECTORIES
     # COMPILE_DEFINITIONS
+    # COMPILE_OPTIONS
+    # AUTOUIC_OPTIONS
     # POSITION_INDEPENDENT_CODE
-    # CONTAINER_SIZE_REQUIRED
-    # LIB_VERSION
 )
-# It ensures that when Find*.cmake files included from cmake's Modules dir
-# include another *.cmake file with relative path, that file will be included
-# also from cmake's Modules dir, to not clash with per-project files.
-cmake_policy(SET CMP0017 NEW)
-
-# Use new behaviour with cmake >= 3.1:
-# Only interpret if() arguments as variables or keywords when unquoted.
-cmake_policy(SET CMP0054 NEW)
-
-# print the info of CMAKE_TOOLCHAIN_FILE, if defined it
-if(DEFINED CMAKE_TOOLCHAIN_FILE)
-    message(STATUS "using toolchain file: ${CMAKE_TOOLCHAIN_FILE}")
-endif()
 
 # some useful variables for every one cocos project
-set(COCOS_EXTERNAL_DIR ${COCOS2DX_ROOT_PATH}/external)
 set(ENGINE_BINARY_PATH ${PROJECT_BINARY_DIR}/engine)
 
 message(STATUS "PROJECT_NAME:" ${PROJECT_NAME})
 message(STATUS "PROJECT_SOURCE_DIR:" ${PROJECT_SOURCE_DIR})
 message(STATUS "COCOS2DX_ROOT_PATH:" ${COCOS2DX_ROOT_PATH})
 message(STATUS "CMAKE_MODULE_PATH:" ${CMAKE_MODULE_PATH})
-message(STATUS "COCOS_EXTERNAL_DIR:" ${COCOS_EXTERNAL_DIR})
 # delete binary dir if you hope a full clean re-build
 message(STATUS "PROJECT_BINARY_DIR:" ${PROJECT_BINARY_DIR})
 message(STATUS "ENGINE_BINARY_PATH:" ${ENGINE_BINARY_PATH})
 
-# include helper functions for cmake build
-include(CocosBuildHelpers)
+# the default behavior of build module
+option(DEBUG_MODE "Debug or Release?" ON)
+option(BUILD_LUA_LIBS "Build lua libraries" OFF)
+option(BUILD_JS_LIBS "Build js libraries" OFF)
 
-# select building modules
-include(CocosSelectModule)
+# include helper functions
+include(CocosBuildHelpers)
 
 # set common compiler options
-include(CocosCompileOptions)
+# add target compile define function
+# add target compile options function
+include(CocosConfigDefine)
 
+# config libraries dependence
 include(CocosConfigDepend)