diff --git a/assets/windows.mk b/assets/windows.mk index 14061fb..ace9393 100644 --- a/assets/windows.mk +++ b/assets/windows.mk @@ -19,21 +19,15 @@ docker : docker build -t $(image) - < submodules/windows/linux/assets/Dockerfile +build_commands=build-arch buildsymbols-arch package-arch grab-build-artifact-arch build : - - pwd - rm -rf windows - git clone https://gitlab.com/librewolf-community/browser/windows.git - - ( cd windows/linux && pwd && ${MAKE} fetch ) - ifeq ($(use_docker),false) - ( cd windows/linux && ${MAKE} ) + ( cd submodules/windows/linux && ${MAKE} $(build_commands) ) else - docker run --rm -v $(shell pwd)/windows/linux:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/$(distro) sh -c "${MAKE} all" + docker run --rm -v $(shell pwd)/submodules/windows/linux:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/$(distro) sh -c "${MAKE} $(build_commands)" endif - cp -v windows/linux/$(outfiles) . + cp -v submodules/windows/linux/$(outfiles) . sha256sum $(outfile-exe) > $(outfile-exe).sha256sum cat $(outfile-exe).sha256sum diff --git a/submodules/windows b/submodules/windows index 5fd44e2..420f154 160000 --- a/submodules/windows +++ b/submodules/windows @@ -1 +1 @@ -Subproject commit 5fd44e22af0d80ad19f69dba65ba304e63e4a0f5 +Subproject commit 420f1540b78d3c39ea7178fd8ec48f20c16c1587