From 78aad0d382f9b55e291075ea4782d779c5402c62 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Wed, 27 Apr 2022 10:10:20 +0200 Subject: [PATCH] fixed the bogus check target --- .gitignore | 1 + Makefile | 19 ++++++++++--------- tools.py => assets/tools.py | 0 mk.py | 4 ++-- source_release | 2 +- 5 files changed, 14 insertions(+), 12 deletions(-) rename tools.py => assets/tools.py (100%) diff --git a/.gitignore b/.gitignore index 1d61024..1788351 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +__pycache__ /.vs /firefox-* /librewolf diff --git a/Makefile b/Makefile index ce4379b..2a243de 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY : help all clean veryclean fetch build artifacts check +.PHONY : help all clean veryclean fetch build artifacts update help : @echo "Use: make [all] [clean] [veryclean] [check] ..." @@ -6,7 +6,7 @@ help : @echo " all - Build librewolf and it's windows artifacts." @echo " clean - Remove output files and temporary files." @echo " veryclean - Like 'clean', but also remove all downloaded files." - @echo " check - Check if there is a new version of Firefox." + @echo " update - update 'version' and 'source_release' files." @echo "" @echo " fetch - Fetch the latest librewolf source." @echo " build - Perform './mach build && ./mach package' on it." @@ -28,6 +28,14 @@ veryclean : clean rm -rf librewolf-$(shell cat version)-$(shell cat source_release) rm -f librewolf-$(shell cat version)-*.source.tar.gz* +update : + @echo "Fetching from gitlab.." + @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" + @echo "" + @echo Version: $(shell cat version)-$(shell cat source_release) + @echo Windows release version: $(shell cat release) + fetch : python3 mk.py fetch @@ -39,10 +47,3 @@ debug : artifacts : python3 mk.py artifacts - -check : README.md - @python3 assets/update-version.py - @wget -q -O source_release https://gitlab.com/librewolf-community/browser/source/-/raw/main/release - @echo " Current Windows release:" $$(cat ./release) - - diff --git a/tools.py b/assets/tools.py similarity index 100% rename from tools.py rename to assets/tools.py diff --git a/mk.py b/mk.py index 597a3fd..e597587 100644 --- a/mk.py +++ b/mk.py @@ -2,8 +2,8 @@ import os,sys,subprocess,os.path -import tools -from tools import exec, patch +import assets.tools +from assets.tools import exec, patch # # main functions diff --git a/source_release b/source_release index d00491f..00750ed 100644 --- a/source_release +++ b/source_release @@ -1 +1 @@ -1 +3