sync v3 build related codes into metal-support (cocos2d#173)

* strict initialization for std::array

* remove proj.win32 project configs

* modern cmake, cmake_cleanup_remove_unused_variables (cocos2d#19146)

* Switch travis CI to xenial (cocos2d#19207)

* Switch travis CI to xenial

* Remove language: android

* Set language: cpp

* Fix java problem

* Update sdkmanager

* Fix sdkmanger

* next sdkmanager fix

* Remove xenial from android

* revert to sdk-tools-{system}-3859397

* Remove linux cmake install

* Update before-install.sh

* Update .travis.yml

* Simplify install-deps-linux.sh, tested on Ubuntu 16.04 (cocos2d#19212)

* Simplify install-deps-linux.sh

* Cleanup

* pick: install ninja

* update cocos2d-console submodule

* for metal-support alpha release, we only test cpp

* add HelloCpp into project(Cocos2d-x) for tmp test

* update extenal metal-support-4

Author: drelaptop

.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

@@ -41,17 +41,27 @@ 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 engine all tests project
+
+# 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)
-add_subdirectory(${COCOS2DX_ROOT_PATH}/tests/js-tests/project ${ENGINE_BINARY_PATH}/tests/js-tests)
-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)
+
+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(BUILD_JS_LIBS)
+  add_subdirectory(${COCOS2DX_ROOT_PATH}/tests/js-tests/project ${ENGINE_BINARY_PATH}/tests/js-tests)
+endif()
+
+# 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/CocosBuildSet.cmake

@@ -1,11 +1,3 @@
-# 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
@@ -14,22 +6,8 @@ set(CMAKE_DEBUG_TARGET_PROPERTIES
     # AUTOUIC_OPTIONS
     # POSITION_INDEPENDENT_CODE
 )
-# 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)
@@ -40,7 +18,6 @@ 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})

cmake/Modules/CocosConfigDefine.cmake

@@ -6,29 +6,23 @@
  #LINUX      =   Linux
  if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
      set(WINDOWS TRUE)
-     set(SYSTEM_STRING "Windows Desktop")
      set(PLATFORM_FOLDER win32)
  elseif(${CMAKE_SYSTEM_NAME} MATCHES "Android")
-     set(SYSTEM_STRING "Android")
      set(PLATFORM_FOLDER android)
  elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
      if(ANDROID)
-         set(SYSTEM_STRING "Android")
          set(PLATFORM_FOLDER android)
      else()
          set(LINUX TRUE)
-         set(SYSTEM_STRING "Linux")
          set(PLATFORM_FOLDER linux)
      endif()
  elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
      if(IOS)
          set(APPLE TRUE)
-         set(SYSTEM_STRING "IOS")
          set(PLATFORM_FOLDER ios)
      else()
          set(APPLE TRUE)
          set(MACOSX TRUE)
-         set(SYSTEM_STRING "Mac OSX")
          set(PLATFORM_FOLDER mac)
      endif()
 else()
@@ -78,30 +72,6 @@ define_property(TARGET
     FULL_DOCS "use to save depend libs of cocos2d lua project"
 ) 
 
- # check and print compiler infos
- if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-     set(COMPILER_STRING ${CMAKE_CXX_COMPILER_ID})
-     set(CLANG TRUE)
- elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-     if(MINGW)
-         set(COMPILER_STRING "Mingw GCC")
-     else()
-         set(COMPILER_STRING "GCC")
-     endif()
- elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
-     set(COMPILER_STRING "${CMAKE_CXX_COMPILER_ID} C++")
- elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-     set(COMPILER_STRING "Visual Studio C++")
- else()
-     set(COMPILER_STRING "${CMAKE_CXX_COMPILER_ID}")
- endif()
- if(CMAKE_CROSSCOMPILING)
-     set(BUILDING_STRING "It appears you are cross compiling for ${SYSTEM_STRING} with ${COMPILER_STRING}")
- else()
-     set(BUILDING_STRING "It appears you are building natively for ${SYSTEM_STRING} with ${COMPILER_STRING}")
- endif()
- message(STATUS ${BUILDING_STRING})
-
 # check c++ standard
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_C_STANDARD_REQUIRED ON)