diff --git a/build.py b/build.py index 61e492c..b0a1bba 100755 --- a/build.py +++ b/build.py @@ -397,8 +397,8 @@ def execute_lw_artifacts(): if options.distro != 'osx': if options.distro == 'win': exec("mv -v {}/firefox{} {}/librewolf{}".format(librewolfdir,exe,librewolfdir,exe)); - exec("rm -rf {}/maintainanceservice* {}/pingsender* {}/firefox.*.xml {}/precomplete {}/removed-files {}/uninstall" - .format(librewolfdir,librewolfdir,librewolfdir,librewolfdir,librewolfdir,librewolfdir,librewolfdir)) + exec("rm -rf {}/default-browser-agent* {}/maintainanceservice* {}/pingsender* {}/firefox.*.xml {}/precomplete {}/removed-files {}/uninstall" + .format(librewolfdir,librewolfdir,librewolfdir,librewolfdir,librewolfdir,librewolfdir,librewolfdir,librewolfdir)) exec("cp -v common/source_files/browser/branding/librewolf/firefox.ico {}/librewolf.ico".format(librewolfdir)) if options.distro != 'win': exec("cp -v files/register-librewolf files/start-librewolf files/start-librewolf.desktop.in librewolf") diff --git a/docker/Makefile b/docker/Makefile index dd9d8f0..3eaa276 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -46,10 +46,10 @@ mint20 : make -C buildenv/mint20 cp version librewolf/mint20 make -C librewolf/mint20 -ubuntu : - make -C buildenv/ubuntu - cp version librewolf/ubuntu - make -C librewolf/ubuntu +ubuntu20 : + make -C buildenv/ubuntu20 + cp version librewolf/ubuntu20 + make -C librewolf/ubuntu20 low_disk : cp version librewolf @@ -63,5 +63,5 @@ low_disk : make prune make mint20 make prunt - make ubuntu + make ubuntu20 make prune diff --git a/docker/librewolf/Makefile b/docker/librewolf/Makefile index dbb7943..27debf7 100644 --- a/docker/librewolf/Makefile +++ b/docker/librewolf/Makefile @@ -19,6 +19,11 @@ all : clean : rm -f version debian10/version debian11/version fedora/version ubuntu20/version mint20/version arch/version macos/version windows/version portable-linux/version make -C portable-linux clean + make -C debian10 clean + make -C debian11 clean + make -C fedora clean + make -C mint20 clean + make -C ubuntu20 clean build.debian10 : make -C debian10 diff --git a/docker/librewolf/debian10/Makefile b/docker/librewolf/debian10/Makefile index 8e7d9cb..19d9260 100644 --- a/docker/librewolf/debian10/Makefile +++ b/docker/librewolf/debian10/Makefile @@ -6,3 +6,5 @@ no-cache : sudo docker build --no-cache -t librewolf/release-debian10 . make -C deb no-cache +clean : + make -C deb clean diff --git a/docker/librewolf/debian10/deb/Makefile b/docker/librewolf/debian10/deb/Makefile index 296ed80..22b9c54 100644 --- a/docker/librewolf/debian10/deb/Makefile +++ b/docker/librewolf/debian10/deb/Makefile @@ -14,6 +14,9 @@ no-cache : sudo docker build --no-cache -t librewolf/$(docker_stage) . make get_zip +clean : + sudo rm -f build_tag artifacts/build_tag + get_zip : build_tag build_tag : artifacts/build_tag diff --git a/docker/librewolf/debian11/Makefile b/docker/librewolf/debian11/Makefile index e21ebd1..56418a3 100644 --- a/docker/librewolf/debian11/Makefile +++ b/docker/librewolf/debian11/Makefile @@ -6,3 +6,5 @@ no-cache : sudo docker build --no-cache -t librewolf/release-debian11 . make -C deb no-cache +clean : + make -C deb clean diff --git a/docker/librewolf/debian11/deb/Makefile b/docker/librewolf/debian11/deb/Makefile index a9a3aac..80c1c13 100644 --- a/docker/librewolf/debian11/deb/Makefile +++ b/docker/librewolf/debian11/deb/Makefile @@ -14,6 +14,9 @@ no-cache : sudo docker build --no-cache -t librewolf/$(docker_stage) . make get_zip +clean : + sudo rm -f build_tag artifacts/build_tag + get_zip : build_tag build_tag : artifacts/build_tag diff --git a/docker/librewolf/fedora/Makefile b/docker/librewolf/fedora/Makefile index bbe3457..59dffa0 100644 --- a/docker/librewolf/fedora/Makefile +++ b/docker/librewolf/fedora/Makefile @@ -6,3 +6,5 @@ no-cache : sudo docker build --no-cache -t librewolf/release-fedora . make -C rpm no-cache +clean : + make -C rpm clean diff --git a/docker/librewolf/mint20/Makefile b/docker/librewolf/mint20/Makefile index 1658935..5f0bdae 100644 --- a/docker/librewolf/mint20/Makefile +++ b/docker/librewolf/mint20/Makefile @@ -6,3 +6,5 @@ no-cache : sudo docker build --no-cache -t librewolf/release-mint20 . make -C deb no-cache +clean : + make -C deb clean diff --git a/docker/librewolf/mint20/deb/Makefile b/docker/librewolf/mint20/deb/Makefile index ef9f4a8..c37525e 100644 --- a/docker/librewolf/mint20/deb/Makefile +++ b/docker/librewolf/mint20/deb/Makefile @@ -14,6 +14,9 @@ no-cache : sudo docker build --no-cache -t librewolf/$(docker_stage) . make get_zip +clean : + sudo rm -f build_tag artifacts/build_tag + get_zip : build_tag build_tag : artifacts/build_tag diff --git a/docker/librewolf/ubuntu20/Makefile b/docker/librewolf/ubuntu20/Makefile index b150dcd..9931208 100644 --- a/docker/librewolf/ubuntu20/Makefile +++ b/docker/librewolf/ubuntu20/Makefile @@ -6,3 +6,5 @@ no-cache : sudo docker build --no-cache -t librewolf/release-ubuntu20 . make -C deb no-cache +clean : + make -C deb clean diff --git a/docker/librewolf/ubuntu20/deb/Makefile b/docker/librewolf/ubuntu20/deb/Makefile index 75721f3..a4459b0 100644 --- a/docker/librewolf/ubuntu20/deb/Makefile +++ b/docker/librewolf/ubuntu20/deb/Makefile @@ -14,6 +14,9 @@ no-cache : sudo docker build --no-cache -t librewolf/$(docker_stage) . make get_zip +clean : + sudo rm -f build_tag artifacts/build_tag + get_zip : build_tag diff --git a/docker/version b/docker/version index 34de4d2..8b3541c 100644 --- a/docker/version +++ b/docker/version @@ -1 +1 @@ -92.0.1 +93.0