From e4d87bb6eaad940957484344ba3ab64f869dd7bd Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sun, 25 Sep 2022 20:55:32 +0200 Subject: [PATCH] adding fetch target --- linux-mar/Makefile | 18 ++++++++++++++---- linux-mar/release | 1 + linux/Makefile | 14 ++++++++++++-- linux/release | 1 + 4 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 linux-mar/release create mode 100644 linux/release diff --git a/linux-mar/Makefile b/linux-mar/Makefile index 691ca2d..9437a86 100644 --- a/linux-mar/Makefile +++ b/linux-mar/Makefile @@ -1,4 +1,4 @@ -.PHONY : help all clean build artifacts dir bootstrap winsdk setup-debian setup-fedora veryclean +.PHONY : help fetch all clean build artifacts dir bootstrap winsdk setup-debian setup-fedora veryclean version:=$(shell cat version) release:=$(shell cat release) @@ -10,6 +10,7 @@ help : @echo "use: make [help] [all] [clean] [build] [package] [artifacts]" @echo "" + @echo " fetch - get the latest tarball. must be done first, at least once." @echo " all - Build librewolf and it's windows artifacts." @echo " build - Perform './mach build' on the extracted tarball." @echo " package - multilocale package." @@ -24,12 +25,21 @@ help : all : build package artifacts +fetch : + wget -q -O version "https://gitlab.com/librewolf-community/browser/source/-/raw/main/version" + wget -q -O source_release "https://gitlab.com/librewolf-community/browser/source/-/raw/main/release" + wget -q -O "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum" "https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum?job=Build" + wget -q -O "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz" "https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$$(cat version)-$$(cat source_release).source.tar.gz?job=Build" + cat "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum" + sha256sum -c "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum" + clean : rm -rf librewolf-$(full_version) work veryclean : clean rm -rf firefox-$(full_version).en-US.win64.zip librewolf-$(full_version).en-US.win64-setup.exe librewolf-$(full_version).en-US.win64-portable.zip - + rm -f "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz" "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum" + rm -f version source_release build : dir (cd librewolf-$(full_version) && ./mach build) @@ -81,9 +91,9 @@ setup-fedora : # Build the artifacts in a seperate Makefile # -librewolf-$(full_version).en-US.win64.zip : # build stage output artifact +firefox-$(full_version).en-US.win64.zip : # build stage output artifact cp -v librewolf-$(full_version)/obj-x86_64-pc-mingw32/dist/firefox-$(version)-$(source_release).en-US.win64.zip . -artifacts : librewolf-$(full_version).en-US.win64.zip +artifacts : firefox-$(full_version).en-US.win64.zip ${MAKE} -f assets/artifacts.mk artifacts diff --git a/linux-mar/release b/linux-mar/release new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/linux-mar/release @@ -0,0 +1 @@ +1 diff --git a/linux/Makefile b/linux/Makefile index ddf85c4..9437a86 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -1,4 +1,4 @@ -.PHONY : help all clean build artifacts dir bootstrap winsdk setup-debian setup-fedora veryclean +.PHONY : help fetch all clean build artifacts dir bootstrap winsdk setup-debian setup-fedora veryclean version:=$(shell cat version) release:=$(shell cat release) @@ -10,6 +10,7 @@ help : @echo "use: make [help] [all] [clean] [build] [package] [artifacts]" @echo "" + @echo " fetch - get the latest tarball. must be done first, at least once." @echo " all - Build librewolf and it's windows artifacts." @echo " build - Perform './mach build' on the extracted tarball." @echo " package - multilocale package." @@ -24,12 +25,21 @@ help : all : build package artifacts +fetch : + wget -q -O version "https://gitlab.com/librewolf-community/browser/source/-/raw/main/version" + wget -q -O source_release "https://gitlab.com/librewolf-community/browser/source/-/raw/main/release" + wget -q -O "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum" "https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum?job=Build" + wget -q -O "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz" "https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$$(cat version)-$$(cat source_release).source.tar.gz?job=Build" + cat "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum" + sha256sum -c "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum" + clean : rm -rf librewolf-$(full_version) work veryclean : clean rm -rf firefox-$(full_version).en-US.win64.zip librewolf-$(full_version).en-US.win64-setup.exe librewolf-$(full_version).en-US.win64-portable.zip - + rm -f "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz" "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum" + rm -f version source_release build : dir (cd librewolf-$(full_version) && ./mach build) diff --git a/linux/release b/linux/release new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/linux/release @@ -0,0 +1 @@ +1