Merge commit 'ed2eab52973eb614e14f6680b9c0bbd315b017a5' into scgamex-v3

* commit 'ed2eab52973eb614e14f6680b9c0bbd315b017a5':
  Fix animation duration calculation (cocos2d#19221)
  Simplify install-deps-linux.sh, tested on Ubuntu 16.04 (cocos2d#19212)
  Switch travis CI to xenial (cocos2d#19207)
  add testcase for lua downloader binding (cocos2d#19182)

# Conflicts:
#	tests/lua-tests/src/mainMenu.lua

Author: stevetranby

.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

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

cocos/2d/CCActionInterval.cpp

@@ -89,7 +89,7 @@ void ExtraAction::step(float /*dt*/)
 bool ActionInterval::initWithDuration(float d)
 {
 
-    _duration = abs(d) <= MATH_EPSILON ? MATH_EPSILON : d;
+    _duration = std::abs(d) <= MATH_EPSILON ? MATH_EPSILON : d;
     _elapsed = 0;
     _firstTick = true;
     _done = false;

tools/travis-scripts/before-install.sh

@@ -24,37 +24,6 @@ function install_android_ndk()
 
 function install_linux_environment()
 {
-    mkdir -p $HOME/bin
-    pushd $HOME/bin
-
-    echo "GCC version: `gcc --version`"
-    # install new version cmake
-    CMAKE_VERSION="3.7.2"
-    CMAKE_DOWNLOAD_URL="https://cmake.org/files/v3.7/cmake-${CMAKE_VERSION}.tar.gz"
-    echo "Download ${CMAKE_DOWNLOAD_URL}"
-    ${CURL} -O ${CMAKE_DOWNLOAD_URL}
-    tar -zxf "cmake-${CMAKE_VERSION}.tar.gz"
-    cd "cmake-${CMAKE_VERSION}"
-    ./configure > /dev/null
-    make -j2 > /dev/null
-    sudo make install > /dev/null
-    echo "CMake Version: `cmake --version`"
-    cd ..
-
-    # install new version binutils
-    BINUTILS_VERSION="2.27"
-    BINUTILS_URL="http://ftp.gnu.org/gnu/binutils/binutils-${BINUTILS_VERSION}.tar.gz"
-    echo "Download ${BINUTILS_URL}"
-    ${CURL} -O ${BINUTILS_URL}
-    tar -zxf "binutils-${BINUTILS_VERSION}.tar.gz"
-    cd "binutils-${BINUTILS_VERSION}"
-    ./configure > /dev/null
-    make -j2 > /dev/null
-    sudo make install > /dev/null
-    echo "ld Version: `ld --version`"
-    echo "which ld: `which ld`"
-    sudo rm /usr/bin/ld
-    popd
     echo "Installing linux dependence packages ..."
     echo -e "y" | bash $COCOS2DX_ROOT/build/install-deps-linux.sh
     echo "Installing linux dependence packages finished!"

tools/travis-scripts/run-script.sh

@@ -29,14 +29,12 @@ function do_retry()
 
 function build_linux()
 {
-    CPU_CORES=`grep -c ^processor /proc/cpuinfo`
     echo "Building tests ..."
     cd $COCOS2DX_ROOT/build
     mkdir -p linux-build
     cd linux-build
     cmake ../..
-    echo "cpu cores: ${CPU_CORES}"
-    make -j${CPU_CORES} VERBOSE=1
+    cmake --build .
 }
 
 function build_mac()
@@ -375,14 +373,13 @@ if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
         update_cocos_files
         python -u tools/cocos2d-console/bin/cocos.py --agreement n new -l lua -p my.pack.qqqq cocos_new_test
         popd
-        CPU_CORES=`grep -c ^processor /proc/cpuinfo`
+
         echo "Building tests ..."
         cd $COCOS2DX_ROOT/cocos_new_test
         mkdir -p linux-build
         cd linux-build
         cmake ..
-        echo "cpu cores: ${CPU_CORES}"
-        make -j${CPU_CORES} VERBOSE=1
+        cmake --build .
         exit 0
     fi
     if [ $BUILD_TARGET == 'mac_cmake' ]; then