Merge branch 'minggo/metal-support' into feature/updateProgramState

* minggo/metal-support:
  sync v3 build related codes into metal-support (cocos2d#173)
  sync v3 cmake improvements into metal-support (cocos2d#172)

Author: Mee-gu

.travis.yml

@@ -2,6 +2,7 @@ matrix:
   include:
     # linux
     - os: linux
+      dist: xenial
       env: 
         - BUILD_TARGET=linux 
         - GEN_BINDING_AND_COCOSFILE=true
@@ -61,9 +62,10 @@ matrix:
       sudo: required
     - os: linux
       env: BUILD_TARGET=android_cocos_new_test
-      language: cpp
+      language: android
       sudo: required
     - os: linux
+      dist: xenial
       env: BUILD_TARGET=linux_cocos_new_test
       language: cpp
       sudo: required

CMakeLists.txt

@@ -34,15 +34,34 @@ 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)
+# for metal-support alpha release, we only test cpp
+set(BUILD_LUA_LIBS OFF) 
+set(BUILD_JS_LIBS OFF)
+
+add_subdirectory(${COCOS2DX_ROOT_PATH}/cocos ${ENGINE_BINARY_PATH}/cocos/core)
+
+# prevent tests project to build "cocos2d-x/cocos" again
+set(BUILD_ENGINE_DONE ON)
+
+# add cpp tests default
+add_subdirectory(${COCOS2DX_ROOT_PATH}/tests/cpp-empty-test ${ENGINE_BINARY_PATH}/tests/cpp-empty-test)
+add_subdirectory(${COCOS2DX_ROOT_PATH}/tests/cpp-tests ${ENGINE_BINARY_PATH}/tests/cpp-tests)
+
+if(BUILD_LUA_LIBS)
+  add_subdirectory(${COCOS2DX_ROOT_PATH}/tests/lua-empty-test/project ${ENGINE_BINARY_PATH}/tests/lua-empty-test)
+  add_subdirectory(${COCOS2DX_ROOT_PATH}/tests/lua-tests/project ${ENGINE_BINARY_PATH}/tests/lua-test)
+endif(BUILD_LUA_LIBS)
 
-if(NOT USE_COCOS_PREBUILT)
-    add_subdirectory(${COCOS2DX_ROOT_PATH}/cocos ${ENGINE_BINARY_PATH}/cocos/core)
+if(BUILD_JS_LIBS)
+  add_subdirectory(${COCOS2DX_ROOT_PATH}/tests/js-tests/project ${ENGINE_BINARY_PATH}/tests/js-tests)
 endif()
-add_subdirectory(${COCOS2DX_ROOT_PATH}/tests ${ENGINE_BINARY_PATH}/tests)
 
+# add cpp-template-default into project(Cocos2d-x) for tmp test
+add_subdirectory(${COCOS2DX_ROOT_PATH}/templates/cpp-template-default ${ENGINE_BINARY_PATH}/tests/HelloCpp)

build/install-deps-linux.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
 
-# Change directory to the location of this script
 echo "This Shell Script will install dependencies for cocos2d-x" 
-echo "if you execute this shell more than once it will get errors when building libGLFW.so"
 echo -n "Are you continue? (y/n) "
 read answer
 if echo "$answer" | grep -iq "^y" ;then
@@ -11,24 +9,13 @@ else
     exit
 fi
 
-cd $(dirname ${BASH_SOURCE[0]})
-
-if [ ! $(command -v apt-get) ]; then
-  echo "Not a .deb package system. Please install dependencies manually"
-  exit 0
-fi
-
-#install g++-4.9
-sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y > /dev/null
 sudo apt-get update
 
 DEPENDS='libx11-dev'
 DEPENDS+=' libxmu-dev'
 DEPENDS+=' libglu1-mesa-dev'
 DEPENDS+=' libgl2ps-dev'
 DEPENDS+=' libxi-dev'
-DEPENDS+=' gcc-4.9'
-DEPENDS+=' g++-4.9'
 DEPENDS+=' libzip-dev'
 DEPENDS+=' libpng12-dev'
 DEPENDS+=' libcurl4-gnutls-dev'
@@ -39,38 +26,4 @@ DEPENDS+=' libssl-dev'
 DEPENDS+=' libgtk-3-dev'
 DEPENDS+=' binutils'
 
-MISSING=
-echo "Checking for missing packages ..."
-for i in $DEPENDS; do
-    if ! dpkg-query -W --showformat='${Status}\n' $i | grep "install ok installed" > /dev/null; then
-        MISSING+="$i "
-    fi
-done
-
-if [ -n "$MISSING" ]; then
-    TXTCOLOR_DEFAULT="\033[0;m"
-    TXTCOLOR_GREEN="\033[0;32m"
-    echo -e $TXTCOLOR_GREEN"Missing packages: $MISSING.\nYou may be asked for your password for package installation."$TXTCOLOR_DEFAULT
-    CUR_APT_VERSION="$(apt --version | grep -o '[0-9].[0-9]')"
-    REQ_APT_VERSION="1.1"
-    if [ 1 -ge "$(echo "${CUR_APT_VERSION} >= ${REQ_APT_VERSION}" | bc)" ]
-    then
-        sudo apt-get install --allow-change-held-packages $MISSING -y > /dev/null
-    else
-        sudo apt-get install --force-yes --yes $MISSING > /dev/null
-    fi 
-fi
-
-
-
-sudo update-alternatives --remove-all gcc
-sudo update-alternatives --remove-all g++
-
-sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 60
-sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.9 60
-
-echo "Cocos uses GCC Version: `gcc --version`"
-echo "Cocos uses G++ Version: `g++ --version`"
-echo "Cocos uses ld Version: `ld --version`"
-echo "Cocos uses /usr/bin/ld Version: `/usr/bin/ld --version`"
-
+sudo apt-get install --force-yes --yes $DEPENDS > /dev/null

cmake/Modules/CocosBuildHelpers.cmake

@@ -45,25 +45,18 @@ function(cocos_mark_multi_resources res_out)
     set(${res_out} ${tmp_file_list} PARENT_SCOPE)
 endfunction()
 
-# get `cocos_target` depend all dlls, save the result in `all_depend_dlls_out`
-function(get_target_depends_ext_dlls cocos_target all_depend_dlls_out)
-    set(all_depend_ext_dlls)
+# get all linked libraries including transitive ones, recursive
+function(search_depend_libs_recursive cocos_target all_depends_out)
+    set(all_depends_inner)
     set(targets_prepare_search ${cocos_target})
-    # targets_prepare_search, target need find ext libs
-    set(have_searched_targets)
-    set(need_search_targets)
     while(true)
         foreach(tmp_target ${targets_prepare_search})
             get_target_property(tmp_depend_libs ${tmp_target} LINK_LIBRARIES)
             list(REMOVE_ITEM targets_prepare_search ${tmp_target})
-            # target itself use_cocos_pkg
             list(APPEND tmp_depend_libs ${tmp_target})
             foreach(depend_lib ${tmp_depend_libs})
                 if(TARGET ${depend_lib})
-                    get_target_property(tmp_dlls ${depend_lib} CC_DEPEND_DLLS)
-                    if(tmp_dlls)
-                        list(APPEND all_depend_ext_dlls ${tmp_dlls})
-                    endif()
+                    list(APPEND all_depends_inner ${depend_lib})
                     if(NOT (depend_lib STREQUAL tmp_target))
                         list(APPEND targets_prepare_search ${depend_lib})
                     endif()
@@ -75,6 +68,23 @@ function(get_target_depends_ext_dlls cocos_target all_depend_dlls_out)
             break()
         endif()
     endwhile(true)
+    set(${all_depends_out} ${all_depends_inner} PARENT_SCOPE)
+endfunction()
+
+# get `cocos_target` depend all dlls, save the result in `all_depend_dlls_out`
+function(get_target_depends_ext_dlls cocos_target all_depend_dlls_out)
+
+    set(depend_libs)
+    set(all_depend_ext_dlls)
+    search_depend_libs_recursive(${cocos_target} depend_libs)
+    foreach(depend_lib ${depend_libs})
+        if(TARGET ${depend_lib})
+            get_target_property(tmp_dlls ${depend_lib} CC_DEPEND_DLLS)
+            if(tmp_dlls)
+                list(APPEND all_depend_ext_dlls ${tmp_dlls})
+            endif()
+        endif()
+    endforeach()
 
     set(${all_depend_dlls_out} ${all_depend_ext_dlls} PARENT_SCOPE)
 endfunction()
@@ -168,7 +178,7 @@ function(setup_cocos_app_config app_name)
     elseif(MSVC)
         # only Debug and Release mode was supported when using MSVC.
         set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin/${APP_NAME}/$<CONFIG>")
-        set(APP_RES_DIR "${CMAKE_BINARY_DIR}/bin/${APP_NAME}/${CMAKE_BUILD_TYPE}")
+        set(APP_RES_DIR "${CMAKE_BINARY_DIR}/bin/${APP_NAME}/${CMAKE_BUILD_TYPE}/Resources")
         #Visual Studio Defaults to wrong type
         set_target_properties(${app_name} PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS")
     else(LINUX)
@@ -182,7 +192,6 @@ function(setup_cocos_app_config app_name)
         cocos_mark_code_files(${APP_NAME})
     endif()
 
-    set(APP_BIN_DIR ${APP_BIN_DIR} PARENT_SCOPE)
     set(APP_RES_DIR ${APP_RES_DIR} PARENT_SCOPE)
 endfunction()
 
@@ -232,26 +241,18 @@ macro(cocos_pak_xcode cocos_target)
     set(MACOSX_BUNDLE_LONG_VERSION_STRING ${COCOS_APP_LONG_VERSION_STRING})
     set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${COCOS_APP_SHORT_VERSION_STRING})
 
-    message("cocos package: ${cocos_target}, plist file: ${COCOS_APP_INFO_PLIST}")
+    message(STATUS "cocos package: ${cocos_target}, plist file: ${COCOS_APP_INFO_PLIST}")
 
    cocos_config_app_xcode_property(${cocos_target})
 endmacro()
 
 # set Xcode property for application, include all depend target
 macro(cocos_config_app_xcode_property cocos_app)
-    cocos_config_target_xcode_property(${cocos_app})
-    # for example, cocos_target: cpp-tests link engine_lib: cocos2d
-    get_target_property(engine_libs ${cocos_app} LINK_LIBRARIES)
-    foreach(engine_lib ${engine_libs})
-        if(TARGET ${engine_lib})
-            cocos_config_target_xcode_property(${engine_lib})
-            # for example, engine_lib: cocos2d link external_lib: flatbuffers
-            get_target_property(external_libs ${engine_lib} LINK_LIBRARIES)
-            foreach(external_lib ${external_libs})
-                if(TARGET ${external_lib})
-                    cocos_config_target_xcode_property(${external_lib})
-                endif()
-            endforeach()
+    set(depend_libs)
+    search_depend_libs_recursive(${cocos_app} depend_libs)
+    foreach(depend_lib ${depend_libs})
+        if(TARGET ${depend_lib})
+            cocos_config_target_xcode_property(${depend_lib})
         endif()
     endforeach()
 endmacro()

cmake/Modules/CocosBuildSet.cmake

@@ -1,53 +1,39 @@
-# 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)
 
+if(CMAKE_TOOLCHAIN_FILE)
+    message(STATUS "using toolchain file:" ${CMAKE_TOOLCHAIN_FILE})
+endif()
+
 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)