mirror of
				https://github.com/bensuperpc/dockcross.git
				synced 2025-10-31 08:06:23 +01:00 
			
		
		
		
	 09868d5289
			
		
	
	09868d5289
	
	
	
		
			
			This commit updates the "browser-asmjs" images to avoid systematic rebuild of emscripten sdk. Instead, it introduces dependency on the image maintained by @trzeci Note also: * emscripten sdk updated from 1.36.7 to 1.36.14 * symlinking of "/bin/bash" as "/bin/sh" is reverted. This ensures other images including file like "common.debian" and relying on standard "sh" behavior will work as expected. * workaround associated with CMakeForceCompiler has been removed from Dockerfile. Emscripten as been fixed. See https://github.com/kripken/emscripten/pull/4477 * we will revisit once official images are available. See https://github.com/kripken/emscripten/issues/4682
		
			
				
	
	
		
			154 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			Makefile
		
	
	
	
	
	
			
		
		
	
	
			154 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			Makefile
		
	
	
	
	
	
| 
 | |
| #
 | |
| # Parameters
 | |
| #
 | |
| 
 | |
| # Name of the docker executable
 | |
| DOCKER = docker
 | |
| 
 | |
| # Docker organization to pull the images from
 | |
| ORG = dockcross
 | |
| 
 | |
| # Directory where to generate the dockcross script for each images (e.g bin/dockcross-manylinux-x64)
 | |
| BIN = ./bin
 | |
| 
 | |
| # These images are built using the "build implicit rule"
 | |
| STANDARD_IMAGES = android-arm linux-x86 linux-x64 linux-arm64 linux-armv5 linux-armv6 linux-armv7 linux-ppc64le windows-x86 windows-x64
 | |
| 
 | |
| # These images are expected to have explicit rules for *both* build and testing
 | |
| NON_STANDARD_IMAGES = browser-asmjs manylinux-x64 manylinux-x86
 | |
| 
 | |
| # This list all available images
 | |
| IMAGES = $(STANDARD_IMAGES) $(NON_STANDARD_IMAGES)
 | |
| 
 | |
| # Optional arguments for test runner (test/run.py) associated with "testing implicit rule"
 | |
| linux-ppc64le.test_ARGS = --languages C
 | |
| windows-x86.test_ARGS = --exe-suffix ".exe"
 | |
| windows-x64.test_ARGS = --exe-suffix ".exe"
 | |
| 
 | |
| #
 | |
| # images: This target builds all IMAGES (because it is the first one, it is built by default)
 | |
| #
 | |
| images: base $(IMAGES)
 | |
| 
 | |
| #
 | |
| # test: This target ensures all IMAGES are built and run the associated tests
 | |
| #
 | |
| test: base.test $(addsuffix .test,$(IMAGES))
 | |
| 
 | |
| #
 | |
| # browser-asmjs
 | |
| #
 | |
| browser-asmjs: base browser-asmjs/Dockerfile.in common.docker common.debian
 | |
| 	sed -e '/common.docker/ r common.docker' -e '/common.debian/ r common.debian' $@/Dockerfile.in > $@/Dockerfile
 | |
| 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 | |
| 	cp -r test browser-asmjs/
 | |
| 	$(DOCKER) build -t $(ORG)/browser-asmjs \
 | |
| 		--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
 | |
| 	rm -rf browser-asmjs/test
 | |
| 	rm -rf $@/imagefiles
 | |
| 
 | |
| browser-asmjs.test: browser-asmjs
 | |
| 	cp -r test browser-asmjs/
 | |
| 	$(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"
 | |
| 	rm -rf browser-asmjs/test
 | |
| 
 | |
| #
 | |
| # manylinux-x64
 | |
| #
 | |
| manylinux-x64/Dockerfile: manylinux-x64/Dockerfile.in common.docker common.manylinux
 | |
| 	sed -e '/common.docker/ r common.docker' -e '/common.manylinux/ r common.manylinux' manylinux-x64/Dockerfile.in > manylinux-x64/Dockerfile
 | |
| 
 | |
| manylinux-x64: manylinux-x64/Dockerfile
 | |
| 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 | |
| 	$(DOCKER) build -t $(ORG)/manylinux-x64 \
 | |
| 		--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 .
 | |
| 	rm -rf $@/imagefiles
 | |
| 
 | |
| manylinux-x64.test: manylinux-x64
 | |
| 	$(DOCKER) run --rm dockcross/manylinux-x64 > $(BIN)/dockcross-manylinux-x64 && chmod +x $(BIN)/dockcross-manylinux-x64
 | |
| 	$(BIN)/dockcross-manylinux-x64 /opt/python/cp35-cp35m/bin/python test/run.py
 | |
| 
 | |
| #
 | |
| # manylinux-x86
 | |
| #
 | |
| manylinux-x86/Dockerfile: manylinux-x86/Dockerfile.in common.docker common.manylinux
 | |
| 	sed -e '/common.docker/ r common.docker' -e '/common.manylinux/ r common.manylinux' manylinux-x86/Dockerfile.in > manylinux-x86/Dockerfile
 | |
| 
 | |
| manylinux-x86: manylinux-x86/Dockerfile
 | |
| 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 | |
| 	$(DOCKER) build -t $(ORG)/manylinux-x86 \
 | |
| 		--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 .
 | |
| 	rm -rf $@/imagefiles
 | |
| 
 | |
| manylinux-x86.test: manylinux-x86
 | |
| 	$(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
 | |
| 
 | |
| #
 | |
| # base
 | |
| #
 | |
| Dockerfile: Dockerfile.in common.docker common.debian
 | |
| 	sed -e '/common.docker/ r common.docker' -e '/common.debian/ r common.debian' Dockerfile.in > Dockerfile
 | |
| 
 | |
| base: Dockerfile imagefiles/
 | |
| 	$(DOCKER) build -t $(ORG)/base \
 | |
| 		--build-arg IMAGE=$(ORG)/base \
 | |
| 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 | |
| 		.
 | |
| 
 | |
| base.test: base
 | |
| 	$(DOCKER) run --rm dockcross/base > $(BIN)/dockcross-base && chmod +x $(BIN)/dockcross-base
 | |
| 
 | |
| #
 | |
| # display
 | |
| #
 | |
| display_images:
 | |
| 	for image in $(IMAGES); do echo $$image; done
 | |
| 
 | |
| $(VERBOSE).SILENT: display_images
 | |
| 
 | |
| #
 | |
| # build implicit rule
 | |
| #
 | |
| $(STANDARD_IMAGES): base
 | |
| 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 | |
| 	$(DOCKER) build -t $(ORG)/$@ \
 | |
| 		--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"` \
 | |
| 		$@
 | |
| 	rm -rf $@/imagefiles
 | |
| 
 | |
| #
 | |
| # testing implicit rule
 | |
| #
 | |
| .SECONDEXPANSION:
 | |
| $(addsuffix .test,$(STANDARD_IMAGES)): $$(basename $$@)
 | |
| 	$(DOCKER) run --rm dockcross/$(basename $@) > $(BIN)/dockcross-$(basename $@) && chmod +x $(BIN)/dockcross-$(basename $@)
 | |
| 	$(BIN)/dockcross-$(basename $@) python test/run.py $($@_ARGS)
 | |
| 
 | |
| #
 | |
| # testing prerequisites implicit rule
 | |
| #
 | |
| test.prerequisites:
 | |
| 	mkdir -p $(BIN)
 | |
| 
 | |
| $(addsuffix .test,base $(IMAGES)): test.prerequisites
 | |
| 
 | |
| .PHONY: base images $(IMAGES) test %.test
 |