Commit Graph

975 Commits

Author SHA1 Message Date
Jean-Christophe Fillion-Robin
2a12475d36
Makefile: Remove dependencies on a non-generated files
Since image targets are all "phony", they are always consider out-of-date
and will always be rebuilt. This means there is no need to add an explicit
dependency on non-generated files like  "Dockerfile", "settings.mk" and
"test/run.py".

The only required dependencies on Dockerfile are the one for the "base"
and "manylinux" images.

To confirm that the Makefiles works as expected after this patch, the
list of executed commands before and after is compared:

Before:

```
make --dry-run > ../dockcross-make-baseline
make test --dry-run > ../dockcross-make-test-baseline
```

After:

```
make --dry-run > ../dockcross-make-current;
make test --dry-run > ../dockcross-make-test-current

for target in make make-test; do
  diff ../dockcross-$target-current ../dockcross-$target-baseline > /dev/null 2>&1
  [[ $? == 1 ]] && \
    echo "" && \
    echo "Error: Problem with '${target}' target: Dry-run output before and after this commit do not match."
done
```
2016-09-25 17:38:20 -04:00
Jean-Christophe Fillion-Robin
caba0b0cef
Makefile: Remove "Toolchain.cmake" dependencies
Since image targets are all "phony", they are always consider out-of-date
and will always be rebuilt. This means there is no need to add an explicit
dependency on the "Toolchain.cmake" file.

Note also that the dependency on "Toolchain.cmake" was not consistent
for all images. For example, "linux-x64" was missing the dependency
whereas it was specified for "linux-x86".

This commit ensure all image targets are consistent removing the
dependency on "Toolchain.cmake".

To confirm that the Makefiles works as expected after this patch, the
list of executed commands before and after is compared:

Before:

```
make --dry-run > ../dockcross-make-baseline
make test --dry-run > ../dockcross-make-test-baseline
```

After:

```
make --dry-run > ../dockcross-make-current;
make test --dry-run > ../dockcross-make-test-current

for target in make make-test; do
  diff ../dockcross-$target-current ../dockcross-$target-baseline > /dev/null 2>&1
  [[ $? == 1 ]] && \
    echo "" && \
    echo "Error: Problem with '${target}' target: Dry-run output before and after this commit do not match."
done
```
2016-09-25 17:38:12 -04:00
Jean-Christophe Fillion-Robin
e428bb3c03
Makefile: Simplify test rule using "addsuffix" filename function
See https://www.gnu.org/software/make/manual/html_node/File-Name-Functions.html#File-Name-Functions

To confirm that the Makefiles works as expected after this patch, the
list of executed commands before and after is compared:

Before:

```
make --dry-run > ../dockcross-make-baseline
make test --dry-run > ../dockcross-make-test-baseline
```

After:

```
make --dry-run > ../dockcross-make-current;
make test --dry-run > ../dockcross-make-test-current

for target in make make-test; do
  diff ../dockcross-$target-current ../dockcross-$target-baseline > /dev/null 2>&1
  [[ $? == 1 ]] && \
    echo "" && \
    echo "Error: Problem with '${target}' target: Dry-run output before and after this commit do not match."
done
```
2016-09-25 17:38:05 -04:00
Jean-Christophe Fillion-Robin
92b57f511d
Makefile: Introduce IMAGES variable
To confirm that the Makefiles works as expected after this patch, the
list of executed commands before and after is compared:

Before:

```
make --dry-run > ../dockcross-make-baseline
make test --dry-run > ../dockcross-make-test-baseline
```

After:

```
make --dry-run > ../dockcross-make-current;
make test --dry-run > ../dockcross-make-test-current

for target in make make-test; do
  diff ../dockcross-$target-current ../dockcross-$target-baseline > /dev/null 2>&1
  [[ $? == 1 ]] && \
    echo "" && \
    echo "Error: Problem with '${target}' target: Dry-run output before and after this commit do not match."
done
```
2016-09-25 17:37:08 -04:00
Matt McCormick
dda710167a Merge pull request #44 from thewtex/manylinux-x86
Add manylinux-x86
2016-09-24 23:36:09 -04:00
Matt McCormick
1354fe2586 manylinux-x86: Initial addition 2016-09-24 23:14:33 -04:00
Matt McCormick
fd2b8efe51 linux-x86: Use linux32 as entrypoint for uname -m output 2016-09-24 22:37:00 -04:00
Matt McCormick
01a3348f15 Merge pull request #43 from jcfr/support-ctrl-c
base/dockcross: Run docker using -t to support CTRL-C
2016-09-23 11:36:56 -04:00
Jean-Christophe Fillion-Robin
af75453ed0 base/dockcross: Run docker with "-ti" only if a tty or pts is attached
This commit reverts f07ca00 (base: Do not add -i -t flags to run command
by default) and ensure tty is available before specifying the flags.
2016-09-23 11:33:29 -04:00
Jean-Christophe Fillion-Robin
aa2c24cb3b base/dockcross: Run docker using -t to support CTRL-C 2016-09-22 23:34:08 -04:00
Matt McCormick
1d11afd37d Merge pull request #42 from jcfr/manylinux-allow-pip-install-squashed
manylinux: Grant current user password less sudo access.
2016-09-22 22:45:17 -04:00
Jean-Christophe Fillion-Robin
995c9091e5 manylinux: Grant current user password less sudo access.
This will allow build script like "build-wheels.sh" to run command like
the following (see [1]):

  sudo yum install -y atlas-devel

It will also allow to pip install using sudo and avoid error reported in [3].

That said, instead of running pip using sudo, the recommended approach
is to specify the "--user" flag [2]

[1] 893d92517e/travis/build-wheels.sh

[2] http://stackoverflow.com/questions/7143077/how-can-i-install-packages-in-my-home-folder-with-pip#7143496

[3] Error reported when running pip without "sudo pip install <packagename" or "pip install --user <packagename>"
```
Exception:
Traceback (most recent call last):
  File "/opt/_internal/cpython-2.7.11-ucs2/lib/python2.7/site-packages/pip/basecommand.py", line 215, in main
    status = self.run(options, args)
  File "/opt/_internal/cpython-2.7.11-ucs2/lib/python2.7/site-packages/pip/commands/install.py", line 317, in run
    prefix=options.prefix_path,
  File "/opt/_internal/cpython-2.7.11-ucs2/lib/python2.7/site-packages/pip/req/req_set.py", line 736, in install
    requirement.uninstall(auto_confirm=True)
  File "/opt/_internal/cpython-2.7.11-ucs2/lib/python2.7/site-packages/pip/req/req_install.py", line 742, in uninstall
    paths_to_remove.remove(auto_confirm)
  File "/opt/_internal/cpython-2.7.11-ucs2/lib/python2.7/site-packages/pip/req/req_uninstall.py", line 115, in remove
    renames(path, new_path)
  File "/opt/_internal/cpython-2.7.11-ucs2/lib/python2.7/site-packages/pip/utils/__init__.py", line 267, in renames
    shutil.move(old, new)
  File "/opt/_internal/cpython-2.7.11-ucs2/lib/python2.7/shutil.py", line 303, in move
    os.unlink(src)
OSError: [Errno 13] Permission denied: '/opt/_internal/cpython-2.7.11-ucs2/bin/easy_install'
```
2016-09-22 19:21:24 -04:00
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