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
0bb3b65ebf
dockcross/Makefile

174 lines
5.3 KiB
Makefile
Raw Normal View History

Makefile: Add comments and move implicit rules at the end of the file 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 --ignore-trailing-space ../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-26 00:38:26 +02:00
#
# Parameters
#
# Name of the docker executable
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
Makefile: Add comments and move implicit rules at the end of the file 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 --ignore-trailing-space ../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-26 00:38:26 +02:00
# Docker organization to pull the images from
Rename project and repository to dockcross
2016-07-16 05:46:08 +02:00
ORG = dockcross
Makefile: Add comments and move implicit rules at the end of the file 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 --ignore-trailing-space ../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-26 00:38:26 +02:00
# Directory where to generate the dockcross script for each images (e.g bin/dockcross-manylinux-x64)
dockcross: Add support for Windows Tested on Git Bash and Bash on Ubuntu for Windows. There are some issue with building the Docker image itself, but using the images works great.
2016-11-17 04:02:55 +01:00
BIN = ./bin
Makefile: Add implicit rule for STANDARD_IMAGES Adding a new images with the usual build rule: $(DOCKER) build -t $(ORG)/$@ $@ is now just a matter of adding an item to the "STANDARD_IMAGES" list. To confirm that the Makefiles works as expected after this patch, the list of executed commands before and after is compared. Note that since this patch changes the order in which the images are listed (manylinux is now last), the baseline and current files are different. After inspection, we can confirm the difference is explained by the order of the commands. 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 23:44:08 +02:00
Makefile: Add comments and move implicit rules at the end of the file 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 --ignore-trailing-space ../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-26 00:38:26 +02:00
# These images are built using the "build implicit rule"
[windows_x64_posix] Updated Makefile to take into account windows-x64-posix
2018-06-10 11:04:54 +02:00
STANDARD_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-arm64 linux-armv5 linux-armv6 linux-armv7 linux-mips linux-mipsel linux-ppc64le windows-x86 windows-x64 windows-x64-posix
Implement "ct-ng" building, add "linux-mips". Add a mechanism to construct a full cross-compiler environment using the "crosstool-ng" cross-compiler building utility. This is implemented in the new "common.crosstool" include, and augments the "dockcross/base" base image. Update Makefile to consolidate Dockerfile generation, notably the "sed"-based inclusion directives. Finally, employ all of this to generate a "linux-mips" 32-bit hard-float MIPS cross-compiler Dockcross image.
2017-04-26 21:21:27 +02:00
# Generated Dockerfiles.
Crosstool-ng'd armv5
2018-07-15 12:43:55 +02:00
GEN_IMAGES = linux-s390x linux-mips manylinux-x86 manylinux-x64 browser-asmjs linux-arm64 windows-x86 windows-x64 windows-x64-posix linux-armv7 linux-armv5
Implement "ct-ng" building, add "linux-mips". Add a mechanism to construct a full cross-compiler environment using the "crosstool-ng" cross-compiler building utility. This is implemented in the new "common.crosstool" include, and augments the "dockcross/base" base image. Update Makefile to consolidate Dockerfile generation, notably the "sed"-based inclusion directives. Finally, employ all of this to generate a "linux-mips" 32-bit hard-float MIPS cross-compiler Dockcross image.
2017-04-26 21:21:27 +02:00
GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(GEN_IMAGES))
Makefile: Add implicit rule for STANDARD_IMAGES Adding a new images with the usual build rule: $(DOCKER) build -t $(ORG)/$@ $@ is now just a matter of adding an item to the "STANDARD_IMAGES" list. To confirm that the Makefiles works as expected after this patch, the list of executed commands before and after is compared. Note that since this patch changes the order in which the images are listed (manylinux is now last), the baseline and current files are different. After inspection, we can confirm the difference is explained by the order of the commands. 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 23:44:08 +02:00
Makefile: Introduce NON_STANDARD_IMAGES, ALL_IMAGES and DEFAULT_IMAGES vars This commit also ensures that: * all image targets are declared as PHONY * "test" and not "tests" is declared as PHONY 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 make browser-asmjs.test --dry-run > ../dockcross-make-browser-asmjs-test-baseline make linux-ppc64le.test --dry-run > ../dockcross-make-linux-ppc64le-test-baseline ``` After: ``` make --dry-run > ../dockcross-make-current; make test --dry-run > ../dockcross-make-test-current make browser-asmjs.test --dry-run > ../dockcross-make-browser-asmjs-test-current make linux-ppc64le.test --dry-run > ../dockcross-make-linux-ppc64le-test-current for target in make make-test make-browser-asmjs-test make-linux-ppc64le-test; do diff --ignore-trailing-space ../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-26 01:04:07 +02:00
# These images are expected to have explicit rules for *both* build and testing
NON_STANDARD_IMAGES = browser-asmjs manylinux-x64 manylinux-x86
windows-(x86|x64): Optimize images introducing "common.windows" * Avoid duplication introducing common script * Optimize image size reducing the number of RUN instructions
2018-06-09 07:20:20 +02:00
DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux common.crosstool common.windows
Implement "ct-ng" building, add "linux-mips". Add a mechanism to construct a full cross-compiler environment using the "crosstool-ng" cross-compiler building utility. This is implemented in the new "common.crosstool" include, and augments the "dockcross/base" base image. Update Makefile to consolidate Dockerfile generation, notably the "sed"-based inclusion directives. Finally, employ all of this to generate a "linux-mips" 32-bit hard-float MIPS cross-compiler Dockcross image.
2017-04-26 21:21:27 +02:00
Makefile: Introduce NON_STANDARD_IMAGES, ALL_IMAGES and DEFAULT_IMAGES vars This commit also ensures that: * all image targets are declared as PHONY * "test" and not "tests" is declared as PHONY 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 make browser-asmjs.test --dry-run > ../dockcross-make-browser-asmjs-test-baseline make linux-ppc64le.test --dry-run > ../dockcross-make-linux-ppc64le-test-baseline ``` After: ``` make --dry-run > ../dockcross-make-current; make test --dry-run > ../dockcross-make-test-current make browser-asmjs.test --dry-run > ../dockcross-make-browser-asmjs-test-current make linux-ppc64le.test --dry-run > ../dockcross-make-linux-ppc64le-test-current for target in make make-test make-browser-asmjs-test make-linux-ppc64le-test; do diff --ignore-trailing-space ../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-26 01:04:07 +02:00
# This list all available images
Makefile: All images are tested. Remove ALL_IMAGES and DEFAULT_IMAGES vars. To confirm that the Makefiles works as expected after this patch, the list of executed commands before and after has been 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 --ignore-trailing-space ../dockcross-$target-baseline ../dockcross-$target-current> /dev/null 2>&1 [[ $? == 1 ]] && \ echo "" && \ echo "-------------------------------" && \ echo "Here is output of:" && \ echo " diff --ignore-trailing-space ../dockcross-$target-baseline ../dockcross-$target-current" && \ echo "" && \ diff --ignore-trailing-space ../dockcross-$target-baseline ../dockcross-$target-current done ``` Output: ``` ------------------------------- Here is output of: diff --ignore-trailing-space ../dockcross-make-baseline ../dockcross-make-current 8a9 > docker build -t dockcross/linux-ppc64le linux-ppc64le 10a12,14 > cp -r test browser-asmjs/ > docker build -t dockcross/browser-asmjs browser-asmjs > rm -rf browser-asmjs/test ------------------------------- Here is output of: diff --ignore-trailing-space ../dockcross-make-test-baseline ../dockcross-make-test-current 24a25,27 > docker build -t dockcross/linux-ppc64le linux-ppc64le > docker run --rm dockcross/linux-ppc64le > bin/dockcross-linux-ppc64le && chmod +x bin/dockcross-linux-ppc64le > bin/dockcross-linux-ppc64le python test/run.py --languages C 30a34,38 > cp -r test browser-asmjs/ > docker build -t dockcross/browser-asmjs browser-asmjs > rm -rf browser-asmjs/test > docker run --rm dockcross/browser-asmjs > bin/dockcross-browser-asmjs && chmod +x bin/dockcross-browser-asmjs > bin/dockcross-browser-asmjs python test/run.py --exe-suffix ".js" ```
2016-09-26 05:28:23 +02:00
IMAGES = $(STANDARD_IMAGES) $(NON_STANDARD_IMAGES)
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: Add comments and move implicit rules at the end of the file 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 --ignore-trailing-space ../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-26 00:38:26 +02:00
# Optional arguments for test runner (test/run.py) associated with "testing implicit rule"
Makefile: Introduce NON_STANDARD_IMAGES, ALL_IMAGES and DEFAULT_IMAGES vars This commit also ensures that: * all image targets are declared as PHONY * "test" and not "tests" is declared as PHONY 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 make browser-asmjs.test --dry-run > ../dockcross-make-browser-asmjs-test-baseline make linux-ppc64le.test --dry-run > ../dockcross-make-linux-ppc64le-test-baseline ``` After: ``` make --dry-run > ../dockcross-make-current; make test --dry-run > ../dockcross-make-test-current make browser-asmjs.test --dry-run > ../dockcross-make-browser-asmjs-test-current make linux-ppc64le.test --dry-run > ../dockcross-make-linux-ppc64le-test-current for target in make make-test make-browser-asmjs-test make-linux-ppc64le-test; do diff --ignore-trailing-space ../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-26 01:04:07 +02:00
linux-ppc64le.test_ARGS = --languages C
Makefile: Treat windows-(x86|x64) as regular image introducing _ARGS var To confirm that the Makefiles works as expected after this patch, the list of executed commands before and after is compared. The only difference was due to the extra space in the command line associated with windows-x86 ``` < bin/dockcross-windows-x86 python test/run.py --exe-suffix ".exe" --- > bin/dockcross-windows-x86 python test/run.py --exe-suffix ".exe" ``` 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 --ignore-trailing-space ../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-26 00:20:02 +02:00
windows-x86.test_ARGS = --exe-suffix ".exe"
windows-x64.test_ARGS = --exe-suffix ".exe"
[windows_x64_posix] Updated Makefile to take into account windows-x64-posix
2018-06-10 11:04:54 +02:00
windows-x64-posix.test_ARGS = --exe-suffix ".exe"
Makefile: Add implicit rule for STANDARD_TESTS 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-26 00:03:28 +02:00
Makefile: Do not specify "--rm" docker run argument when executing on CircleCI This will avoid the "Driver btrfs failed to remove" error message when executing the command on CircleCI. See https://circleci.com/docs/docker-btrfs-error/
2016-11-29 02:01:39 +01:00
# On CircleCI, do not attempt to delete container
# See https://circleci.com/docs/docker-btrfs-error/
Makefile: Fix tests removing double quote from RM variable This commit fixes a regression introduced in 6823cb1 (Makefile: Do not specify "--rm" docker run argument when executing on CircleCI)
2016-11-29 05:39:38 +01:00
RM = --rm
Makefile: Do not specify "--rm" docker run argument when executing on CircleCI This will avoid the "Driver btrfs failed to remove" error message when executing the command on CircleCI. See https://circleci.com/docs/docker-btrfs-error/
2016-11-29 02:01:39 +01:00
ifeq ("$(CIRCLECI)", "true")
Makefile: Fix tests removing double quote from RM variable This commit fixes a regression introduced in 6823cb1 (Makefile: Do not specify "--rm" docker run argument when executing on CircleCI)
2016-11-29 05:39:38 +01:00
RM =
Makefile: Do not specify "--rm" docker run argument when executing on CircleCI This will avoid the "Driver btrfs failed to remove" error message when executing the command on CircleCI. See https://circleci.com/docs/docker-btrfs-error/
2016-11-29 02:01:39 +01:00
endif
Makefile: Add comments and move implicit rules at the end of the file 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 --ignore-trailing-space ../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-26 00:38:26 +02:00
#
Makefile: All images are tested. Remove ALL_IMAGES and DEFAULT_IMAGES vars. To confirm that the Makefiles works as expected after this patch, the list of executed commands before and after has been 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 --ignore-trailing-space ../dockcross-$target-baseline ../dockcross-$target-current> /dev/null 2>&1 [[ $? == 1 ]] && \ echo "" && \ echo "-------------------------------" && \ echo "Here is output of:" && \ echo " diff --ignore-trailing-space ../dockcross-$target-baseline ../dockcross-$target-current" && \ echo "" && \ diff --ignore-trailing-space ../dockcross-$target-baseline ../dockcross-$target-current done ``` Output: ``` ------------------------------- Here is output of: diff --ignore-trailing-space ../dockcross-make-baseline ../dockcross-make-current 8a9 > docker build -t dockcross/linux-ppc64le linux-ppc64le 10a12,14 > cp -r test browser-asmjs/ > docker build -t dockcross/browser-asmjs browser-asmjs > rm -rf browser-asmjs/test ------------------------------- Here is output of: diff --ignore-trailing-space ../dockcross-make-test-baseline ../dockcross-make-test-current 24a25,27 > docker build -t dockcross/linux-ppc64le linux-ppc64le > docker run --rm dockcross/linux-ppc64le > bin/dockcross-linux-ppc64le && chmod +x bin/dockcross-linux-ppc64le > bin/dockcross-linux-ppc64le python test/run.py --languages C 30a34,38 > cp -r test browser-asmjs/ > docker build -t dockcross/browser-asmjs browser-asmjs > rm -rf browser-asmjs/test > docker run --rm dockcross/browser-asmjs > bin/dockcross-browser-asmjs && chmod +x bin/dockcross-browser-asmjs > bin/dockcross-browser-asmjs python test/run.py --exe-suffix ".js" ```
2016-09-26 05:28:23 +02:00
# images: This target builds all IMAGES (because it is the first one, it is built by default)
Makefile: Add comments and move implicit rules at the end of the file 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 --ignore-trailing-space ../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-26 00:38:26 +02:00
#
Makefile: All images are tested. Remove ALL_IMAGES and DEFAULT_IMAGES vars. To confirm that the Makefiles works as expected after this patch, the list of executed commands before and after has been 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 --ignore-trailing-space ../dockcross-$target-baseline ../dockcross-$target-current> /dev/null 2>&1 [[ $? == 1 ]] && \ echo "" && \ echo "-------------------------------" && \ echo "Here is output of:" && \ echo " diff --ignore-trailing-space ../dockcross-$target-baseline ../dockcross-$target-current" && \ echo "" && \ diff --ignore-trailing-space ../dockcross-$target-baseline ../dockcross-$target-current done ``` Output: ``` ------------------------------- Here is output of: diff --ignore-trailing-space ../dockcross-make-baseline ../dockcross-make-current 8a9 > docker build -t dockcross/linux-ppc64le linux-ppc64le 10a12,14 > cp -r test browser-asmjs/ > docker build -t dockcross/browser-asmjs browser-asmjs > rm -rf browser-asmjs/test ------------------------------- Here is output of: diff --ignore-trailing-space ../dockcross-make-test-baseline ../dockcross-make-test-current 24a25,27 > docker build -t dockcross/linux-ppc64le linux-ppc64le > docker run --rm dockcross/linux-ppc64le > bin/dockcross-linux-ppc64le && chmod +x bin/dockcross-linux-ppc64le > bin/dockcross-linux-ppc64le python test/run.py --languages C 30a34,38 > cp -r test browser-asmjs/ > docker build -t dockcross/browser-asmjs browser-asmjs > rm -rf browser-asmjs/test > docker run --rm dockcross/browser-asmjs > bin/dockcross-browser-asmjs && chmod +x bin/dockcross-browser-asmjs > bin/dockcross-browser-asmjs python test/run.py --exe-suffix ".js" ```
2016-09-26 05:28:23 +02:00
images: base $(IMAGES)
Makefile: replace default target by all target
2016-07-16 07:27:13 +02:00
Makefile: Add comments and move implicit rules at the end of the file 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 --ignore-trailing-space ../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-26 00:38:26 +02:00
#
# test: This target ensures all IMAGES are built and run the associated tests
#
Makefile: All images are tested. Remove ALL_IMAGES and DEFAULT_IMAGES vars. To confirm that the Makefiles works as expected after this patch, the list of executed commands before and after has been 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 --ignore-trailing-space ../dockcross-$target-baseline ../dockcross-$target-current> /dev/null 2>&1 [[ $? == 1 ]] && \ echo "" && \ echo "-------------------------------" && \ echo "Here is output of:" && \ echo " diff --ignore-trailing-space ../dockcross-$target-baseline ../dockcross-$target-current" && \ echo "" && \ diff --ignore-trailing-space ../dockcross-$target-baseline ../dockcross-$target-current done ``` Output: ``` ------------------------------- Here is output of: diff --ignore-trailing-space ../dockcross-make-baseline ../dockcross-make-current 8a9 > docker build -t dockcross/linux-ppc64le linux-ppc64le 10a12,14 > cp -r test browser-asmjs/ > docker build -t dockcross/browser-asmjs browser-asmjs > rm -rf browser-asmjs/test ------------------------------- Here is output of: diff --ignore-trailing-space ../dockcross-make-test-baseline ../dockcross-make-test-current 24a25,27 > docker build -t dockcross/linux-ppc64le linux-ppc64le > docker run --rm dockcross/linux-ppc64le > bin/dockcross-linux-ppc64le && chmod +x bin/dockcross-linux-ppc64le > bin/dockcross-linux-ppc64le python test/run.py --languages C 30a34,38 > cp -r test browser-asmjs/ > docker build -t dockcross/browser-asmjs browser-asmjs > rm -rf browser-asmjs/test > docker run --rm dockcross/browser-asmjs > bin/dockcross-browser-asmjs && chmod +x bin/dockcross-browser-asmjs > bin/dockcross-browser-asmjs python test/run.py --exe-suffix ".js" ```
2016-09-26 05:28:23 +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
Implement "ct-ng" building, add "linux-mips". Add a mechanism to construct a full cross-compiler environment using the "crosstool-ng" cross-compiler building utility. This is implemented in the new "common.crosstool" include, and augments the "dockcross/base" base image. Update Makefile to consolidate Dockerfile generation, notably the "sed"-based inclusion directives. Finally, employ all of this to generate a "linux-mips" 32-bit hard-float MIPS cross-compiler Dockcross image.
2017-04-26 21:21:27 +02:00
#
# Generic Targets (can specialize later).
#
$(GEN_IMAGE_DOCKERFILES) Dockerfile: %Dockerfile: %Dockerfile.in $(DOCKER_COMPOSITE_SOURCES)
sed \
-e '/common.docker/ r common.docker' \
-e '/common.debian/ r common.debian' \
-e '/common.manylinux/ r common.manylinux' \
-e '/common.crosstool/ r common.crosstool' \
windows-(x86|x64): Optimize images introducing "common.windows" * Avoid duplication introducing common script * Optimize image size reducing the number of RUN instructions
2018-06-09 07:20:20 +02:00
-e '/common.windows/ r common.windows' \
Implement "ct-ng" building, add "linux-mips". Add a mechanism to construct a full cross-compiler environment using the "crosstool-ng" cross-compiler building utility. This is implemented in the new "common.crosstool" include, and augments the "dockcross/base" base image. Update Makefile to consolidate Dockerfile generation, notably the "sed"-based inclusion directives. Finally, employ all of this to generate a "linux-mips" 32-bit hard-float MIPS cross-compiler Dockcross image.
2017-04-26 21:21:27 +02:00
$< > $@
Makefile: Add comments and move implicit rules at the end of the file 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 --ignore-trailing-space ../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-26 00:38:26 +02:00
#
# browser-asmjs
#
Implement "ct-ng" building, add "linux-mips". Add a mechanism to construct a full cross-compiler environment using the "crosstool-ng" cross-compiler building utility. This is implemented in the new "common.crosstool" include, and augments the "dockcross/base" base image. Update Makefile to consolidate Dockerfile generation, notably the "sed"-based inclusion directives. Finally, employ all of this to generate a "linux-mips" 32-bit hard-float MIPS cross-compiler Dockcross image.
2017-04-26 21:21:27 +02:00
browser-asmjs: browser-asmjs/Dockerfile
makefile: Ensure imagefiles are available in build image context
2016-11-25 21:51:38 +01:00
mkdir -p $@/imagefiles && cp -r imagefiles $@/
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/
ci: Use CircleCI 2.0 Addresses #156
2017-08-27 05:48:47 +02:00
$(DOCKER) build -t $(ORG)/browser-asmjs:latest \
dockerfile: Keep track of buildtime metadata This commit build each images with the following arguments: * IMAGE: Name of the image (e.g dockcross/base, dockcross/manylinux-x64, ...) * VCS_REF: dockcross/dockcross commit from which this image is built * VCS_URL: this repository obtained reading remote.origin.url * BUILD_DATE: Date and time when the build was initiated Then, within the Dockerfile, the metadata are associated with the image using the "LABEL" instruction. See https://docs.docker.com/engine/reference/builder/#/label The corresponding labels can be found here: http://label-schema.org/rc1/#build-time-labels See #28
2016-10-31 04:57:04 +01:00
--build-arg IMAGE=$(ORG)/browser-asmjs \
--build-arg VCS_REF=`git rev-parse --short HEAD` \
--build-arg VCS_URL=`git config --get remote.origin.url` \
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
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
makefile: Ensure imagefiles are available in build image context
2016-11-25 21:51:38 +01:00
rm -rf $@/imagefiles
javascript-asmjs: Initial addition.
2015-05-19 23:34:05 +02:00
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 21:44:22 +02:00
browser-asmjs.test: browser-asmjs
makefile: Ensure imagefiles are available in build image context
2016-11-25 21:51:38 +01:00
cp -r test browser-asmjs/
Makefile: Do not specify "--rm" docker run argument when executing on CircleCI This will avoid the "Driver btrfs failed to remove" error message when executing the command on CircleCI. See https://circleci.com/docs/docker-btrfs-error/
2016-11-29 02:01:39 +01:00
$(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: Ensure imagefiles are available in build image context
2016-11-25 21:51:38 +01:00
rm -rf browser-asmjs/test
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: Add comments and move implicit rules at the end of the file 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 --ignore-trailing-space ../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-26 00:38:26 +02:00
#
# manylinux-x64
manylinux-x64: Initial addition
2016-09-20 17:35:18 +02:00
manylinux-x64: manylinux-x64/Dockerfile
makefile: Ensure imagefiles are available in build image context
2016-11-25 21:51:38 +01:00
mkdir -p $@/imagefiles && cp -r imagefiles $@/
ci: Use CircleCI 2.0 Addresses #156
2017-08-27 05:48:47 +02:00
$(DOCKER) build -t $(ORG)/manylinux-x64:latest \
dockerfile: Keep track of buildtime metadata This commit build each images with the following arguments: * IMAGE: Name of the image (e.g dockcross/base, dockcross/manylinux-x64, ...) * VCS_REF: dockcross/dockcross commit from which this image is built * VCS_URL: this repository obtained reading remote.origin.url * BUILD_DATE: Date and time when the build was initiated Then, within the Dockerfile, the metadata are associated with the image using the "LABEL" instruction. See https://docs.docker.com/engine/reference/builder/#/label The corresponding labels can be found here: http://label-schema.org/rc1/#build-time-labels See #28
2016-10-31 04:57:04 +01:00
--build-arg IMAGE=$(ORG)/manylinux-x64 \
--build-arg VCS_REF=`git rev-parse --short HEAD` \
--build-arg VCS_URL=`git config --get remote.origin.url` \
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-f manylinux-x64/Dockerfile .
makefile: Ensure imagefiles are available in build image context
2016-11-25 21:51:38 +01:00
rm -rf $@/imagefiles
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
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 21:44:22 +02:00
manylinux-x64.test: manylinux-x64
Makefile: Do not specify "--rm" docker run argument when executing on CircleCI This will avoid the "Driver btrfs failed to remove" error message when executing the command on CircleCI. See https://circleci.com/docs/docker-btrfs-error/
2016-11-29 02:01:39 +01:00
$(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
Makefile: Add comments and move implicit rules at the end of the file 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 --ignore-trailing-space ../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-26 00:38:26 +02:00
#
# manylinux-x86
#
manylinux-x86: Initial addition
2016-09-25 05:14:33 +02:00
manylinux-x86: manylinux-x86/Dockerfile
makefile: Ensure imagefiles are available in build image context
2016-11-25 21:51:38 +01:00
mkdir -p $@/imagefiles && cp -r imagefiles $@/
ci: Use CircleCI 2.0 Addresses #156
2017-08-27 05:48:47 +02:00
$(DOCKER) build -t $(ORG)/manylinux-x86:latest \
dockerfile: Keep track of buildtime metadata This commit build each images with the following arguments: * IMAGE: Name of the image (e.g dockcross/base, dockcross/manylinux-x64, ...) * VCS_REF: dockcross/dockcross commit from which this image is built * VCS_URL: this repository obtained reading remote.origin.url * BUILD_DATE: Date and time when the build was initiated Then, within the Dockerfile, the metadata are associated with the image using the "LABEL" instruction. See https://docs.docker.com/engine/reference/builder/#/label The corresponding labels can be found here: http://label-schema.org/rc1/#build-time-labels See #28
2016-10-31 04:57:04 +01:00
--build-arg IMAGE=$(ORG)/manylinux-x86 \
--build-arg VCS_REF=`git rev-parse --short HEAD` \
--build-arg VCS_URL=`git config --get remote.origin.url` \
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-f manylinux-x86/Dockerfile .
makefile: Ensure imagefiles are available in build image context
2016-11-25 21:51:38 +01:00
rm -rf $@/imagefiles
manylinux-x86: Initial addition
2016-09-25 05:14:33 +02:00
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 21:44:22 +02:00
manylinux-x86.test: manylinux-x86
Makefile: Do not specify "--rm" docker run argument when executing on CircleCI This will avoid the "Driver btrfs failed to remove" error message when executing the command on CircleCI. See https://circleci.com/docs/docker-btrfs-error/
2016-11-29 02:01:39 +01:00
$(DOCKER) run $(RM) dockcross/manylinux-x86 > $(BIN)/dockcross-manylinux-x86 && chmod +x $(BIN)/dockcross-manylinux-x86
manylinux-x86: Initial addition
2016-09-25 05:14:33 +02:00
$(BIN)/dockcross-manylinux-x86 /opt/python/cp35-cp35m/bin/python test/run.py
Makefile: Add comments and move implicit rules at the end of the file 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 --ignore-trailing-space ../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-26 00:38:26 +02:00
#
# base
#
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
dockcross: Add support for Windows Tested on Git Bash and Bash on Ubuntu for Windows. There are some issue with building the Docker image itself, but using the images works great.
2016-11-17 04:02:55 +01:00
base: Dockerfile imagefiles/
ci: Use CircleCI 2.0 Addresses #156
2017-08-27 05:48:47 +02:00
$(DOCKER) build -t $(ORG)/base:latest \
dockerfile: Keep track of buildtime metadata This commit build each images with the following arguments: * IMAGE: Name of the image (e.g dockcross/base, dockcross/manylinux-x64, ...) * VCS_REF: dockcross/dockcross commit from which this image is built * VCS_URL: this repository obtained reading remote.origin.url * BUILD_DATE: Date and time when the build was initiated Then, within the Dockerfile, the metadata are associated with the image using the "LABEL" instruction. See https://docs.docker.com/engine/reference/builder/#/label The corresponding labels can be found here: http://label-schema.org/rc1/#build-time-labels See #28
2016-10-31 04:57:04 +01:00
--build-arg IMAGE=$(ORG)/base \
--build-arg VCS_URL=`git config --get remote.origin.url` \
.
restructure makefile for individual builds, restructure linux-arm dockerfiles
2015-02-01 04:18:38 +01:00
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 21:44:22 +02:00
base.test: base
Makefile: Do not specify "--rm" docker run argument when executing on CircleCI This will avoid the "Driver btrfs failed to remove" error message when executing the command on CircleCI. See https://circleci.com/docs/docker-btrfs-error/
2016-11-29 02:01:39 +01:00
$(DOCKER) run $(RM) dockcross/base > $(BIN)/dockcross-base && chmod +x $(BIN)/dockcross-base
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: Add "display_default_images" and "display_all_images" targets
2016-09-26 01:46:49 +02:00
#
# display
#
Makefile: All images are tested. Remove ALL_IMAGES and DEFAULT_IMAGES vars. To confirm that the Makefiles works as expected after this patch, the list of executed commands before and after has been 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 --ignore-trailing-space ../dockcross-$target-baseline ../dockcross-$target-current> /dev/null 2>&1 [[ $? == 1 ]] && \ echo "" && \ echo "-------------------------------" && \ echo "Here is output of:" && \ echo " diff --ignore-trailing-space ../dockcross-$target-baseline ../dockcross-$target-current" && \ echo "" && \ diff --ignore-trailing-space ../dockcross-$target-baseline ../dockcross-$target-current done ``` Output: ``` ------------------------------- Here is output of: diff --ignore-trailing-space ../dockcross-make-baseline ../dockcross-make-current 8a9 > docker build -t dockcross/linux-ppc64le linux-ppc64le 10a12,14 > cp -r test browser-asmjs/ > docker build -t dockcross/browser-asmjs browser-asmjs > rm -rf browser-asmjs/test ------------------------------- Here is output of: diff --ignore-trailing-space ../dockcross-make-test-baseline ../dockcross-make-test-current 24a25,27 > docker build -t dockcross/linux-ppc64le linux-ppc64le > docker run --rm dockcross/linux-ppc64le > bin/dockcross-linux-ppc64le && chmod +x bin/dockcross-linux-ppc64le > bin/dockcross-linux-ppc64le python test/run.py --languages C 30a34,38 > cp -r test browser-asmjs/ > docker build -t dockcross/browser-asmjs browser-asmjs > rm -rf browser-asmjs/test > docker run --rm dockcross/browser-asmjs > bin/dockcross-browser-asmjs && chmod +x bin/dockcross-browser-asmjs > bin/dockcross-browser-asmjs python test/run.py --exe-suffix ".js" ```
2016-09-26 05:28:23 +02:00
display_images:
for image in $(IMAGES); do echo $$image; done
Makefile: Add "display_default_images" and "display_all_images" targets
2016-09-26 01:46:49 +02:00
Makefile: All images are tested. Remove ALL_IMAGES and DEFAULT_IMAGES vars. To confirm that the Makefiles works as expected after this patch, the list of executed commands before and after has been 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 --ignore-trailing-space ../dockcross-$target-baseline ../dockcross-$target-current> /dev/null 2>&1 [[ $? == 1 ]] && \ echo "" && \ echo "-------------------------------" && \ echo "Here is output of:" && \ echo " diff --ignore-trailing-space ../dockcross-$target-baseline ../dockcross-$target-current" && \ echo "" && \ diff --ignore-trailing-space ../dockcross-$target-baseline ../dockcross-$target-current done ``` Output: ``` ------------------------------- Here is output of: diff --ignore-trailing-space ../dockcross-make-baseline ../dockcross-make-current 8a9 > docker build -t dockcross/linux-ppc64le linux-ppc64le 10a12,14 > cp -r test browser-asmjs/ > docker build -t dockcross/browser-asmjs browser-asmjs > rm -rf browser-asmjs/test ------------------------------- Here is output of: diff --ignore-trailing-space ../dockcross-make-test-baseline ../dockcross-make-test-current 24a25,27 > docker build -t dockcross/linux-ppc64le linux-ppc64le > docker run --rm dockcross/linux-ppc64le > bin/dockcross-linux-ppc64le && chmod +x bin/dockcross-linux-ppc64le > bin/dockcross-linux-ppc64le python test/run.py --languages C 30a34,38 > cp -r test browser-asmjs/ > docker build -t dockcross/browser-asmjs browser-asmjs > rm -rf browser-asmjs/test > docker run --rm dockcross/browser-asmjs > bin/dockcross-browser-asmjs && chmod +x bin/dockcross-browser-asmjs > bin/dockcross-browser-asmjs python test/run.py --exe-suffix ".js" ```
2016-09-26 05:28:23 +02:00
$(VERBOSE).SILENT: display_images
Makefile: Add "display_default_images" and "display_all_images" targets
2016-09-26 01:46:49 +02:00
Makefile: Add comments and move implicit rules at the end of the file 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 --ignore-trailing-space ../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-26 00:38:26 +02:00
#
# build implicit rule
#
Implement "ct-ng" building, add "linux-mips". Add a mechanism to construct a full cross-compiler environment using the "crosstool-ng" cross-compiler building utility. This is implemented in the new "common.crosstool" include, and augments the "dockcross/base" base image. Update Makefile to consolidate Dockerfile generation, notably the "sed"-based inclusion directives. Finally, employ all of this to generate a "linux-mips" 32-bit hard-float MIPS cross-compiler Dockcross image.
2017-04-26 21:21:27 +02:00
$(STANDARD_IMAGES): %: %/Dockerfile base
makefile: Ensure imagefiles are available in build image context
2016-11-25 21:51:38 +01:00
mkdir -p $@/imagefiles && cp -r imagefiles $@/
ci: Use CircleCI 2.0 Addresses #156
2017-08-27 05:48:47 +02:00
$(DOCKER) build -t $(ORG)/$@:latest \
dockerfile: Keep track of buildtime metadata This commit build each images with the following arguments: * IMAGE: Name of the image (e.g dockcross/base, dockcross/manylinux-x64, ...) * VCS_REF: dockcross/dockcross commit from which this image is built * VCS_URL: this repository obtained reading remote.origin.url * BUILD_DATE: Date and time when the build was initiated Then, within the Dockerfile, the metadata are associated with the image using the "LABEL" instruction. See https://docs.docker.com/engine/reference/builder/#/label The corresponding labels can be found here: http://label-schema.org/rc1/#build-time-labels See #28
2016-10-31 04:57:04 +01:00
--build-arg IMAGE=$(ORG)/$@ \
--build-arg VCS_REF=`git rev-parse --short HEAD` \
--build-arg VCS_URL=`git config --get remote.origin.url` \
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
$@
makefile: Ensure imagefiles are available in build image context
2016-11-25 21:51:38 +01:00
rm -rf $@/imagefiles
Makefile: Add comments and move implicit rules at the end of the file 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 --ignore-trailing-space ../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-26 00:38:26 +02:00
#
# testing implicit rule
#
.SECONDEXPANSION:
$(addsuffix .test,$(STANDARD_IMAGES)): $$(basename $$@)
Makefile: Do not specify "--rm" docker run argument when executing on CircleCI This will avoid the "Driver btrfs failed to remove" error message when executing the command on CircleCI. See https://circleci.com/docs/docker-btrfs-error/
2016-11-29 02:01:39 +01:00
$(DOCKER) run $(RM) dockcross/$(basename $@) > $(BIN)/dockcross-$(basename $@) && chmod +x $(BIN)/dockcross-$(basename $@)
Makefile: Add comments and move implicit rules at the end of the file 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 --ignore-trailing-space ../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-26 00:38:26 +02:00
$(BIN)/dockcross-$(basename $@) python test/run.py $($@_ARGS)
Makefile: Make sure BIN directory exist when running any test This commit allows to run any test directly after checking out the source code.
2016-09-26 06:21:16 +02:00
#
# testing prerequisites implicit rule
#
test.prerequisites:
mkdir -p $(BIN)
Makefile: Make sure base.test also create bin directory This commit fixes a regression [1] introduced in 606d0b3 (Makefile: Make sure BIN directory exist when running any test) Reported below the dry-run summary before and after, we can confirm the bin directory is now created when building the `base.test` target. Before: $ make base.test --dry-run docker build -t dockcross/base . docker run --rm dockcross/base > bin/dockcross-base && chmod +x bin/dockcross-base After: $ make base.test --dry-run docker build -t dockcross/base . mkdir -p bin docker run --rm dockcross/base > bin/dockcross-base && chmod +x bin/dockcross-base [1] Error fixed by this commit: Successfully built e6388fe49824 docker run --rm dockcross/base > bin/dockcross-base && chmod +x bin/dockcross-base /bin/sh: 1: cannot create bin/dockcross-base: Directory nonexistent make: *** [base.test] Error 2 make base.test returned exit code 2
2016-09-26 17:38:43 +02:00
$(addsuffix .test,base $(IMAGES)): test.prerequisites
Makefile: Make sure BIN directory exist when running any test This commit allows to run any test directly after checking out the source code.
2016-09-26 06:21:16 +02:00
Makefile: All images are tested. Remove ALL_IMAGES and DEFAULT_IMAGES vars. To confirm that the Makefiles works as expected after this patch, the list of executed commands before and after has been 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 --ignore-trailing-space ../dockcross-$target-baseline ../dockcross-$target-current> /dev/null 2>&1 [[ $? == 1 ]] && \ echo "" && \ echo "-------------------------------" && \ echo "Here is output of:" && \ echo " diff --ignore-trailing-space ../dockcross-$target-baseline ../dockcross-$target-current" && \ echo "" && \ diff --ignore-trailing-space ../dockcross-$target-baseline ../dockcross-$target-current done ``` Output: ``` ------------------------------- Here is output of: diff --ignore-trailing-space ../dockcross-make-baseline ../dockcross-make-current 8a9 > docker build -t dockcross/linux-ppc64le linux-ppc64le 10a12,14 > cp -r test browser-asmjs/ > docker build -t dockcross/browser-asmjs browser-asmjs > rm -rf browser-asmjs/test ------------------------------- Here is output of: diff --ignore-trailing-space ../dockcross-make-test-baseline ../dockcross-make-test-current 24a25,27 > docker build -t dockcross/linux-ppc64le linux-ppc64le > docker run --rm dockcross/linux-ppc64le > bin/dockcross-linux-ppc64le && chmod +x bin/dockcross-linux-ppc64le > bin/dockcross-linux-ppc64le python test/run.py --languages C 30a34,38 > cp -r test browser-asmjs/ > docker build -t dockcross/browser-asmjs browser-asmjs > rm -rf browser-asmjs/test > docker run --rm dockcross/browser-asmjs > bin/dockcross-browser-asmjs && chmod +x bin/dockcross-browser-asmjs > bin/dockcross-browser-asmjs python test/run.py --exe-suffix ".js" ```
2016-09-26 05:28:23 +02:00
.PHONY: base images $(IMAGES) test %.test
Reference in New Issue Copy Permalink