i want to merge v3quick to cocos2d-x trunk

.gitignore

@@ -34,12 +34,16 @@ _ReSharper*/
 [Tt]est[Rr]esult*
 ipch/
 *.opensdf
+*.opendb
 SubmissionInfo
 Generated Files
 AppPackages
+BundleArtifacts
+.vs/
+*.VC.db
 
 # Ignore files build by ndk and eclipse
-libs/
+/libs/
 bin/
 obj/
 gen/
@@ -113,42 +117,40 @@ build/build/
 cocos/scripting/lua-bindings/proj.ios_mac/build/
 tests/*/runtime/
 tests/*/publish/
+tests/*/project/proj.android-studio/app/build.xml
+tests/*/project/proj.android-studio/app/proguard-project.txt
+tests/*/proj.android-studio/app/build.xml
+tests/*/proj.android-studio/app/proguard-project.txt
 
 # Android
 project.properties
+*.iml
 
 # Ignore prebuilt libraries folder
-/external/xxhash/
-/external/curl/
-/external/edtaa3func/
-/external/freetype2/
-/external/glfw3/
-/external/jpeg/
-/external/json/
-/external/linux-specific/
-/external/lua/
-/external/png/
-/external/sqlite3/
-/external/tiff/
-/external/tinyxml2/
-/external/unzip/
-/external/webp/
-/external/websockets/
-/external/win32-specific/
-/external/winrt-specific/
-/external/winrt_8.1-specific/
-/external/wp8-specific/
-/external/wp_8.1-specific/
-/external/version.json
+/external/*
+!/external/config.json
 /templates/lua-template-runtime/runtime
 /v*-deps-*.zip
 /v*-lua-runtime-*.zip
+/v*-console-*.zip
 /tools/fbx-conv/
-external/chipmunk
 tests/cpp-tests/Resources/audio
-/external/Box2D/
-/external/ConvertUTF/
-/external/audio/
-/external/xxtea/
-/external/protobuf-lite/
-/external/flatbuffers/
+/tests/lua-empty-test/src/cocos/
+/tests/lua-game-controller-test/src/cocos/
+/tests/lua-tests/src/cocos/
+/tests/js-tests/res/
+/tools/framework-compile/bin/proj_modifier/plutil-win32/
+!/tools/framework-compile/bin/
+
+# generated by framework-compile
+/templates/*-template-binary/
+/prebuilt/
+/*/prebuilt-mk/Android.mk
+/*/*/prebuilt-mk/Android.mk
+/*/*/*/prebuilt-mk/Android.mk
+/*/*/*/*/prebuilt-mk/Android.mk
+*.xcscmblueprint
+tests/cpp-empty-test/proj.tizen/res/
+tests/cpp-tests/proj.tizen/res/
+tests/lua-empty-test/project/proj.tizen/res/
+tests/lua-tests/project/proj.tizen/res/

.gitmodules

@@ -1,12 +1,18 @@
 [submodule "tools/cocos2d-console"]
         path = tools/cocos2d-console
-        url = git://github.com/cocos2d/cocos2d-console.git
+        url = git://github.com/joywish/cocos2d-console.git
 [submodule "plugin"]
         path = plugin
-        url = https://github.com/cocos2d-x/plugin-x.git
+        url = https://github.com/joywish/plugin-x.git
 [submodule "tools/bindings-generator"]
         path = tools/bindings-generator
-        url = git://github.com/cocos2d/bindings-generator.git
+        url = git://github.com/joywish/bindings-generator.git
 [submodule "tests/cpp-tests/Resources/ccs-res"]
         path = tests/cpp-tests/Resources/ccs-res
-        url = git://github.com/dumganhar/ccs-res.git
+        url = https://github.com/joywish/ccs-res.git
+[submodule "web"]
+        path = web
+        url = https://github.com/joywish/cocos2d-html5.git
+[submodule "external"]
+        path = external
+        url = https://github.com/joywish/cocos2d-x-3rd-party-libs-bin

.travis.yml

@@ -1,45 +1,77 @@
-language: cpp
-env:
-  matrix:
-  - GEN_BINDING=YES
-  - GEN_COCOS_FILES=YES
-  - PLATFORM=mac-ios PUSH_TO_MAC=YES
-  - PLATFORM=linux DEBUG=1 CC_COMPILER=gcc CXX_COMPILER=g++
-  # Disable clang build on linux temporarily since we're using "-stdlib=libc++ " which wasn't installed on travis machine.
-  # - PLATFORM=linux DEBUG=1 CC_COMPILER=clang CXX_COMPILER=clang++
-  # Since switching to C++11 only the ARM version of the nactive client
-  # port currently builds.  TODO(sbc): Re-enable all architectures.
-  # Disabled travis-ci build for native client port since it doesn't support std::thread, std::mutex.
-  # - PLATFORM=nacl DEBUG=1 NACL_ARCH=arm
-  - PLATFORM=android
-  # - PLATFORM=emscripten DEBUG=1
-  global:
-  - secure: |-
-      cHXOjAda+t2tmBVuVAiQfvhDN+unToO6hX1rc3dJeGDOk4rlQnylJacjA7o/
-      enkWeHagbW2Ja4h7BxQz4h7dada8zEbIbEMK4VEHx6AWwQM+GIEqkJPv5g8k
-      4P20MLpX4XyUwm/16btpnqgXlyd8Q3Zjh3Vui/5/VzwPnxUQEho=
-  - secure: |-
-      U/JsyiSR9q+8wX1arfciy3BdbMQaKmgt48/9tiU7P2RQJ/FR2AHGq85sNGI/
-      ZUxN4JPLGALEvkFMo4NYyJDUcsdRHZX3vbp5xbSSRaBigqJIj3HDxtlPVf2m
-      /W2GzcfNNX1ACO18hSWH0d2yFlF263ZmvudzQIfqTESfjGQBzwA=
-  - secure: |-
-      Wsngwo3jlZtvuPfr3RNhqrz/liNIhKYnlw4KYJO90gMQ9ZQKRTlMv2BMiPw/
-      9lV+vgJQDRcFe7dKwtC86vk10EU7Ym2bhVmhMxi/AlmJXgavjmPVdizRT7rh
-      X2Ry/Nb6hGRkH3WS0T3D/KG1+e7lP/TMB9bvo6/locLJ2A6Z1YI=
-  - secure: PGMnEvysYv9Mnjrof05v9MU41ZlVO7A7SQb4oLuYqhBf0stvZUVEF4fmkOcXRPAd4Cg41aAbtE8RyGaqIFaKHtjHFtTdisM9XVXqL+eMfv5L+8nFCk4S5Fi/ohglO+FBJ9X/NLfAfRZmlwJR+UedU5AJwqlQbKraNkyv/FmDMUc=
+matrix:
+  include:
+    # linux
+    - os: linux
+      env: 
+        - BUILD_TARGET=linux 
+        - GEN_BINDING_AND_COCOSFILE=true
+        - secure: Xn48eX1TD6DAPcVPU+a+CD3b/BKGVCHk555zl8rZiLq4GH4rWSES23rKcY8uz/X9GizETWYQK2luNvph4/BA29XEZ7l+Q0V9AZwrahWPzCuDBgxSPAr4KlETGM9I3xEvRIKBeddko7JTFHZCcNsItPRA0CovndQzdKE6texm13A=
+        - secure: M31OQaUIBV13aUMylPs2PieKThGs+ED0tj9SKbCKGKxwojl+N2ZhlS53D4Zqoj1ru/3P1X0pPeYvV0uVfM2dpEwRF4BmYVZQSrOKgjK1VfbcN5luWSeuAvq0LNGT99Ao02sKLbcHINiQ4axylPPgsY6+X/aoJNuKqBTQyaaVAo8=
+        - secure: M5lyDs0qai15mWHzJdkh0WPfVJJmVZu6SWtYULxatukGPXVwoQvmEtYAwAW+iz6aM+tXksQ/mk6nW5L8UFbHm+n6yrsa5bZU9sGXjilPE8p8bLFYDmIbPRazU+E6pBP3J2CDoAm0XnWkiYQ8feTxKTo6ysLnHAEjyaHTw0+Q1GM=
+      sudo: required
+      language: cpp
+    # android
+    - os: linux
+      env: BUILD_TARGET=android
+      language: android
+      sudo: required
+      android:
+        components:
+          - android-13
+    # mac lua-tests + js-tests
+    # - os: osx
+    #   env: BUILD_TARGET=mac
+    #   language: cpp
+    #   osx_image: xcode7.3
+    #   sudo: required
+    #   python:
+    #     - "2.7"
+    #   cache: pip
+    # # mac cpp-tests
+    # - os: osx
+    #   env: BUILD_TARGET=mac BUILD_CPP=true
+    #   language: cpp
+    #   osx_image: xcode7.3
+    #   sudo: required
+    #   python:
+    #     - "2.7"
+    #   cache: pip
+    # # iOS lua-tests + js-tests
+    # - os: osx
+    #   env: BUILD_TARGET=ios
+    #   language: cpp
+    #   osx_image: xcode7.3
+    #   sudo: required
+    #   python:
+    #     - "2.7"
+    #   cache: pip
+    # # iOS cpp-tests
+    # - os: osx
+    #   env: BUILD_TARGET=ios BUILD_CPP=true
+    #   language: cpp
+    #   osx_image: xcode7.3
+    #   sudo: required
+    #   python:
+    #     - "2.7"
+    #   cache: pip
+
 script:
-- export CC=$CC_COMPILER
-- export CXX=$CXX_COMPILER
 - tools/travis-scripts/run-script.sh
 before_install:
 - tools/travis-scripts/before-install.sh
 
+cache:
+  bundler: true
+
 notifications:
-  email:
-    - xiaoming.zhang@cocos2d-x.org
-    - jianhua.chen@cocos2d-x.org
+  email: false
 
-# whitelist
+# blocklist
 branches:
-  only:
-    - v3
+  except:
+  - v1
+  - v2
+  - v4-develop
+  - v3-doc
+  - v3.11_backup
+  - v35-for-tizen