Merge pull request #5579 from dumganhar/develop

[travis ci] Adds 'for-each-file-in-dir.sh' for generating file list in cocos2d. CocosRobot will send a PR for that change.

.travis.yml

@@ -1,6 +1,7 @@
 language: cpp
 env:
   matrix:
+  - GEN_COCOS_FILES=YES
   - PLATFORM=linux DEBUG=1 CC_COMPILER=gcc CXX_COMPILER=g++
   - PLATFORM=linux DEBUG=1 CC_COMPILER=clang CXX_COMPILER=clang++
   # Since switching to C++11 only the ARM version of the nactive client

tools/travis-scripts/for-each-file-in-dir.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# exit this script if any commmand fails
+set -e
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+PROJECT_ROOT="$DIR"/../..
+
+shopt -s dotglob
+
+echo_all_files() {
+    for file in $1/*
+    do
+        if [ -d "$file" ]; then
+            echo_all_files "$file"
+        else
+            relative_path="${file##*${PROJECT_ROOT}/}"
+            prefix=${relative_path:0:5}
+            if [ "$prefix"x != ".git/"x ]; then
+                echo "\"$relative_path\","
+            fi
+        fi
+    done
+}
+
+echo "["
+echo_all_files ${PROJECT_ROOT}
+echo "]"
+

tools/travis-scripts/generate-cocosfiles.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-COCOS2DX_ROOT="$DIR"/../..
+PROJECT_ROOT="$DIR"/../..
-COCOSFILES_CREATOR_ROOT=$COCOS2DX_ROOT/tools/project-creator/config-create
+
 COMMITTAG="[AUTO][ci skip]"
 
 # Exit on error
@@ -11,9 +11,7 @@ set -e
 generate_cocosfiles_json()
 {
     echo "Updates cocos_files.json"
-    pushd "$COCOSFILES_CREATOR_ROOT"
+    ./for-each-file-in-dir.sh > ${PROJECT_ROOT}/templates/cocos2dx_files.json
-    ./create_config.py
-    popd
 }
 
 if [ "$GEN_COCOS_FILES"x != "YES"x ]; then
@@ -21,7 +19,7 @@ if [ "$GEN_COCOS_FILES"x != "YES"x ]; then
     exit 0
 fi
 
-pushd "$COCOS2DX_ROOT"
+pushd "$PROJECT_ROOT"
 #Set git user for cocos2d-x repo
 git config user.email ${GH_EMAIL}
 git config user.name ${GH_USER}
@@ -51,7 +49,7 @@ echo Using "$ELAPSEDSECS" in the branch names for pseudo-uniqueness
 
 # 2. Check if there are any files that are different from the index
 
-pushd "$COCOS2DX_ROOT"
+pushd "$PROJECT_ROOT"
 
 # Run status to record the output in the log
 git status
@@ -88,7 +86,7 @@ COCOS_BRANCH=update_cocosfiles_"$ELAPSEDSECS"
 pushd "${DIR}"
 
 # 3. In Cocos2D-X repo, Checkout a branch named "updategeneratedsubmodule" Update the submodule reference to point to the commit with generated bindings
-cd "${COCOS2DX_ROOT}"
+cd "${PROJECT_ROOT}"
 git add .
 git checkout -b "$COCOS_BRANCH"
 git commit -m "$COMMITTAG : updating tools/project-creator/module/cocos_files.json"