Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-12-22 08:24:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
caba0b0cef
dockcross/Makefile

120 lines
5.0 KiB
Makefile
Raw Normal View History

Use base image, add Makefile, compress RUN statements to save on disk space Signed-off-by: Steeve Morin <steeve.morin@gmail.com>
2014-10-17 13:42:56 +02:00
DOCKER = docker
Rename project and repository to dockcross
2016-07-16 05:46:08 +02:00
ORG = dockcross
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 08:45:23 +02:00
BIN = bin
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 19:53:01 +02:00
IMAGES = android-arm linux-x86 linux-x64 manylinux-x64 manylinux-x86 linux-arm64 linux-armv5 linux-armv6 linux-armv7 windows-x86 windows-x64
Use base image, add Makefile, compress RUN statements to save on disk space Signed-off-by: Steeve Morin <steeve.morin@gmail.com>
2014-10-17 13:42:56 +02:00
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 19:53:01 +02:00
images: base $(IMAGES)
Makefile: replace default target by all target
2016-07-16 07:27:13 +02:00
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 20:33:38 +02:00
test: base.test $(addsuffix .test,$(IMAGES))
Makefile: Add "default" target This commit adds a target named "default" at the top of the Makefile. Since make will build the first target by default, simply typing "make" will build all images. See http://stackoverflow.com/questions/27242905/makefile-all-vs-default-targets/27243940#27243940 Note: Since "darwin-x64" needs some work, it has been excluded from the default list.
2016-07-16 07:17:36 +02:00
android-arm: Update toolchain and provide Toolchain.cmake.
2015-05-16 19:36:10 +02:00
android-arm: base android-arm/Dockerfile
Rename project and repository to dockcross
2016-07-16 05:46:08 +02:00
$(DOCKER) build -t $(ORG)/android-arm android-arm
restructure makefile for individual builds, restructure linux-arm dockerfiles
2015-02-01 04:18:38 +01:00
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 08:45:23 +02:00
android-arm.test: android-arm test/run.py
$(DOCKER) run --rm dockcross/android-arm > $(BIN)/dockcross-android-arm && chmod +x $(BIN)/dockcross-android-arm
$(BIN)/dockcross-android-arm python test/run.py
browser-asmjs: Rename from javascript-asmjs. We are one past the 30-character limit at DockerHub otherwise :-(.
2015-05-19 23:52:43 +02:00
browser-asmjs: base browser-asmjs/Dockerfile
browser-asmjs: cp ~/.emscripten, etc to the user home in the entrypoint
2016-07-06 21:33:35 +02:00
cp -r test browser-asmjs/
Rename project and repository to dockcross
2016-07-16 05:46:08 +02:00
$(DOCKER) build -t $(ORG)/browser-asmjs browser-asmjs
browser-asmjs: cp ~/.emscripten, etc to the user home in the entrypoint
2016-07-06 21:33:35 +02:00
rm -rf browser-asmjs/test
javascript-asmjs: Initial addition.
2015-05-19 23:34:05 +02:00
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 08:45:23 +02:00
browser-asmjs.test: browser-asmjs test/run.py
$(DOCKER) run --rm dockcross/browser-asmjs > $(BIN)/dockcross-browser-asmjs && chmod +x $(BIN)/dockcross-browser-asmjs
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-19 05:27:51 +02:00
$(BIN)/dockcross-browser-asmjs python test/run.py --exe-suffix ".js"
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 08:45:23 +02:00
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 20:56:50 +02:00
linux-x86: base linux-x86/Dockerfile
Rename project and repository to dockcross
2016-07-16 05:46:08 +02:00
$(DOCKER) build -t $(ORG)/linux-x86 linux-x86
restructure makefile for individual builds, restructure linux-arm dockerfiles
2015-02-01 04:18:38 +01:00
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 08:45:23 +02:00
linux-x86.test: linux-x86 test/run.py
$(DOCKER) run --rm dockcross/linux-x86 > $(BIN)/dockcross-linux-x86 && chmod +x $(BIN)/dockcross-linux-x86
$(BIN)/dockcross-linux-x86 python test/run.py
Makefile: Fix target linux-x64 There are no linux-x64/Toolchain.cmake file
2016-07-16 07:14:50 +02:00
linux-x64: base linux-x64/Dockerfile
Rename project and repository to dockcross
2016-07-16 05:46:08 +02:00
$(DOCKER) build -t $(ORG)/linux-x64 linux-x64
restructure makefile for individual builds, restructure linux-arm dockerfiles
2015-02-01 04:18:38 +01:00
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 08:45:23 +02:00
linux-x64.test: linux-x64 test/run.py
$(DOCKER) run --rm dockcross/linux-x64 > $(BIN)/dockcross-linux-x64 && chmod +x $(BIN)/dockcross-linux-x64
$(BIN)/dockcross-linux-x64 python test/run.py
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 20:56:50 +02:00
linux-arm64: base linux-arm64/Dockerfile
Rename project and repository to dockcross
2016-07-16 05:46:08 +02:00
$(DOCKER) build -t $(ORG)/linux-arm64 linux-arm64
arm64: Initial addition
2016-07-15 22:20:46 +02:00
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 08:45:23 +02:00
linux-arm64.test: linux-arm64 test/run.py
$(DOCKER) run --rm dockcross/linux-arm64 > $(BIN)/dockcross-linux-arm64 && chmod +x $(BIN)/dockcross-linux-arm64
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-19 05:27:51 +02:00
$(BIN)/dockcross-linux-arm64 python test/run.py
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 08:45:23 +02:00
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 20:56:50 +02:00
linux-armv5: base linux-armv5/Dockerfile
Rename project and repository to dockcross
2016-07-16 05:46:08 +02:00
$(DOCKER) build -t $(ORG)/linux-armv5 linux-armv5
Tidy up and consolidate both README.rst/README.md into one. Introduce linux-armv5.
2016-05-27 00:54:02 +02:00
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 08:45:23 +02:00
linux-armv5.test: linux-armv5 test/run.py
$(DOCKER) run --rm dockcross/linux-armv5 > $(BIN)/dockcross-linux-armv5 && chmod +x $(BIN)/dockcross-linux-armv5
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-19 05:27:51 +02:00
$(BIN)/dockcross-linux-armv5 python test/run.py
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 08:45:23 +02:00
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 20:56:50 +02:00
linux-armv6: base linux-armv6/Dockerfile
Rename project and repository to dockcross
2016-07-16 05:46:08 +02:00
$(DOCKER) build -t $(ORG)/linux-armv6 linux-armv6
restructure makefile for individual builds, restructure linux-arm dockerfiles
2015-02-01 04:18:38 +01:00
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 08:45:23 +02:00
linux-armv6.test: linux-armv6 test/run.py
$(DOCKER) run --rm dockcross/linux-armv6 > $(BIN)/dockcross-linux-armv6 && chmod +x $(BIN)/dockcross-linux-armv6
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-19 05:27:51 +02:00
$(BIN)/dockcross-linux-armv6 python test/run.py
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 08:45:23 +02:00
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 20:56:50 +02:00
linux-armv7: base linux-armv7/Dockerfile
Rename project and repository to dockcross
2016-07-16 05:46:08 +02:00
$(DOCKER) build -t $(ORG)/linux-armv7 linux-armv7
restructure makefile for individual builds, restructure linux-arm dockerfiles
2015-02-01 04:18:38 +01:00
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 08:45:23 +02:00
linux-armv7.test: linux-armv7 test/run.py
$(DOCKER) run --rm dockcross/linux-armv7 > $(BIN)/dockcross-linux-armv7 && chmod +x $(BIN)/dockcross-linux-armv7
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-19 05:27:51 +02:00
$(BIN)/dockcross-linux-armv7 python test/run.py
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 08:45:23 +02:00
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 20:56:50 +02:00
linux-ppc64le: base linux-ppc64le/Dockerfile
Rename project and repository to dockcross
2016-07-16 05:46:08 +02:00
$(DOCKER) build -t $(ORG)/linux-ppc64le linux-ppc64le
linux-ppc64le: Initial addition based off Debian.
2015-05-18 21:21:05 +02:00
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 08:45:23 +02:00
linux-ppc64le.test: linux-ppc64le test/run.py
$(DOCKER) run --rm dockcross/linux-ppc64le > $(BIN)/dockcross-linux-ppc64le && chmod +x $(BIN)/dockcross-linux-ppc64le
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-19 05:27:51 +02:00
$(BIN)/dockcross-linux-ppc64le python test/run.py --languages C
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 08:45:23 +02:00
manylinux-x64: Initial addition
2016-09-20 17:35:18 +02:00
manylinux-x64/Dockerfile: manylinux-x64/Dockerfile.in common.docker
base,manylinux-x64: Use sed for Dockerfile composition Suggested-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
2016-09-20 19:17:15 +02:00
sed '/common.docker/ r common.docker' manylinux-x64/Dockerfile.in > manylinux-x64/Dockerfile
manylinux-x64: Initial addition
2016-09-20 17:35:18 +02:00
manylinux-x64: manylinux-x64/Dockerfile
$(DOCKER) build -t $(ORG)/manylinux-x64 -f manylinux-x64/Dockerfile .
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 06:35:37 +02:00
manylinux-x64.test: manylinux-x64 test/run.py
$(DOCKER) run --rm dockcross/manylinux-x64 > $(BIN)/dockcross-manylinux-x64 && chmod +x $(BIN)/dockcross-manylinux-x64
manylinux-x64: Initial addition
2016-09-20 17:35:18 +02:00
$(BIN)/dockcross-manylinux-x64 /opt/python/cp35-cp35m/bin/python test/run.py
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 06:35:37 +02:00
manylinux-x86: Initial addition
2016-09-25 05:14:33 +02:00
manylinux-x86/Dockerfile: manylinux-x86/Dockerfile.in common.docker
sed '/common.docker/ r common.docker' manylinux-x86/Dockerfile.in > manylinux-x86/Dockerfile
manylinux-x86: manylinux-x86/Dockerfile
$(DOCKER) build -t $(ORG)/manylinux-x86 -f manylinux-x86/Dockerfile .
manylinux-x86.test: manylinux-x86 test/run.py
$(DOCKER) run --rm dockcross/manylinux-x86 > $(BIN)/dockcross-manylinux-x86 && chmod +x $(BIN)/dockcross-manylinux-x86
$(BIN)/dockcross-manylinux-x86 /opt/python/cp35-cp35m/bin/python test/run.py
The windows-x86 is now from MXE. See http://mxe.cc
2015-05-04 23:32:58 +02:00
windows-x86: base windows-x86/Dockerfile windows-x86/settings.mk
Rename project and repository to dockcross
2016-07-16 05:46:08 +02:00
$(DOCKER) build -t $(ORG)/windows-x86 windows-x86
restructure makefile for individual builds, restructure linux-arm dockerfiles
2015-02-01 04:18:38 +01:00
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 08:45:23 +02:00
windows-x86.test: windows-x86 test/run.py
$(DOCKER) run --rm dockcross/windows-x86 > $(BIN)/dockcross-windows-x86 && chmod +x $(BIN)/dockcross-windows-x86
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-19 05:27:51 +02:00
$(BIN)/dockcross-windows-x86 python test/run.py --exe-suffix ".exe"
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 08:45:23 +02:00
windows-x64: Migrate to MXE.
2015-05-06 06:08:21 +02:00
windows-x64: base windows-x64/Dockerfile windows-x64/settings.mk
Rename project and repository to dockcross
2016-07-16 05:46:08 +02:00
$(DOCKER) build -t $(ORG)/windows-x64 windows-x64
restructure makefile for individual builds, restructure linux-arm dockerfiles
2015-02-01 04:18:38 +01:00
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 08:45:23 +02:00
windows-x64.test: windows-x64 test/run.py
$(DOCKER) run --rm dockcross/windows-x64 > $(BIN)/dockcross-windows-x64 && chmod +x $(BIN)/dockcross-windows-x64
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-19 05:27:51 +02:00
$(BIN)/dockcross-windows-x64 python test/run.py --exe-suffix ".exe"
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 08:45:23 +02:00
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 06:35:37 +02:00
Dockerfile: Dockerfile.in common.docker
base,manylinux-x64: Use sed for Dockerfile composition Suggested-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
2016-09-20 19:17:15 +02:00
sed '/common.docker/ r common.docker' Dockerfile.in > Dockerfile
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 06:35:37 +02:00
The windows-x86 is now from MXE. See http://mxe.cc
2015-05-04 23:32:58 +02:00
base: Dockerfile
Rename project and repository to dockcross
2016-07-16 05:46:08 +02:00
$(DOCKER) build -t $(ORG)/base .
restructure makefile for individual builds, restructure linux-arm dockerfiles
2015-02-01 04:18:38 +01:00
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 08:45:23 +02:00
base.test: base test/run.py
ci: Fix make *.test invocation
2016-07-16 19:55:04 +02:00
mkdir -p $(BIN)
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 08:45:23 +02:00
$(DOCKER) run --rm dockcross/base > $(BIN)/dockcross-base && chmod +x $(BIN)/dockcross-base
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 19:53:01 +02:00
.PHONY: base images $(IMAGES) tests %.test
Reference in New Issue Copy Permalink