Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-12-23 09:04:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
363 Commits 142 Branches 0 Tags 2.3 MiB
b1d45ae99d
Commit Graph

363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt McCormick
131e6408ee Merge pull request #38 from jcfr/36-support-disabling-toolchain-cmake-option 
36 support disabling toolchain cmake option
 2016-09-22 11:23:09 -04:00
Matt McCormick
3c1a2758b0 Merge pull request #40 from thewtex/39-manylinux-cmake-ssl 
manylinux-x64,base: Download cmake binary for SSL support
 2016-09-22 11:22:24 -04:00
Jean-Christophe Fillion-Robin
4876f14356 base/cmake: Do not pass toolchain option when using incompatible cmake option 
Also revert the changes to ccmake.sh, the restriction doesn't apply to it.

Suggested-by: Matt McCormick <matt.mccormick@kitware.com>
 2016-09-21 21:11:33 -04:00
Matt McCormick
72ffa6dd1d Merge pull request #35 from jcfr/34-add-support-for-special-update-commands 
34 add support for special update commands
 2016-09-21 20:34:01 -04:00
Jean-Christophe Fillion-Robin
c05d52310a dockcross: Ensure running "update commands" exits script with correct status 2016-09-21 20:25:11 -04:00
Matt McCormick
b1037c9f5f manylinux-x64,base: Download cmake binary for SSL support 
Download the CMake binary from CMake.org for SSL support. #39
 2016-09-21 20:25:02 -04:00
Jean-Christophe Fillion-Robin
ff2512b785 manylinux-x64: Set DOCKCROSS_PASS_CMAKE_TOOLCHAIN_FILE to 0 
Fixes #36
 2016-09-21 19:09:41 -04:00
Jean-Christophe Fillion-Robin
c525ad106e cmake/ccmake: Provide a mechanism to disable passing of toolchain file 
By default the toolchain file is always passed as an option to cmake/ccmake

It can be explicitly disabled setting the environment variable
DOCKCROSS_PASS_CMAKE_TOOLCHAIN_FILE to 0
 2016-09-21 19:06:51 -04:00
Jean-Christophe Fillion-Robin
43e46710e6 dockcross: Add support for special update commands. Fixes #34 2016-09-21 16:31:09 -04:00
Jean-Christophe Fillion-Robin
1eac15c210 dockcross: Add warning regarding location of DEFAULT_DOCKCROSS_IMAGE 2016-09-21 16:29:00 -04:00
Matt McCormick
853f0f41b9 Merge pull request #33 from thewtex/manylinux-makefile 
makefile: Add manylinux-x64 to top level targets
 2016-09-21 11:42:42 -04:00
Matt McCormick
0bc1f257a6 makefile: Add manylinux-x64 to top level targets 2016-09-21 10:22:31 -04:00
Matt McCormick
fee5fbd063 Merge pull request #32 from thewtex/circleci-cache 
circleci: Cache Docker images
 2016-09-21 10:20:34 -04:00
Matt McCormick
daafa314f6 circleci: Cache Docker images 2016-09-21 09:49:05 -04:00
Matt McCormick
abde0d6fd7 Merge pull request #31 from thewtex/manylinux 
Add manylinux-x64
 2016-09-20 23:24:02 -04:00
Matt McCormick
b596ca6cd8 base,manylinux-x64: Use sed for Dockerfile composition 
Suggested-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
 2016-09-20 18:08:43 -04:00
Matt McCormick
ed2ae68b7b manylinux-x64: Document in README 2016-09-20 18:08:43 -04:00
Matt McCormick
60374aa006 manylinux-x64: Install skbuild 2016-09-20 18:08:40 -04:00
Matt McCormick
5d90a72dfc manylinux-x64: Initial addition 2016-09-20 18:07:58 -04:00
Matt McCormick
755f45b412 base: Split into Dockerfile.in and common.docker 
So common.docker can be re-used in other images that are not built FROM base.
 2016-09-20 08:58:41 -04:00
Matt McCormick
59ba030070 Merge pull request #30 from thewtex/args-quotes 
doc: Note that --args needs quotes for spaces
 2016-09-01 10:12:27 -04:00
Matt McCormick
2b18bb7013 doc: Note that --args needs quotes for spaces 2016-09-01 10:11:32 -04:00
Matt McCormick
5b3c89c3f0 Merge pull request #29 from thewtex/no-tty 
base: Do not add -i -t flags to run command by default
 2016-08-31 22:36:42 -04:00
Matt McCormick
f07ca0043c base: Do not add -i -t flags to run command by default 
Allow the dockcross script to be used in scripts where a tty is not available.
 2016-08-31 22:31:58 -04:00
Matt McCormick
a3e0d34ac0 Merge pull request #25 from thewtex/emscripten-force-compiler 
Emscripten force compiler
 2016-08-11 18:20:25 -04:00
Matt McCormick
b72060d9a2 browser-asmjs: Remove CMakeForceCompiler 
CMakeForceCompiler was marked deprecated in CMake 3.6.0. It emits many
warnings when using Emscripten. These changes can be removed in a future
version of Emscripten when it is disabled or removed per:
https://github.com/kripken/emscripten/pull/4477
 2016-08-11 11:51:42 -04:00
Matt McCormick
70da314cf0 browser-asmjs: Bump Emscripten to 1.36.7 2016-08-11 11:45:23 -04:00
Matt McCormick
b24ab3ba11 base: Bump CMake to 3.6.1 2016-08-11 11:44:04 -04:00
Matt McCormick
c92fde55b8 Merge pull request #24 from thewtex/examples-markup 
doc: Fix the examples markup
 2016-08-02 12:03:43 -04:00
Matt McCormick
a7041e155d doc: Fix the examples markup 2016-08-02 12:03:18 -04:00
Matt McCormick
a96410303b Merge pull request #23 from thewtex/emulator-doc 
doc: Note that emulators are usually available.
 2016-08-02 11:54:11 -04:00
Matt McCormick
440f13b087 doc: Note that emulators are usually available. 2016-08-02 11:53:44 -04:00
Matt McCormick
2bdf65fdcb Merge pull request #22 from thewtex/toolbox-link 
doc: Add a link to the Docker Toolbox
 2016-08-02 11:51:31 -04:00
Matt McCormick
c818f24198 doc: Add a link to the Docker Toolbox 2016-08-02 11:50:53 -04:00
Matt McCormick
ca69bebc95 Merge pull request #21 from thewtex/doc-tweaks 
doc: Fixes and tweaks to the README
 2016-08-02 11:48:50 -04:00
Matt McCormick
8a01c4d26d doc: Fixes and tweaks to the README 2016-08-02 11:47:30 -04:00
Matt McCormick
11e27190e8 Merge pull request #20 from thewtex/CMAKE_TOOLCHAIN_FILE-auto 
Always pass CMAKE_TOOLCHAIN_FILE to cmake and ccmake #17
 2016-07-22 09:01:28 -04:00
Matt McCormick
e3ecfeb1a6 test: Use 'make test' as the Makefile target 
This is a more common name for this target and it helps with tab completion.
 2016-07-22 08:49:49 -04:00
Matt McCormick
60cd0e4678 windows-x64: Bump MXE to 2016-07-21 2016-07-22 08:49:41 -04:00
Matt McCormick
1620453675 windows-x86: Bump MXE to 2016-07-21 2016-07-22 08:49:41 -04:00
Matt McCormick
b148e1ce23 linux-x64: Add CMAKE_TOOLCHAIN_FILE 2016-07-22 08:49:41 -04:00
Matt McCormick
1ed3548655 base: Add cmake wrapper scripts for CMAKE_TOOLCHAIN_FILE 
All images should define this variables.

Disable build tests on the base image because it is not configured for cross
compiling.
 2016-07-22 08:48:59 -04:00
Matt McCormick
041eb8702b doc: Move status badge location 2016-07-16 21:31:37 -04:00
Matt McCormick
a5de661ce8 doc: Correct CircleCI badge URL location 2016-07-16 17:44:12 -04:00
Matt McCormick
ae9d28a177 Merge pull request #16 from thewtex/circleci-test-commands 
ci: Fix make *.test invocation
 2016-07-16 17:39:32 -04:00
Matt McCormick
9cf3d4acbf doc: Identify how to start up a shell in the build environment 2016-07-16 17:12:52 -04:00
Matt McCormick
24c0141bea ci: Fix make *.test invocation 2016-07-16 13:55:04 -04:00
Matt McCormick
a4820f6288 Merge pull request #15 from jcfr/fix-circle-error-and-tweak-Makefile 
Fix circle error and tweak makefile
 2016-07-16 10:28:26 -04:00
Jean-Christophe Fillion-Robin
3c25505f52 Makefile: Add test targets 
This commits add test targets for all images, this will facilitate local
testing.

In addition to the usual targets:

  make android-arm
  make browser-asmjs
  [...]

the following targets are now available:

  make tests
  make android-arm.test
  make browser-asmjs.test
  [...]

Note that the target "all" has been renamed into "images"
 2016-07-16 02:45:23 -04:00
Jean-Christophe Fillion-Robin
a082610bf6 circle/linux-armv7: Fix test 
This commit fixes a regression introduced in e8830e9
 2016-07-16 02:35:17 -04:00