From 76992abd6731034f7a94bb8c347a1696cde167e3 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Tue, 7 Feb 2023 12:23:49 +0100 Subject: [PATCH] fix2 --- assets/windows.mk | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/assets/windows.mk b/assets/windows.mk index c244815..ee6b249 100644 --- a/assets/windows.mk +++ b/assets/windows.mk @@ -1,7 +1,7 @@ # windows.mk - this one is quite a bit different from the others, # but we can fix that later. -.PHONY : docker build +.PHONY : docker build do-build version:=$(shell cat version) release:=$(shell cat release) @@ -16,15 +16,22 @@ distro=windows image=registry.gitlab.com/librewolf-community/browser/bsys5/$(distro):latest docker : + docker build -t $(image) - < assets/windows.Dockerfile build : + pwd - ls -a - make fetch - make all - cp -v $(outfiles) / - ( cd / && sha256sum $(outfile-exe) > $(outfile-exe).sha256sum ) - cat /$(outfile-exe).sha256sum - ( cd / && sha256sum $(outfile-zip) > $(outfile-zip).sha256sum ) + git clone https://gitlab.com/librewolf-community/browser/windows.git + ${MAKE} -C windows/linux do-build + sha256sum $(outfile-exe) > $(outfile-exe).sha256sum + cat $(outfile-exe).sha256sum + sha256sum $(outfile-zip) > $(outfile-zip).sha256sum cat /$(outfile-zip).sha256sum + +do-build : + + pwd + ${MAKE} fetch + ${MAKE} all + cp -v $(outfiles) ../..