Sync with master

.travis.yml

@@ -56,6 +56,16 @@ matrix:
       env: BUILD_TARGET=linux_cocos_new_test
       language: cpp
       sudo: required
+    - os: osx
+      env: BUILD_TARGET=ios_cocos_new_lua_test
+      language: cpp
+      osx_image: xcode11
+      sudo: required
+    - os: osx
+      env: BUILD_TARGET=ios_cocos_new_cpp_test
+      language: cpp
+      osx_image: xcode11
+      sudo: required
 
 script:
 - tools/travis-scripts/run-script.sh

CHANGELOG

@@ -1,13 +1,21 @@
-cocos2d-x-4.0  ??
+cocos2d-x-4.0  Dec.3 2019
 
 [HIGHLIGHT]     Support metal
 [HIGHLIGHT]     Use CMake for all platforms
 
 [REFINE]        Update glfw to 3.3
+[REFINE]        Update minizip to 1.2
 
 [CHANGE]        remove deprecated functions
 [CHANGE]        remove h5 engine and JSB
 [CHANGE]        remove tiff
+[CHANGE]        remove `experimental` namespace
+
+[FIX]           system font can not work correctly on macOS 15
+[FIX]           TextField can not work if using system input to get Chinese characters with iOS13
+[FIX]           UIWebView uses WKWebView instead
+[FIX]           VideoPlayer uses AVPlayerController instead
+[FX]            lua crashes on 64it devcices 
 
 cocos2d-x-3.17 May.21 2018
 

CMakeLists.txt

@@ -30,6 +30,13 @@ cmake_minimum_required(VERSION 3.6)
 
 project(Cocos2d-x)
 
+# set default minimum deployment target
+if(XCODE)
+    if(NOT DEFINED CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET)
+        SET (CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET 8.0)
+    endif()
+endif()
+
 # cocos2dx root path
 set(COCOS2DX_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 set(CMAKE_MODULE_PATH ${COCOS2DX_ROOT_PATH}/cmake/Modules/)

README.md

@@ -6,12 +6,12 @@ cocos2d-x
 
 |Win32|Others|
 | ----|------|
-[![Build status](https://ci.appveyor.com/api/projects/status/nlgirox464j6ldg5/branch/v3?svg=true)](https://ci.appveyor.com/project/minggo/cocos2d-x/branch/v3)|[![Build Status](https://travis-ci.org/cocos2d/cocos2d-x.svg?branch=v3)](https://travis-ci.org/cocos2d/cocos2d-x)
+[![Build status](https://ci.appveyor.com/api/projects/status/nlgirox464j6ldg5/branch/v4?svg=true)](https://ci.appveyor.com/project/minggo/cocos2d-x/branch/v4)|[![Build Status](https://travis-ci.org/cocos2d/cocos2d-x.svg?branch=v4)](https://travis-ci.org/cocos2d/cocos2d-x)
 
 
 [cocos2d-x][1] is a multi-platform framework for building 2d games, interactive books, demos and other graphical applications.
-It is based on [cocos2d-iphone][2], but instead of using Objective-C, it uses C++.
-It works on iOS, Android, OS X, Windows and Linux.
+It is based on __cocos2d-iphone__, but instead of using Objective-C, it uses C++.
+It works on iOS, Android, macOS, Windows and Linux.
 
 **Cocos2d-x Framework Architecture**:
 
@@ -47,11 +47,11 @@ Download stable versions
 
 Documentations and samples
 -------------
-* [All Docs in a single place!](http://cocos2d-x.org/docs/)
-* [Online API Reference](http://cocos2d-x.org/docs/api-ref/index.html) _Note that Cocos2d-x and Cocos Creator have different API set_
-* [Programmers Guide](http://cocos2d-x.org/docs/programmers-guide/2/index.html)
-* [Latest Release Note](https://github.com/cocos2d/cocos2d-x/blob/v3/docs/RELEASE_NOTES.md)
-* [Changelog](https://github.com/cocos2d/cocos2d-x/blob/v3/CHANGELOG)
+* [All Docs in a single place!](http://docs.cocos2d-x.org/)
+* [Online API Reference](http://docs.cocos2d-x.org/api-ref/index.html) _Note that Cocos2d-x and Cocos Creator have different API set_
+* [Programmers Guide](https://docs.cocos2d-x.org/cocos2d-x/v4/en/basic_concepts/)
+* [Latest Release Note](https://github.com/cocos2d/cocos2d-x/blob/v4/docs/RELEASE_NOTES.md)
+* [Changelog](https://github.com/cocos2d/cocos2d-x/blob/v4/CHANGELOG)
 
 Main features
 -------------
@@ -156,12 +156,10 @@ For Android, the Android Studio project file lies in `PROJECT_DIR/proj.android`.
 Learning Resources
 --------------------------------
 
-* [Programmers Guide](http://cocos2d-x.org/docs/programmers-guide/2/index.html)
-* [Sonar Systems Videos](https://www.youtube.com/user/sonarsystemslimited/search?query=cocos2d-x)
+* [Programmers Guide](https://docs.cocos2d-x.org/cocos2d-x/v4/en/basic_concepts/)
 * [Android Fundamentals](https://developer.android.com/guide/components/fundamentals.html)
-* [Make School Tutorials](https://www.makeschool.com/tutorials/)
 * [Games From Scratch](http://www.gamefromscratch.com/page/Cocos2d-x-CPP-Game-Programming-Tutorial-Series.aspx)
-* [Cocos2d sample games](https://github.com/cocos2d/cocos2d-x-samples)
+* [Make School Tutorials](https://github.com/MakeSchool?utf8=✓&q=cocos2d&type=&language=)
 
 Spreading the word!
 --------------------------------
@@ -170,24 +168,17 @@ You can help us spread the word about cocos2d-x! We would surely appreciate it!
 * Talk about us on Facebook! Our [Facebook Page](https://www.facebook.com/cocos2dx/)
 * Tweet, Tweet! Our [Twitter](https://twitter.com/cocos2dx)
 * Read our [Blog](http://blog.cocos2d-x.org/) and promote it on your social media.
-* Become a [Regional Coordinator](http://discuss.cocos2d-x.org/t/we-need-regional-coordinators/24104)
-
-See what we are planning!
---------------------------------
-You can see exactly what we are planning to do with the Cocos family of products.
-
-* [Cocos2d-x roadmap](https://trello.com/b/Np6obnuE/cocos2d-x-roadmap)
 
 Where to get help
 --------------------------------
 
 * [English Forums](http://discuss.cocos2d-x.org)
 * [中文社区](http://forum.cocos.com/c/cocos2d-x)
 * [Bug Tracker](https://github.com/cocos2d/cocos2d-x/issues)
-* [API Reference](http://cocos2d-x.org/docs/api-ref/index.html).
-* [Latest Release Note](https://github.com/cocos2d/cocos2d-x/blob/v3/docs/RELEASE_NOTES.md)
-* [Changelog](https://github.com/cocos2d/cocos2d-x/blob/v3/CHANGELOG)
-* IRC. We are in [Freenode](https://webchat.freenode.net/) in the _#cocos2d_ channel
+* [API Reference](http://docs.cocos2d-x.org/api-ref/index.html).
+* [Latest Release Note](https://github.com/cocos2d/cocos2d-x/blob/v4/docs/RELEASE_NOTES.md)
+* [Changelog](https://github.com/cocos2d/cocos2d-x/blob/v4/CHANGELOG)
+* [Discord Channel](https://discord.gg/pVqab4K)
 * `cpp-tests` project. This project is our basis for testing. Use this project to
 learn how we implement the functionality of the engine. This project is located in
 __cocos2d-x_root/build.__
@@ -209,8 +200,6 @@ Contact us
    * Weibo: [http://t.sina.com.cn/cocos2dx][11]
 
 [1]: http://www.cocos2d-x.org "cocos2d-x"
-[2]: http://www.cocos2d-iphone.org "cocos2d for iPhone"
-[3]: http://www.cocos2d-x.org/projects/cocos2d-x/wiki/Download
 [4]: http://www.cocos2d-x.org/download/version#Cocos2d-x
 [5]: http://www.box2d.org "Box2D"
 [6]: http://www.chipmunk-physics.net "Chipmunk2D"

cmake/Modules/CocosBuildHelpers.cmake

@@ -2,37 +2,81 @@ include(CMakeParseArguments)
 
 # copy resource `FILES` and `FOLDERS` to TARGET_FILE_DIR/Resources
 function(cocos_copy_target_res cocos_target)
-    set(oneValueArgs COPY_TO)
-    set(multiValueArgs FILES FOLDERS)
+    set(oneValueArgs LINK_TO)
+    set(multiValueArgs FOLDERS)
     cmake_parse_arguments(opt "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-    # copy files
-    foreach(cc_file ${opt_FILES})
-        get_filename_component(file_name ${cc_file} NAME)
-        add_custom_command(TARGET ${cocos_target} POST_BUILD
-            #COMMAND ${CMAKE_COMMAND} -E echo "copy-file into Resources: ${file_name} ..."
-            COMMAND ${CMAKE_COMMAND} -E copy_if_different ${cc_file} "${opt_COPY_TO}/${file_name}"
+
+    if(NOT TARGET SYNC_RESOURCE-${cocos_target})
+        message(WARNING "SyncResource targe for ${cocos_target} is not defined")
+        return()
+    endif()
+
+    # linking folders
+    foreach(cc_folder ${opt_FOLDERS})
+        #get_filename_component(link_folder ${opt_LINK_TO} DIRECTORY)
+        get_filename_component(link_folder_abs ${opt_LINK_TO} ABSOLUTE)
+        add_custom_command(TARGET SYNC_RESOURCE-${cocos_target} POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E echo "    copying to ${link_folder_abs}"
+            COMMAND ${PYTHON_COMMAND} ARGS ${COCOS2DX_ROOT_PATH}/cmake/scripts/sync_folder.py
+                -s ${cc_folder} -d ${link_folder_abs}
         )
     endforeach()
-    # copy folders files
-    foreach(cc_folder ${opt_FOLDERS})
-        # file(GLOB_RECURSE folder_files "${cc_folder}/*")
-        # get_filename_component(folder_abs_path ${cc_folder} ABSOLUTE)
-        # foreach(res_file ${folder_files})
-        #     get_filename_component(res_file_abs_path ${res_file} ABSOLUTE)
-        #     file(RELATIVE_PATH res_file_relat_path ${folder_abs_path} ${res_file_abs_path})
-        #     add_custom_command(TARGET ${cocos_target} POST_BUILD
-        #         COMMAND ${CMAKE_COMMAND} -E echo "copy file into Resources: ${res_file_relat_path} ..."
-        #         COMMAND ${CMAKE_COMMAND} -E copy_if_different ${res_file} "${opt_COPY_TO}/${res_file_relat_path}"
-        #     )
-        # endforeach()
-        ### copy file by file is too slow on windows, the copy_directory improves a lot. 
-        add_custom_command(TARGET ${cocos_target} POST_BUILD
-                #COMMAND ${CMAKE_COMMAND} -E echo "copy-dir into Resources: ${opt_COPY_TO} ..."
-                COMMAND ${CMAKE_COMMAND} -E copy_directory ${cc_folder} "${opt_COPY_TO}"
+endfunction()
+
+## create a virtual target SYNC_RESOURCE-${cocos_target}
+## Update resource files in Resources/ folder everytime when `Run/Debug` target.
+function(cocos_def_copy_resource_target cocos_target)
+    add_custom_target(SYNC_RESOURCE-${cocos_target} ALL
+        COMMAND ${CMAKE_COMMAND} -E echo "Copying resources for ${cocos_target} ..."
+    )
+    add_dependencies(${cocos_target} SYNC_RESOURCE-${cocos_target})
+    set_target_properties(SYNC_RESOURCE-${cocos_target} PROPERTIES
+        FOLDER Utils
+    )
+endfunction()
+
+
+function(cocos_copy_lua_scripts cocos_target src_dir dst_dir)
+    set(luacompile_target COPY_LUA-${cocos_target})
+    if(NOT TARGET ${luacompile_target})
+        add_custom_target(${luacompile_target} ALL
+            COMMAND ${CMAKE_COMMAND} -E echo "Copying lua scripts ..."
+        )
+        add_dependencies(${cocos_target} ${luacompile_target})
+        set_target_properties(${luacompile_target} PROPERTIES
+            FOLDER Utils
+        )
+    endif()
+    if(MSVC)
+        add_custom_command(TARGET ${luacompile_target} POST_BUILD
+            COMMAND ${PYTHON_COMMAND} ARGS ${COCOS2DX_ROOT_PATH}/cmake/scripts/sync_folder.py
+                -s ${src_dir} -d ${dst_dir} -l ${LUAJIT32_COMMAND} -m $<CONFIG>
+        )
+    else()
+        if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+            add_custom_command(TARGET ${luacompile_target} POST_BUILD
+                COMMAND ${PYTHON_COMMAND} ARGS ${COCOS2DX_ROOT_PATH}/cmake/scripts/sync_folder.py
+                -s ${src_dir} -d ${dst_dir}
             )
-    endforeach()
+        else()
+            add_custom_command(TARGET ${luacompile_target} POST_BUILD
+                COMMAND ${PYTHON_COMMAND} ARGS ${COCOS2DX_ROOT_PATH}/cmake/scripts/sync_folder.py
+                    -s ${src_dir} -d ${dst_dir} -l ${LUAJIT32_COMMAND} -m ${CMAKE_BUILD_TYPE}
+                COMMAND ${PYTHON_COMMAND} ARGS ${COCOS2DX_ROOT_PATH}/cmake/scripts/sync_folder.py
+                    -s ${src_dir} -d ${dst_dir}/64bit -l ${LUAJIT64_COMMAND} -m ${CMAKE_BUILD_TYPE}
+            )
+        endif()
+    endif()
+
 endfunction()
 
+
+function(cocos_get_resource_path output cocos_target)
+    get_target_property(rt_output ${cocos_target} RUNTIME_OUTPUT_DIRECTORY)
+    set(${output} "${rt_output}/${CMAKE_CFG_INTDIR}/Resources" PARENT_SCOPE)
+endfunction()
+
+
 # mark `FILES` and files in `FOLDERS` as resource files, the destination is `RES_TO` folder
 # save all marked files in `res_out`
 function(cocos_mark_multi_resources res_out)
@@ -202,6 +246,15 @@ function(setup_cocos_app_config app_name)
     if(XCODE OR VS)
         cocos_mark_code_files(${app_name})
     endif()
+
+    if (XCODE)
+        cocos_config_app_xcode_property(${app_name})
+    endif()
+
+    if(LINUX OR WINDOWS)
+        cocos_def_copy_resource_target(${app_name})
+    endif()
+
 endfunction()
 
 # if cc_variable not set, then set it cc_value
@@ -211,52 +264,6 @@ macro(cocos_set_default_value cc_variable cc_value)
     endif()
 endmacro()
 
-# generate macOS app package infomations, need improve for example, the using of info.plist
-function(cocos_pak_xcode cocos_target)
-    set(oneValueArgs
-        INFO_PLIST
-        BUNDLE_NAME
-        BUNDLE_VERSION
-        COPYRIGHT
-        GUI_IDENTIFIER
-        ICON_FILE
-        INFO_STRING
-        LONG_VERSION_STRING
-        SHORT_VERSION_STRING
-        )
-    set(multiValueArgs)
-    cmake_parse_arguments(ARGS "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    string(TIMESTAMP ARGS_COPYRIGHT_YEAR "%Y")
-    # set default value
-    cocos_set_default_value(ARGS_INFO_PLIST "MacOSXBundleInfo.plist.in")
-    cocos_set_default_value(ARGS_BUNDLE_NAME "\${PRODUCT_NAME}")
-    cocos_set_default_value(ARGS_BUNDLE_VERSION "1")
-    cocos_set_default_value(ARGS_COPYRIGHT "Copyright © ${ARGS_COPYRIGHT_YEAR}. All rights reserved.")
-    cocos_set_default_value(ARGS_GUI_IDENTIFIER "org.cocos2dx.${APP_NAME}")
-    cocos_set_default_value(ARGS_ICON_FILE "Icon")
-    cocos_set_default_value(ARGS_INFO_STRING "cocos2d-x app")
-    cocos_set_default_value(ARGS_LONG_VERSION_STRING "1.0.0")
-    cocos_set_default_value(ARGS_SHORT_VERSION_STRING "1.0")
-    # set default values for Info.plist template
-    set_target_properties(${cocos_target}
-                          PROPERTIES
-                          MACOSX_BUNDLE_INFO_PLIST ${ARGS_INFO_PLIST}
-                          )
-    set(MACOSX_BUNDLE_BUNDLE_NAME ${ARGS_BUNDLE_NAME} PARENT_SCOPE)
-    set(MACOSX_BUNDLE_BUNDLE_VERSION ${ARGS_BUNDLE_VERSION} PARENT_SCOPE)
-    set(MACOSX_BUNDLE_COPYRIGHT ${ARGS_COPYRIGHT} PARENT_SCOPE)
-    set(MACOSX_BUNDLE_GUI_IDENTIFIER ${ARGS_GUI_IDENTIFIER} PARENT_SCOPE)
-    set(MACOSX_BUNDLE_ICON_FILE ${ARGS_ICON_FILE} PARENT_SCOPE)
-    set(MACOSX_BUNDLE_INFO_STRING ${ARGS_INFO_STRING} PARENT_SCOPE)
-    set(MACOSX_BUNDLE_LONG_VERSION_STRING ${ARGS_LONG_VERSION_STRING} PARENT_SCOPE)
-    set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${ARGS_SHORT_VERSION_STRING} PARENT_SCOPE)
-
-    message(STATUS "cocos package: ${cocos_target}, plist file: ${ARGS_INFO_PLIST}")
-
-   cocos_config_app_xcode_property(${cocos_target})
-endfunction()
-
 # set Xcode property for application, include all depend target
 macro(cocos_config_app_xcode_property cocos_app)
     set(depend_libs)
@@ -271,7 +278,6 @@ endmacro()
 # custom Xcode property for iOS target
 macro(cocos_config_target_xcode_property cocos_target)
     if(IOS)
-        set_xcode_property(${cocos_target} IPHONEOS_DEPLOYMENT_TARGET "8.0")
         set_xcode_property(${cocos_target} ENABLE_BITCODE "NO")
         set_xcode_property(${cocos_target} ONLY_ACTIVE_ARCH "YES")
     endif()
@@ -368,4 +374,3 @@ function(cocos_use_pkg target pkg)
     endif()
 
 endfunction()
-

cmake/Modules/CocosBuildSet.cmake

@@ -14,16 +14,21 @@ if(CMAKE_TOOLCHAIN_FILE)
     message(STATUS "using toolchain file:" ${CMAKE_TOOLCHAIN_FILE})
 endif()
 
+find_program(PYTHON_COMMAND NAMES python2 python)
+find_program(COCOS_COMMAND NAME cocos
+    PATHS ${COCOS2DX_ROOT_PATH}/tools/cocos2d-console/bin $ENV{COCOS_CONSOLE_ROOT})
+
 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})
 # 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})
-
+message(STATUS "PYTHON_PATH:"  ${PYTHON_COMMAND})
+message(STATUS "COCOS_COMMAND_PATH:"  ${COCOS_COMMAND})
+message(STATUS "HOST_SYSTEM:" ${CMAKE_HOST_SYSTEM_NAME})
 # the default behavior of build module
-option(DEBUG_MODE "Debug or Release?" ON)
 option(BUILD_LUA_LIBS "Build lua libraries" OFF)
 
 # include helper functions
@@ -36,3 +41,22 @@ include(CocosConfigDefine)
 
 # config libraries dependence
 include(CocosConfigDepend)
+
+if(COCOS_COMMAND)
+    get_filename_component(cocos2dx_console_dir ${COCOS_COMMAND} DIRECTORY)
+    set(COCOS2DX_LUAJIT_ROOT ${cocos2dx_console_dir}/../plugins/plugin_luacompile/bin)
+    message(STATUS "COCOS2DX_LUAJIT_ROOT:" ${COCOS2DX_LUAJIT_ROOT})
+    if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
+        find_program(LUAJIT32_COMMAND NAMES luajit-win32 PATHS ${COCOS2DX_LUAJIT_ROOT}/32bit NO_SYSTEM_ENVIRONMENT_PATH)
+        find_program(LUAJIT64_COMMAND NAMES luajit-win32 PATHS ${COCOS2DX_LUAJIT_ROOT}/64bit NO_SYSTEM_ENVIRONMENT_PATH)
+    elseif("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux")
+        find_program(LUAJIT32_COMMAND NAMES luajit-linux PATHS ${COCOS2DX_LUAJIT_ROOT}/32bit NO_SYSTEM_ENVIRONMENT_PATH)
+        find_program(LUAJIT64_COMMAND NAMES luajit-linux PATHS ${COCOS2DX_LUAJIT_ROOT}/64bit NO_SYSTEM_ENVIRONMENT_PATH)
+    endif()
+endif()
+
+
+if(WINDOWS OR LINUX)
+    message(STATUS "LUAJIT32_COMMAND:" ${LUAJIT32_COMMAND})
+    message(STATUS "LUAJIT64_COMMAND:" ${LUAJIT64_COMMAND})
+endif()