Commit Graph

204 Commits

Author SHA1 Message Date
leda 50ecf00115 cmake support win32 ,and support generate&use prebuilt libs (#18683)
* fix win32 prebuilt error, and set cmake as default android native build

* cpp-template support msvc

* add msvc version check

* add -D_USRLUASTATIC, fix lua lib cmake compile error

* fix cpp-empty-test res copy dir, add function needed

* improve msvc res copy

* refactor cmake copy dll logic

* fix cpp-tests compile error

* refactor copy dll temp

* refactor win32 exe using dlls

* js-project compile support cmake using msvc

* improve res mark for win32

* update the way of lua project res mark

* add D_USRLUASTATIC for lua project

* unify RELEASE Release to Release, add CMAKE_CONFIGURATION_TYPES

* improve VS shows targets, add folder

* improve mac/ios res mark

* reduce useless comments

* unify cpp src include variable

* refactor cpp test project  package logic

* improve pkg app logic

* start support prebuilt libs for cpp project using cmake

* improve prebuilt libs generate

* expand js/lua support prebuilt libs on mac

* adapt IDE generate libs path

* start do prebuilt for android

* improve the way of using external libs for prebuilt

* prebuilt libs support cpp-empty-test on android studio

* cpp-tests prebuilt libs, and remove useless

* start to improve libs using, to adapt prebuilt

* improve cpp tests prebuilt on android

* prebuilt support lua & js test on android

* prebuilt support cpp&js template

* rename prebuilt variabl, detail androd config

* finish android support prebuilt using cmake

* fix cmake script run in windows error

* reduce variable name length

* improve the way of win32 use dlls to adapt prebuilt

* loosen pick js/lua engine lib condition

* self review and start check linux build

* unify compile option location

* strict copy dlls condition

* improve libs link order

* start redo the way of copy dlls

* unify dlls copy logic

* fix linux res copy error

* update cmake copy file path in linux

* make prebuilt dir if needed, and divide Debug and Release dir

* cmake win32 divide Debug and Release dir well

* comment Lua Template project, for the unfinished lua simulator support

* add simulator cmake file

* start support simulator

* simulator support cmake build on macOS

* fix simulator compile error on win32

* add simulator prebuilt support

* improve mark cocos app macro

* improve cmake template project format

* improve cmake app files format

* fix format improve mistake

* detail cmake readme

* improve readme, useless comments

* add game.rc to template project

* check travis openssl version

* try update travis openssl

* upgrade travis openssl

* change openssl link

* change to upgrade openssl

* re install python with upgrade openssl

* add comment for macro and func, improve variable name
2018-03-08 09:47:57 +08:00
James Chen 2d9fc6703c [travis ci] fix GEN_BINDING_AND_COCOSFILE is probably undefined on other platforms (#18541) 2017-12-07 17:52:22 +08:00
James Chen 907b6fda75 Uses NDK r16 to generate js/lua binding code (#18536) 2017-12-07 13:34:12 +08:00
minggo 5151dfd6f9
Remove ant projects (#18532)
* remove proj.android

* remove ant building and rename proj.android-studio to proj.android

* not pass --android-studio
2017-12-04 18:00:45 +08:00
wnddpd01 816029a964 Force yes is deprecated, Edit travis (#18528)
* --force-yes => --allow, -y

* APT Version Check, Add start comment

* APT Version check, Add start Comment

* APT Version check, Add Start Comment

* APT Version check, Add start comment

* Edit travis ui for install_deps_linux.sh
2017-12-04 11:35:31 +08:00
minggo a7a61e6a83
travis build android studio projects (#18515) 2017-12-01 17:29:34 +08:00
minggo 19bd8e3835
Spine update (#18438)
* update spine runtime and resource license

* apply patch to fix crash

* fix python path
2017-11-03 13:44:13 +08:00
minggo 56baabfe50
update glfw to 3.2.1 (#18434) 2017-11-02 15:25:12 +08:00
minggo 496de07633 don't have to set NDK_MODULE_PATH manually 2017-10-26 13:40:27 +08:00
minggo 4b61ea1f1e use travis to build iOS and mac (#17999) 2017-06-29 16:41:06 +08:00
minggo 029dabc4d5 Template issue (#17958)
* add search path

* do not ignore release/debug folder
VS out put folder name is debug/release.win32
and there may have debug/release folder name in 3rd party library

* don not ignore debug folder
2017-06-21 16:18:55 +08:00
James Chen b1f2a056b2 Refactor WebSocket to support SSL (wss) (#17172)
* Refactors WebSocket:
1. Supports wss protocol
2. Uses only one libwebsockets context, multiple wsi instances to avoid multi-thread issues
3. Uses lws_create_vhost to create multiple virtual host, different protocols works

* Adds openssl include path to xcode project configuration.

* mac doesn’t depend on curl

* ca file path should be full path.

* More bug fixes like which in https://github.com/cocos2d/cocos2d-x/pull/6986

* Remove curl dependence for mac

* Updates Andorid.mk

* [win32] Adds wss support for win32, and updates openssl, libcurl, libwebsockets libraries.

* Updates external/config.json to 118.

* [win32] Updates cocos/2d/libcocos2d.vcxproj to fix compilation error while building in release mode.

* Linux support websocket ssl connection.

* Updates external/config.json

* Updates install-deps-linux.sh

* Adds dependence of binutils, print ld version

* Updates travis scripts.

* Updates travis scripts.

* Updates travis script, don’t output log while extracting.

* update before-install.sh

* updates before-install.sh

* updates before-install.sh

* don’t output log for installing software.

* Updates config.json to 120.
2017-01-19 13:55:14 +08:00
minggo 8fbc905134 purge glfw3 before installing glfw3.2 (#17165)
* purge glfw3 before installing glfw3.2

* purge glfw3 before installing glfw3.2
2017-01-12 11:42:01 +08:00
minggo 978f9f99de generate binding codes and cocos_file.json (#16496) 2016-09-01 18:54:49 +08:00
minggo db21e5f349 [ci skip]Travis enable pull request (#16494)
* refactor travis and build pull request

* delete unneeded file
2016-09-01 16:25:47 +08:00
Ricardo Quesada afe36e4a00 feat: upgrades to GLFW v3.2
Inclues Mac and Win32 binaries
Includes udpated downlaod+compile Linux script

fixes github issue #11748

uses WINAPI instead of APIENTRY

it seems that it is being redefined somewhere... but I couldn't find
exactly where
2016-06-29 16:11:30 -07:00
zilongshanren cd4abc0a7f don't remove chipmunk js auto bindings 2016-03-03 15:46:16 +08:00
WenhaiLin 4241df7af7 Fixed binding... 2015-09-21 15:41:14 +08:00
WenhaiLin 2288b7e8d1 Fixed tools/travis-scripts/before-install.sh... 2015-09-21 15:22:00 +08:00
WenhaiLin 460d0fd5a6 [ci skip]Fixed tools/travis-scripts/before-install.sh 2015-09-21 14:58:14 +08:00
WenhaiLin 1c7d4805ef Fixed travis-scripts/before-install.sh 2015-09-21 13:52:28 +08:00
pandamicro 44329d96ba Merge pull request #13946 from WenhaiLin/v3-binding-tool-refine
Refine lua/js binding tool
2015-09-20 16:42:40 +08:00
WenhaiLin a3f363735e Refine lua/js binding tool 2015-09-19 00:08:15 +08:00
Vincent Yang 56ea700d37 Fix bug: new project created by template compile error. 2015-09-18 11:40:16 +08:00
pandamicro 78ef019561 Made travis run for v3.8 2015-08-18 10:17:44 +08:00
pandamicro 3c2e66e425 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
# Conflicts:
#	.travis.yml
#	build/cocos2d_js_tests.xcodeproj/project.pbxproj
#	build/cocos2d_tests.xcodeproj/project.pbxproj
#	cocos/2d/CCFont.h
#	cocos/2d/CCFontAtlas.cpp
#	cocos/2d/CCFontAtlas.h
#	cocos/2d/CCFontFreeType.cpp
#	cocos/2d/CCFontFreeType.h
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
#	cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
#	cocos/cocos2d.cpp
#	cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
#	templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
#	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
#	tools/bindings-generator
#	tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
#	tools/travis-scripts/generate-bindings.sh
#	tools/travis-scripts/generate-cocosfiles.sh
#	tools/travis-scripts/travis_mac.yml
2015-08-02 22:28:27 +08:00
pandamicro 93c1cb70c4 Gen bindings and cocos2dx_files for v3.7.1 2015-07-25 13:31:52 +08:00
pandamicro c1bc03b342 Gen bindings for v3.7.1 2015-07-25 13:28:02 +08:00
pandamicro 436564f922 Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
	docs/RELEASE_NOTES.md
	web
2015-07-15 14:39:40 +08:00
Bin Zhang 55890f6206 Update the JS templates to keep the directory structure is same with before. 2015-07-14 18:07:17 +08:00
andyque 4704d38c13 add v3 to travis build 2015-07-03 18:27:42 +08:00
samuele3hu b963b63701 Update the branches info for the related travis scripts to v3.7 2015-06-25 17:07:15 +08:00
andyque ff26903ddf add ci skip to travis 2015-05-29 13:47:28 +08:00
zhangbin 0a65ad433a Update the travis script for auto generate lua-binding & js-binding. 2015-05-05 11:52:52 +08:00
zhangbin 2c7bd7ec35 Update cocos2dx files. 2015-04-15 15:12:04 +08:00
samuele3hu d72a0c3985 Add more include files in config.gitingore for generating templates/cocos2dx_files.json 2015-03-09 17:39:57 +08:00
minggo e017511c65 disable travis notification 2015-02-12 18:39:42 +08:00
minggo 6487cebead [ci skip]Don't notify because we don't use travis now. 2014-12-25 14:28:27 +08:00
Noel Cower 41027463c9 Descend into included directories to check for file inclusion.
Only applies to directories that are marked as unignored, since the
travis script has the odd problem of not descending into those
directories and, as a result, not recording the files in them.

I'm assuming the failure to descend into included directories is
unintended.
2014-11-17 08:45:30 -08:00
Noel Cower 590975d08d Also un-ignore libs dir under plugins.
The configure script isn't smart enough to check if there are
un-ignored files in a directory, so this fixes that.
2014-11-17 08:26:23 -08:00
Noel Cower fbdf0201c6 Permit plugin-x plugins to ship third-party libraries.
Ignoring the libs directory's .jar files is strange. I'm not sure
whoever put the total block over libs/ knew that this is the standard
Android library directory and not just for NDK-compiled assets.

More granular ignores over libs/ contents would be better in the
future, but this fixes the odd sdk/ directory hack plugins currently
use and lets the Android build system auto-link libraries that're
shipped with plugins instead of forcing Cocos developers to manually
sift through a plugin's Android dependencies and include them by hand.
2014-11-13 09:20:09 -08:00
heliclei ec92f81446 [ci skip]update travis ci to use ndk-r9d 2014-07-03 11:02:04 +08:00
James Chen 14639d812e Update config.gitingore 2014-05-15 18:29:54 +08:00
James Chen bd82c119b6 Updates travis.yml, adds email notification to @Minggo and @James 2014-05-13 21:26:25 +08:00
James Chen e3ccf41ed9 Only build 'merge build' 2014-05-12 21:59:32 +08:00
James Chen 91d684d077 Updates travis script to add mac host support 2014-05-12 21:55:11 +08:00
James Chen 36c4a407ee Adds travis_mac.yml 2014-05-12 21:54:24 +08:00
James Chen a617680cae Updates travis script 2014-05-07 15:06:20 +08:00
James Chen b76a6a5dda updates travis-script. 2014-05-07 13:48:39 +08:00
James Chen 6c1791eae6 Updates travis-script, removed using download-deps.py now, 'external' is
a submodule module now. please use `git submodule update --init` to
fetch it.
2014-05-05 13:14:28 +08:00
James Chen 53488092a4 Updates before-install.sh 2014-05-04 19:09:51 +08:00
James Chen 7fca2c05e2 Update travis script 2014-05-04 15:42:50 +08:00
James Chen 188d843767 Update travis script 2014-05-04 15:38:42 +08:00
James Chen 1634ae30c5 'develop' -> 'v3' branch for travis ci. 2014-04-28 11:28:03 +08:00
zhangbin 0c82a4a3e0 Add tools/bindings-generator & tools/tolua into the lua project template. 2014-03-27 15:38:01 +08:00
James Chen b8eee8e1a4 [ci] Updates travis scripts. only commit relevant folder. 2014-03-25 17:07:15 +08:00
James Chen bb190fe78a [ci] Updates travis scripts. 2014-03-25 16:24:08 +08:00
James Chen 04038a912f [travis ci] Sort file list in generate-template-files.py. 2014-03-12 20:34:49 +08:00
James Chen c4752b260b Updates tools/travis-scripts/generate-template-files.py. 2014-03-12 20:18:55 +08:00
chuanweizhang2013 884229e898 modify generate-template-files 2014-03-12 17:20:15 +08:00
James Chen cbd9cbaf71 travis builds all tests projects for Android. 2014-03-11 19:10:36 +08:00
James Chen 38160ff7d7 Corrects a mistake in generate-bindings.sh 2014-03-10 19:18:55 +08:00
James Chen 7d3a6c999d Updates before-install.sh. 2014-03-10 18:24:28 +08:00
James Chen 9c18c804f5 Typo fix. 2014-03-10 18:20:51 +08:00
James Chen 124b18f53a Re-add CocosRobot send bindings glue codes to cocos2d-x repo. 2014-03-10 18:13:39 +08:00
James Chen a5f668a0bf [travis ci] Build testcpp only. 2014-03-10 12:06:33 +08:00
James Chen c2cd349da5 Uses 'generate-tempate-files.py' to generate cocos2dx_files.json 2014-03-06 14:56:46 +08:00
James Chen 5ca25d854f [travis ci] Updates generate-cocosfiles.sh. 2014-03-06 14:10:50 +08:00
James Chen 738a4f5deb Uncomments '.generate-cocosfiles.sh'. 2014-03-06 14:00:48 +08:00
James Chen dfdb6c4158 [travis ci] Adds 'for-each-file-in-dir.sh' for generating file list in cocos2d. CocosRobot will send a PR for that change. 2014-03-06 13:54:24 +08:00
James Chen 7e9a120e25 Fix travis build fails. 2014-02-27 16:23:38 +08:00
James Chen e4837e7f94 issue #4116: Removes script-bindings codes. 2014-02-26 21:34:06 +08:00
James Chen 1cd5ad3626 Updates COMMITTAG
Skips to build the Pull Request of updating cocos_files.json.
2014-02-13 13:58:55 +08:00
James Chen b5710e04ba issue #4020: Adds execute permission for generate-cocosfile.sh. 2014-02-13 11:52:16 +08:00
James Chen 2fef642300 issue #4020: Typo fix, elif -> if. 2014-02-13 11:42:23 +08:00
James Chen 772cdf5739 issue #4020: Updates before-install.sh. and comment fix in generate-cocosfiles.sh. 2014-02-13 11:38:28 +08:00
James Chen a56b7e4f3f closed #4020: cocos_files.json should be auto-generated by CocosRobot. 2014-02-13 11:33:11 +08:00
Éloi Rivard 8adca38efa Linux javascript bindings support.
- Adds Linux javascript test.
- Adds Linux javascript template.
- Adds Travis CI test.
2014-02-13 01:42:14 +01:00
Éloi Rivard 79e3c05ef1 Minor debugging messages and guards.
Dependencies installation is skipped on linux distributions that does not use .deb package format.
2014-02-13 01:25:23 +01:00
James Chen d779aaa967 Defines NDK_ROOT and PYTHON_BIN in top level. 2014-02-11 14:12:13 +08:00
James Chen d8f89b8045 Exports PYTHON_BIN variable. 2014-02-11 14:02:34 +08:00
James Chen c97b6cb197 Uses genbindings.py instead of genbindings.sh and genbindings.bat. 2014-02-10 18:30:22 +08:00
James Chen e0e37424f0 [Travis-CI] Removes openmw ppa since we’re using glfw3 rather than sdl2. 2014-02-07 21:11:30 +08:00
James Chen 667cd04ee6 Update run-script.sh, samples -> tests. 2014-02-01 12:33:15 +08:00
James Chen 3f8f36df68 issue #3828: Updates travis script. 2014-01-28 16:23:16 +08:00
James Chen 6d491e66cf issue #3828: Updates travis-scripts/run-script.sh 2014-01-28 16:11:54 +08:00
James Chen d980d33d56 issue #3823: install_glfw.sh will not skip if it was installed. Since it will not be updated if we find a new version of glfw.
BTW, install script will not be invoked in every build after we switch to cmake.
2014-01-23 01:07:28 -08:00
James Chen 048298c6a0 issue #3823: Updates travis-ci script to use the latest release of glfw (v3.0.4). 2014-01-23 15:57:10 +08:00
lihex 3b9d4c7a39 issue #3781, Update travis-scripts, llvm-installing parts no need now. 2014-01-22 11:28:53 +08:00
James Chen 37b6ef99e3 Wrong dir fix for travis ci. 2014-01-06 20:04:30 -08:00
James Chen 2f7c41bd28 [travis] builds linux template now. 2014-01-06 19:42:51 -08:00
James Chen 7f2dc5197e Updates travis-script, don't build template proj.
Since we are supporting create project anywhere, to test template projects, projects should be created firstly.Therefore, disable building template for travis-ci.
2013-12-31 16:37:05 +08:00
samuele3hu cc2323b636 issue #2790:Open travis support 2013-12-10 18:26:10 +08:00
James Chen c916377970 issue #2790: Comments building template for android. 2013-12-06 17:23:31 +08:00
James Chen 7aff958063 issue #2790: A typo fix. 2013-12-06 17:09:36 +08:00
James Chen ed7c3f717a issue #2790: Travis-ci builds JSB projects again. 2013-12-06 16:49:17 +08:00
James Chen 68e376db2f issue #2790: Disables build lua projects for linux 2013-12-05 11:51:09 +08:00
James Chen 856a82d4b8 issue #2790: Don’t build script bindings projects for travis. 2013-12-05 11:03:22 +08:00
Dhilan007 881d43fe3b add proceed java compilation and generate apk. 2013-11-26 11:58:01 +08:00
James Chen 74497e18ec [CMake template] Fix compilation errors. 2013-11-08 18:25:58 +08:00