From b8eb667f83754021a7504a9bae964f038c6ddec7 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 20 Apr 2023 10:49:40 +0200 Subject: [PATCH] big cleanup --- README.md | 2 +- .../librewolf-portable/.gitignore | 0 .../librewolf-portable/README.md | 0 .../librewolf-portable/Resource.h | 0 .../librewolf-portable/build.bat | 0 .../librewolf-portable/librewolf-portable.aps | Bin .../librewolf-portable/librewolf-portable.cpp | 0 .../librewolf-portable/librewolf-portable.ico | Bin .../librewolf-portable/librewolf-portable.rc | Bin .../librewolf-portable/librewolf-portable.sln | 0 .../librewolf-portable.vcxproj | 0 .../librewolf-portable.vcxproj.filters | 0 .../librewolf-portable.vcxproj.user | 0 .../librewolf-portable/targetver.h | 0 linux-mar/Makefile | 101 ------ linux-mar/assets/artifacts.mk | 12 - linux-mar/assets/banner.bmp | Bin 154542 -> 0 bytes linux-mar/assets/fix-l10n-package-cmd.patch | 20 -- linux-mar/assets/librewolf.ico | Bin 32038 -> 0 bytes linux-mar/assets/mozconfig | 72 ---- linux-mar/assets/tryfix-reslink-fail.patch | 13 - linux-mar/release | 1 - linux/Makefile | 244 ------------- linux/assets/Dockerfile | 71 ---- linux/assets/artifacts.mk | 99 ------ linux/assets/banner.bmp | Bin 154542 -> 0 bytes linux/assets/fix-l10n-package-cmd.patch | 20 -- linux/assets/librewolf.ico | Bin 32038 -> 0 bytes linux/assets/mozconfig | 86 ----- linux/assets/mozconfig.arch | 5 - linux/assets/setup.nsi | 176 --------- linux/assets/tryfix-reslink-fail.patch | 13 - linux/release | 1 - winbuild/Makefile | 65 ---- winbuild/assets/PrivateBrowsing_150.png | Bin 16207 -> 0 bytes winbuild/assets/PrivateBrowsing_70.png | Bin 5931 -> 0 bytes winbuild/assets/aboutDialog/aboutDialog.css | 136 ------- winbuild/assets/aboutDialog/aboutDialog.js | 121 ------- winbuild/assets/aboutDialog/aboutDialog.xhtml | 168 --------- winbuild/assets/banner.bmp | Bin 154542 -> 0 bytes winbuild/assets/disable-verify-mar.patch | 26 -- winbuild/assets/fix-l10n-package-cmd.patch | 20 -- winbuild/assets/librewolf.ico | Bin 32038 -> 0 bytes winbuild/assets/mozconfig.windows | 43 --- winbuild/assets/mozconfig.windows.debug | 6 - winbuild/assets/mozconfig.windows32 | 11 - winbuild/assets/package-manifest.patch | 15 - ...rivate_browsing.VisualElementsManifest.xml | 12 - winbuild/assets/setup.nsi | 176 --------- winbuild/assets/tools.py | 50 --- winbuild/assets/tryfix-reslink-fail.patch | 13 - winbuild/assets/update-version.py | 142 -------- winbuild/mk.py | 336 ------------------ winbuild/release | 1 - winbuild/source_release | 1 - winbuild/version | 1 - 56 files changed, 1 insertion(+), 2278 deletions(-) rename {winbuild/assets => attic}/librewolf-portable/.gitignore (100%) rename {winbuild/assets => attic}/librewolf-portable/README.md (100%) rename {winbuild/assets => attic}/librewolf-portable/Resource.h (100%) rename {winbuild/assets => attic}/librewolf-portable/build.bat (100%) rename {winbuild/assets => attic}/librewolf-portable/librewolf-portable.aps (100%) rename {winbuild/assets => attic}/librewolf-portable/librewolf-portable.cpp (100%) rename {winbuild/assets => attic}/librewolf-portable/librewolf-portable.ico (100%) rename {winbuild/assets => attic}/librewolf-portable/librewolf-portable.rc (100%) rename {winbuild/assets => attic}/librewolf-portable/librewolf-portable.sln (100%) rename {winbuild/assets => attic}/librewolf-portable/librewolf-portable.vcxproj (100%) rename {winbuild/assets => attic}/librewolf-portable/librewolf-portable.vcxproj.filters (100%) rename {winbuild/assets => attic}/librewolf-portable/librewolf-portable.vcxproj.user (100%) rename {winbuild/assets => attic}/librewolf-portable/targetver.h (100%) delete mode 100644 linux-mar/Makefile delete mode 100644 linux-mar/assets/artifacts.mk delete mode 100644 linux-mar/assets/banner.bmp delete mode 100644 linux-mar/assets/fix-l10n-package-cmd.patch delete mode 100644 linux-mar/assets/librewolf.ico delete mode 100644 linux-mar/assets/mozconfig delete mode 100644 linux-mar/assets/tryfix-reslink-fail.patch delete mode 100644 linux-mar/release delete mode 100644 linux/Makefile delete mode 100644 linux/assets/Dockerfile delete mode 100644 linux/assets/artifacts.mk delete mode 100644 linux/assets/banner.bmp delete mode 100644 linux/assets/fix-l10n-package-cmd.patch delete mode 100644 linux/assets/librewolf.ico delete mode 100644 linux/assets/mozconfig delete mode 100644 linux/assets/mozconfig.arch delete mode 100644 linux/assets/setup.nsi delete mode 100644 linux/assets/tryfix-reslink-fail.patch delete mode 100644 linux/release delete mode 100644 winbuild/Makefile delete mode 100644 winbuild/assets/PrivateBrowsing_150.png delete mode 100644 winbuild/assets/PrivateBrowsing_70.png delete mode 100644 winbuild/assets/aboutDialog/aboutDialog.css delete mode 100644 winbuild/assets/aboutDialog/aboutDialog.js delete mode 100644 winbuild/assets/aboutDialog/aboutDialog.xhtml delete mode 100644 winbuild/assets/banner.bmp delete mode 100644 winbuild/assets/disable-verify-mar.patch delete mode 100644 winbuild/assets/fix-l10n-package-cmd.patch delete mode 100644 winbuild/assets/librewolf.ico delete mode 100644 winbuild/assets/mozconfig.windows delete mode 100644 winbuild/assets/mozconfig.windows.debug delete mode 100644 winbuild/assets/mozconfig.windows32 delete mode 100644 winbuild/assets/package-manifest.patch delete mode 100644 winbuild/assets/private_browsing.VisualElementsManifest.xml delete mode 100644 winbuild/assets/setup.nsi delete mode 100644 winbuild/assets/tools.py delete mode 100644 winbuild/assets/tryfix-reslink-fail.patch delete mode 100755 winbuild/assets/update-version.py delete mode 100644 winbuild/mk.py delete mode 100644 winbuild/release delete mode 100644 winbuild/source_release delete mode 100644 winbuild/version diff --git a/README.md b/README.md index 84e299b..192314c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# [Download latest release](https://gitlab.com/librewolf-community/browser/windows/-/releases) +# [Download latest release](https://gitlab.com/librewolf-community/browser/bsys6/-/releases) * Visit [the FAQ](https://librewolf.net/docs/faq/). * Install via _[chocolatey](https://community.chocolatey.org/packages/librewolf)_: `choco install librewolf` diff --git a/winbuild/assets/librewolf-portable/.gitignore b/attic/librewolf-portable/.gitignore similarity index 100% rename from winbuild/assets/librewolf-portable/.gitignore rename to attic/librewolf-portable/.gitignore diff --git a/winbuild/assets/librewolf-portable/README.md b/attic/librewolf-portable/README.md similarity index 100% rename from winbuild/assets/librewolf-portable/README.md rename to attic/librewolf-portable/README.md diff --git a/winbuild/assets/librewolf-portable/Resource.h b/attic/librewolf-portable/Resource.h similarity index 100% rename from winbuild/assets/librewolf-portable/Resource.h rename to attic/librewolf-portable/Resource.h diff --git a/winbuild/assets/librewolf-portable/build.bat b/attic/librewolf-portable/build.bat similarity index 100% rename from winbuild/assets/librewolf-portable/build.bat rename to attic/librewolf-portable/build.bat diff --git a/winbuild/assets/librewolf-portable/librewolf-portable.aps b/attic/librewolf-portable/librewolf-portable.aps similarity index 100% rename from winbuild/assets/librewolf-portable/librewolf-portable.aps rename to attic/librewolf-portable/librewolf-portable.aps diff --git a/winbuild/assets/librewolf-portable/librewolf-portable.cpp b/attic/librewolf-portable/librewolf-portable.cpp similarity index 100% rename from winbuild/assets/librewolf-portable/librewolf-portable.cpp rename to attic/librewolf-portable/librewolf-portable.cpp diff --git a/winbuild/assets/librewolf-portable/librewolf-portable.ico b/attic/librewolf-portable/librewolf-portable.ico similarity index 100% rename from winbuild/assets/librewolf-portable/librewolf-portable.ico rename to attic/librewolf-portable/librewolf-portable.ico diff --git a/winbuild/assets/librewolf-portable/librewolf-portable.rc b/attic/librewolf-portable/librewolf-portable.rc similarity index 100% rename from winbuild/assets/librewolf-portable/librewolf-portable.rc rename to attic/librewolf-portable/librewolf-portable.rc diff --git a/winbuild/assets/librewolf-portable/librewolf-portable.sln b/attic/librewolf-portable/librewolf-portable.sln similarity index 100% rename from winbuild/assets/librewolf-portable/librewolf-portable.sln rename to attic/librewolf-portable/librewolf-portable.sln diff --git a/winbuild/assets/librewolf-portable/librewolf-portable.vcxproj b/attic/librewolf-portable/librewolf-portable.vcxproj similarity index 100% rename from winbuild/assets/librewolf-portable/librewolf-portable.vcxproj rename to attic/librewolf-portable/librewolf-portable.vcxproj diff --git a/winbuild/assets/librewolf-portable/librewolf-portable.vcxproj.filters b/attic/librewolf-portable/librewolf-portable.vcxproj.filters similarity index 100% rename from winbuild/assets/librewolf-portable/librewolf-portable.vcxproj.filters rename to attic/librewolf-portable/librewolf-portable.vcxproj.filters diff --git a/winbuild/assets/librewolf-portable/librewolf-portable.vcxproj.user b/attic/librewolf-portable/librewolf-portable.vcxproj.user similarity index 100% rename from winbuild/assets/librewolf-portable/librewolf-portable.vcxproj.user rename to attic/librewolf-portable/librewolf-portable.vcxproj.user diff --git a/winbuild/assets/librewolf-portable/targetver.h b/attic/librewolf-portable/targetver.h similarity index 100% rename from winbuild/assets/librewolf-portable/targetver.h rename to attic/librewolf-portable/targetver.h diff --git a/linux-mar/Makefile b/linux-mar/Makefile deleted file mode 100644 index 36f3ab9..0000000 --- a/linux-mar/Makefile +++ /dev/null @@ -1,101 +0,0 @@ -.PHONY : help fetch all clean build artifacts dir bootstrap winsdk setup-debian setup-fedora veryclean - -version:=$(shell cat version) -release:=$(shell cat release) -source_release:=$(shell cat source_release) -full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)") -mozbuild=~/.mozbuild - -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 "" - @echo " all - Build librewolf and it's windows artifacts." - @echo " build - Perform './mach build' on the extracted tarball." - @echo " package - Make the multilocale package." - @echo " artifacts - Create the setup.exe and the portable.zip." - @echo "" - @echo " clean - Remove output files and temporary files." - @echo " veryclean - Remove even more stuff." - @echo " dir - just extract and patch the LW tarball." - @echo " bootstrap - try to set up the build environment." - @echo " setup-debian, setup-fedora - needed packages." - @echo "" - -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 --progress=bar:force -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) - -package : dir - ( cd librewolf-$(full_version) && echo 'Packaging... (output hidden)' && \ - cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales >/dev/null ) - -dir : librewolf-$(full_version) -librewolf-$(full_version) : librewolf-$(full_version).source.tar.gz - rm -rf $@ - tar xf $< - cp -v assets/mozconfig librewolf-$(full_version) - (cd librewolf-$(full_version) && patch -p1 -i ../assets/tryfix-reslink-fail.patch) - (cd librewolf-$(full_version) && patch -p1 -i ../assets/fix-l10n-package-cmd.patch) - -winsdk : $(mozbuild)/vs.tar.zst - (mkdir -p $(mozbuild)/win-cross && cd $(mozbuild)/win-cross && rm -rf vs && tar xf ../vs.tar.zst) -$(mozbuild)/vs.tar.zst : # cache this file - (cd librewolf-$(full_version) && ./mach --no-interactive python --virtualenv build build/vs/pack_vs.py build/vs/vs2019.yaml -o $(mozbuild)/vs.tar.zst) - -bootstrap : dir winsdk - (cd librewolf-$(full_version) && ./mach --no-interactive bootstrap --application-choice=browser) - ~/.cargo/bin/rustup target add x86_64-pc-windows-msvc - ( export t=$$(pwd)/librewolf-$(full_version) && \ - cd $(mozbuild) && \ - $$t/mach artifact toolchain --from-build linux64-binutils && \ - $$t/mach artifact toolchain --from-build linux64-cbindgen && \ - $$t/mach artifact toolchain --from-build linux64-clang && \ - $$t/mach artifact toolchain --from-build linux64-dump_syms && \ - $$t/mach artifact toolchain --from-build linux64-liblowercase && \ - $$t/mach artifact toolchain --from-build linux64-nasm && \ - $$t/mach artifact toolchain --from-build linux64-node && \ - $$t/mach artifact toolchain --from-build linux64-rust-cross && \ - $$t/mach artifact toolchain --from-build linux64-winchecksec && \ - $$t/mach artifact toolchain --from-build linux64-wine && \ - $$t/mach artifact toolchain --from-build nsis && \ - $$t/mach artifact toolchain --from-build sysroot-x86_64-linux-gnu && \ - true ) - -setup-debian : - apt-get -y install mercurial python3 python3-dev python3-pip curl wget dpkg-sig msitools p7zip-full upx-ucl libssl-dev zstd wine - -setup-fedora : - dnf -y install python3 curl wget zstd python3-devel python3-pip mercurial msitools p7zip upx openssl-devel wine - -# -# Build the artifacts in a seperate Makefile -# - -librewolf-$(full_version).en-US.win64.installer.exe : - cp librewolf-$(full_version)/obj-x86_64-pc-mingw32/dist/install/sea/librewolf-$(full_version).en-US.win64.installer.exe . - -artifacts : librewolf-$(full_version).en-US.win64.installer.exe - ${MAKE} -f assets/artifacts.mk artifacts - - - diff --git a/linux-mar/assets/artifacts.mk b/linux-mar/assets/artifacts.mk deleted file mode 100644 index 97ab8c1..0000000 --- a/linux-mar/assets/artifacts.mk +++ /dev/null @@ -1,12 +0,0 @@ -.PHONY: artifacts - -version:=$(shell cat version) -release:=$(shell cat release) -source_release:=$(shell cat source_release) -full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)") -mozbuild=~/.mozbuild - -incoming_artifact=librewolf-$(full_version).en-US.win64.installer.exe - -artifacts : - du -hs $(incoming_artifact) diff --git a/linux-mar/assets/banner.bmp b/linux-mar/assets/banner.bmp deleted file mode 100644 index 05fda40b27db5620b47b8a50d79582de81537a09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154542 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 diff --git a/linux-mar/assets/fix-l10n-package-cmd.patch b/linux-mar/assets/fix-l10n-package-cmd.patch deleted file mode 100644 index b6b66ec..0000000 --- a/linux-mar/assets/fix-l10n-package-cmd.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py -index 10d7a8f..610a4fa 100644 ---- a/python/mozbuild/mozbuild/mach_commands.py -+++ b/python/mozbuild/mozbuild/mach_commands.py -@@ -2457,6 +2457,7 @@ def package_l10n(command_context, verbose=False, locales=[]): - ) - command_context.run_process( - [ -+ "python3", - mozpath.join(command_context.topsrcdir, "mach"), - "build", - "chrome-{}".format(locale), -@@ -2476,6 +2477,7 @@ def package_l10n(command_context, verbose=False, locales=[]): - ) - command_context.run_process( - [ -+ "python3", - mozpath.join(command_context.topsrcdir, "mach"), - "android", - "assemble-app", diff --git a/linux-mar/assets/librewolf.ico b/linux-mar/assets/librewolf.ico deleted file mode 100644 index 30a72f168d8f1cb8689dc7913bc42c7ce70a4f92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32038 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 diff --git a/linux-mar/assets/mozconfig b/linux-mar/assets/mozconfig deleted file mode 100644 index 2a4c9c1..0000000 --- a/linux-mar/assets/mozconfig +++ /dev/null @@ -1,72 +0,0 @@ -# mozconfig - crosscompile from Linux to Windows - -export MOZBUILD=$HOME/.mozbuild -export WINDOWSSDKDIR="$MOZBUILD/win-cross/vs/windows kits/10" -ac_add_options --target=x86_64-pc-mingw32 -mk_add_options "export LD_PRELOAD=$MOZBUILD/liblowercase/liblowercase.so" -mk_add_options "export LOWERCASE_DIRS=$MOZBUILD/win-cross" - -EXTRA_PATH="$MOZBUILD/win-cross/vs/vc/tools/msvc/14.29.30133/bin/hostx64/x64:" -mk_add_options "export PATH=$EXTRA_PATH$PATH" - -export CC="$MOZBUILD/clang/bin/clang-cl" -export CXX="$MOZBUILD/clang/bin/clang-cl" -export HOST_CC="$MOZBUILD/clang/bin/clang" -export HOST_CXX="$MOZBUILD/clang/bin/clang++" - -export WINE="$MOZBUILD/wine/bin/wine64" - -### -# TODO : fixme -# - -ac_add_options --without-wasm-sandboxed-libraries - -### -# old config settings -# - -ac_add_options --enable-application=browser - -ac_add_options --allow-addon-sideload -ac_add_options --disable-crashreporter -ac_add_options --disable-debug -ac_add_options --disable-default-browser-agent -ac_add_options --disable-tests -# updater disabled in Settings repo (app.update.auto). -# ac_add_options --disable-updater -ac_add_options --enable-hardening -ac_add_options --enable-optimize -ac_add_options --enable-release -ac_add_options --enable-rust-simd - -ac_add_options --with-app-name=librewolf -ac_add_options --with-branding=browser/branding/nightly - -ac_add_options --with-unsigned-addon-scopes=app,system - -# see issue # https://gitlab.com/librewolf-community/browser/arch/-/issues/49 -export MOZ_REQUIRE_SIGNING= - -mk_add_options MOZ_CRASHREPORTER=0 -mk_add_options MOZ_DATA_REPORTING=0 -mk_add_options MOZ_NORMANTY=0 -mk_add_options MOZ_SERVICES_HEALTHREPORT=0 -mk_add_options MOZ_TELEMETRY_REPORTING=0 - -# -# windows specific. -# -# - no need to specify wasi sdk folder -# - -ac_add_options --disable-maintenance-service -ac_add_options --enable-strip - -# needed for windows/mac auto update ONLY. it's a security risk so other OSses don't need it -# https://firefox-source-docs.mozilla.org/taskcluster/setting-up-an-update-server.html -# this one below now fails since a few versions. what's up? -#ac_add_options --disable-verify-mar - -# Internationalization -ac_add_options --with-l10n-base=$(pwd)/browser/locales/l10n diff --git a/linux-mar/assets/tryfix-reslink-fail.patch b/linux-mar/assets/tryfix-reslink-fail.patch deleted file mode 100644 index c8a4270..0000000 --- a/linux-mar/assets/tryfix-reslink-fail.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/browser/app/splash.rc b/browser/app/splash.rc -index 259a806..78cd58e 100644 ---- a/browser/app/splash.rc -+++ b/browser/app/splash.rc -@@ -12,7 +12,7 @@ IDI_APPLICATION ICON FIREFOX_ICO - IDI_NEWWINDOW ICON NEWWINDOW_ICO - IDI_NEWTAB ICON NEWTAB_ICO - IDI_PBMODE ICON PBMODE_ICO --IDI_DOCUMENT_PDF ICON DOCUMENT_PDF_ICO -+IDI_DOCUMENT_PDF ICON DOCUMENT_ICO - - STRINGTABLE DISCARDABLE - BEGIN diff --git a/linux-mar/release b/linux-mar/release deleted file mode 100644 index d00491f..0000000 --- a/linux-mar/release +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/linux/Makefile b/linux/Makefile deleted file mode 100644 index b9403f2..0000000 --- a/linux/Makefile +++ /dev/null @@ -1,244 +0,0 @@ -.PHONY : help fetch all clean build artifacts dir bootstrap winsdk setup-debian setup-fedora veryclean docker-build docker-run docker-clean docker-prune docker-shell buildsymbols upstream-update setup-arch bootstrap-arch bootstrap-arch-do-bootstrap old-style-bootstrap-arch old-style-bootstrap-arch-do-bootstrap build-arch build-arch-do-build extract-arch clean-arch buildsymbols-arch build-symbols-arch-do-buildsymbols package-arch package-arch-do-package patch-folder-arch winsdk-arch grab-build-artifact-arch artifacts-arch - -version:=$(shell cat version) -release:=$(shell cat release) -source_release:=$(shell cat source_release) -full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)") -mozbuild=~/.mozbuild - -docker_image_name=lw-win-x64 - -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 "" - @echo " all - Build librewolf and it's windows artifacts." - @echo " build - Perform './mach build' on the extracted tarball." - @echo " package - multilocale package." - @echo " artifacts - Create the setup.exe and the portable.zip." - @echo "" - @echo " clean - Remove output files and temporary files." - @echo " veryclean - Remove even more stuff." - @echo " dir - just extract and patch the LW tarball." - @echo " bootstrap - try to set up the build environment." - @echo " setup-debian, setup-fedora - needed packages." - @echo "" - @echo " docker-build - Run 'docker build' for" $(docker_image_name) "image." - @echo " docker-run - Run LW build using 'docker run' on" $(docker_image_name) "image." - @echo " docker-shell - Run shell in" $(docker_image_name) "image, to debug why docker-run fails." - @echo " docker-clean - Remove" $(docker_image_name) "docker image." - @echo " docker-prune - Delete ALL docker data: images, containers, networks, etc." - @echo "" - @echo "Building natively on arch:" - @echo " upstream-update - Update and fetch 'version' and 'source_release'." - @echo " fetch-archive - Fetch the archive from the internet and verify it." - @echo " setup-arch - Install build dependencies." - @echo " extract-arch, clean-arch - Extract/remove the source tree." - @echo " patch-folder-arch - Patching it into a windows cross-build." - @echo " winsdk-arch - Extract the winsdk folder for cross-build." - @echo "" - @echo " bootstrap-arch - Bootstrap the mozilla build environment." - @echo " old-style-bootstrap-arch - Use old style bootstrapping." - @echo " build-arch - Build it." - @echo " buildsymbols-arch - Build symbols." - @echo " package-arch - Package the target zip file." - @echo " grab-build-artifact-arch - Grab the packaged zip file into this folder" - @echo " artifacts-arch - build the target setup.exe and portable.zip" - - -all : - @echo "[debug] Please don't run old-style 'all' when debugging." - ${MAKE} build buildsymbols package artifacts - @echo "[debug] Please don't run old-style 'all' when debugging." - - -# -# Redo from scratch. --- -# - -upstream-update : - rm -f version source_release - 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 "[notice] version =" "$$(cat version)" - @echo "[notice] source_release =" "$$(cat source_release)" - @echo "[notice] release =" "$$(cat release)" - -fetch-archive : - [ -f "version" ] && [ -f "source_release" ] - ${MAKE} fetch - -arch-packages=git make gnupg python python-pip cabextract -setup-arch : - [ -f "version" ] && [ -f "source_release" ] - pacman -S $(arch-packages) - -extract-arch : - [ -f "version" ] && [ -f "source_release" ] && [ -f "librewolf-$(full_version).source.tar.gz" ] - ${MAKE} clean-arch - tar xf "librewolf-$(full_version).source.tar.gz" - -# windows-specific modifications: -patch-folder-arch : - [ -f "version" ] && [ -f "source_release" ] && [ -d "librewolf-$(full_version)" ] - cp -v assets/mozconfig librewolf-$(full_version)/mozconfig - (cd librewolf-$(full_version) && patch -p1 -i ../assets/tryfix-reslink-fail.patch) - (cd librewolf-$(full_version) && patch -p1 -i ../assets/fix-l10n-package-cmd.patch) - -patch-folder-arch-mozconfig-new-style : -# this target is just a reminder how I would want it to work once WINE works -# mv librewolf-$(full_version)/mozconfig librewolf-$(full_version)/mozconfig.std -# cp -v assets/mozconfig.arch librewolf-$(full_version)/mozconfig - -winsdk-arch : - ${MAKE} winsdk - -clean-arch : - [ -f "version" ] && [ -f "source_release" ] - rm -rf "librewolf-$(full_version)" - -bootstrap-arch : - [ -f "version" ] && [ -f "source_release" ] && [ -d "librewolf-$(full_version)" ] - ${MAKE} -C librewolf-$(full_version) -f ../Makefile bootstrap-arch-do-bootstrap - -bootstrap-arch-do-bootstrap : - ./mach --no-interactive bootstrap --application-choice=browser - -# try old style bootstrapping... -old-style-bootstrap-arch : - [ -f "version" ] && [ -f "source_release" ] && [ -d "librewolf-$(full_version)" ] - cp -v assets/mozconfig librewolf-$(full_version)/mozconfig - ${MAKE} -C librewolf-$(full_version) -f ../Makefile old-style-bootstrap-arch-do-bootstrap - -old-style-bootstrap-arch-do-bootstrap : - ./mach --no-interactive bootstrap --application-choice=browser - ~/.cargo/bin/rustup target add x86_64-pc-windows-msvc - ( export t=$$(pwd) && \ - cd $(mozbuild) && \ - $$t/mach artifact toolchain --from-build linux64-binutils && \ - $$t/mach artifact toolchain --from-build linux64-cbindgen && \ - $$t/mach artifact toolchain --from-build linux64-clang && \ - $$t/mach artifact toolchain --from-build linux64-dump_syms && \ - $$t/mach artifact toolchain --from-build linux64-nasm && \ - $$t/mach artifact toolchain --from-build linux64-node && \ - $$t/mach artifact toolchain --from-build linux64-rust-cross && \ - $$t/mach artifact toolchain --from-build linux64-winchecksec && \ - $$t/mach artifact toolchain --from-build linux64-wine && \ - $$t/mach artifact toolchain --from-build nsis && \ - $$t/mach artifact toolchain --from-build sysroot-x86_64-linux-gnu && \ - true ) - -build-arch : - [ -f "version" ] && [ -f "source_release" ] && [ -d "librewolf-$(full_version)" ] - ${MAKE} -C librewolf-$(full_version) -f ../Makefile build-arch-do-build -build-arch-do-build : - ./mach build -buildsymbols-arch : - [ -f "version" ] && [ -f "source_release" ] && [ -d "librewolf-$(full_version)" ] - ${MAKE} -C librewolf-$(full_version) -f ../Makefile buildsymbols-arch-do-buildsymbols -buildsymbols-arch-do-buildsymbols : - ./mach buildsymbols -package-arch : - [ -f "version" ] && [ -f "source_release" ] && [ -d "librewolf-$(full_version)" ] - ${MAKE} -C librewolf-$(full_version) -f ../Makefile package-arch-do-package -package-arch-do-package : - @(echo 'Packaging... (output hidden)' && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales >/dev/null) -grab-build-artifact-arch : - cp -v librewolf-$(full_version)/obj-x86_64-pc-mingw32/dist/firefox-$(version)-$(source_release).en-US.win64.zip . - -artifacts-arch : - ${MAKE} grab-build-artifact-arch - ${MAKE} -f assets/artifacts.mk artifacts -# -# End redo --- -# - -fetch : upstream-update - rm -f "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum" - -wget -q -O "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum" "https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/$$(cat version)-$$(cat source_release)/librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum" - [ -f "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum" ] - wget --progress=bar:force -O "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz" "https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/$$(cat version)-$$(cat source_release)/librewolf-$$(cat version)-$$(cat source_release).source.tar.gz" - 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) - -buildsymbols : dir - (cd librewolf-$(full_version) && ./mach buildsymbols) - -package : dir -# (cd librewolf-$(full_version) && ./mach package) - ( cd librewolf-$(full_version) && echo 'Packaging... (output hidden)' && \ - cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales >/dev/null ) - -dir : librewolf-$(full_version) -librewolf-$(full_version) : librewolf-$(full_version).source.tar.gz - rm -rf $@ - tar xf $< - cp -v assets/mozconfig librewolf-$(full_version) - (cd librewolf-$(full_version) && patch -p1 -i ../assets/tryfix-reslink-fail.patch) - (cd librewolf-$(full_version) && patch -p1 -i ../assets/fix-l10n-package-cmd.patch) - -winsdk : $(mozbuild)/vs.tar.zst - (mkdir -p $(mozbuild)/win-cross && cd $(mozbuild)/win-cross && rm -rf vs && tar xf ../vs.tar.zst) -$(mozbuild)/vs.tar.zst : # cache this file - (cd librewolf-$(full_version) && ./mach --no-interactive python --virtualenv build build/vs/pack_vs.py build/vs/vs2019.yaml -o $(mozbuild)/vs.tar.zst) - -bootstrap : dir winsdk - (cd librewolf-$(full_version) && ./mach --no-interactive bootstrap --application-choice=browser) -# Rust supports aarch64-linux-android, arm-linux-androideabi, i686-linux-android, thumbv7neon-linux-androideabi, x86_64-linux-android, x86_64-pc-windows-msvc, x86_64-unknown-linux-gnu targets. - ~/.cargo/bin/rustup target add x86_64-pc-windows-msvc - ( export t=$$(pwd)/librewolf-$(full_version) && \ - cd $(mozbuild) && \ - $$t/mach artifact toolchain --from-build linux64-binutils && \ - $$t/mach artifact toolchain --from-build linux64-cbindgen && \ - $$t/mach artifact toolchain --from-build linux64-clang && \ - $$t/mach artifact toolchain --from-build linux64-dump_syms && \ - $$t/mach artifact toolchain --from-build linux64-liblowercase && \ - $$t/mach artifact toolchain --from-build linux64-nasm && \ - $$t/mach artifact toolchain --from-build linux64-node && \ - $$t/mach artifact toolchain --from-build linux64-rust-cross && \ - $$t/mach artifact toolchain --from-build linux64-winchecksec && \ - $$t/mach artifact toolchain --from-build linux64-wine && \ - $$t/mach artifact toolchain --from-build nsis && \ - $$t/mach artifact toolchain --from-build sysroot-x86_64-linux-gnu && \ - true ) - -setup-debian : - apt-get -y install mercurial python3 python3-dev python3-pip curl wget dpkg-sig msitools p7zip-full upx-ucl libssl-dev zstd wine64-tools - -setup-fedora : - dnf -y install python3 curl wget zstd python3-devel python3-pip mercurial msitools p7zip upx openssl-devel wine wine-devel - -# -# Build the artifacts in a seperate Makefile -# - -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 : firefox-$(full_version).en-US.win64.zip - ${MAKE} -f assets/artifacts.mk artifacts - - -docker-build : - docker build -t $(docker_image_name) - < assets/Dockerfile -docker-run : - docker run --rm $(docker_image_name) sh -c "git pull && make fetch && make build" -docker-shell : - docker run -it --rm $(docker_image_name) /bin/bash -i -docker-clean : - docker rmi $(docker_image_name) -docker-prune : - docker system prune --all --force - diff --git a/linux/assets/Dockerfile b/linux/assets/Dockerfile deleted file mode 100644 index 35adb6c..0000000 --- a/linux/assets/Dockerfile +++ /dev/null @@ -1,71 +0,0 @@ -FROM ubuntu:jammy - -# -# It's probably totally unnecesary to include all of these dependencies. -# - -RUN apt-get -y update && \ - apt-get -y upgrade && \ - apt-get -y install make wget git patch build-essential && \ - dpkg --add-architecture i386 && apt-get -y update && apt-get -y install wine32 - -# -# -# RUN apt-get update && apt-get -y dist-upgrade && apt-get -y install \ -# apt-utils \ -# aptitude \ -# binutils \ -# build-essential \ -# bzip2 \ -# curl \ -# devscripts \ -# equivs \ -# fakeroot \ -# file \ -# gawk \ -# git \ -# git \ -# gnupg \ -# jq \ -# less \ -# lib32atomic1 \ -# lib32stdc++6 \ -# lib32z1 \ -# libasound2 \ -# libc6-i386 \ -# libdbus-glib-1-2 \ -# libgtk-3-0 \ -# libucl1 \ -# make \ -# mercurial \ -# p7zip-full \ -# patch \ -# procps \ -# python3 \ -# python3-dev \ -# python3-pip \ -# python3-distutils-extra \ -# python3-minimal \ -# python3-psutil \ -# python3-venv \ -# rsync screen tar unzip uuid \ -# vim-tiny wget x11-utils xz-utils zip zstd -# - - - - -# -# This is the interesting part of the Dockerfile -# - -RUN git clone --recursive https://gitlab.com/librewolf-community/browser/windows.git -WORKDIR windows/linux - - -RUN make setup-debian -RUN make upstream-update -RUN make fetch-archive -RUN make extract-arch -RUN make old-style-bootstrap-arch -RUN make winsdk-arch diff --git a/linux/assets/artifacts.mk b/linux/assets/artifacts.mk deleted file mode 100644 index 81e80f0..0000000 --- a/linux/assets/artifacts.mk +++ /dev/null @@ -1,99 +0,0 @@ -.PHONY: artifacts ahk-tools - -version:=$(shell cat version) -release:=$(shell cat release) -source_release:=$(shell cat source_release) -full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)") -mozbuild=~/.mozbuild - -incoming_artifact=firefox-$(full_version).en-US.win64.zip -setupname=librewolf-$(full_version).en-US.win64-setup.exe -zipname=librewolf-$(full_version).en-US.win64-portable.zip - -#wine=~/.mozbuild/wine/bin/wineconsole -wine=wineconsole --backend=curses - - - - -artifacts : - - -# this section makes the work/librewolf folder - - - ( rm -rf work && mkdir work ) - ( cd work && unzip -q ../$(incoming_artifact) ) - mv work/firefox work/librewolf - mv work/librewolf/firefox.exe work/librewolf/librewolf.exe - cp assets/librewolf.ico work/librewolf - - -# this section makes the setup.exe - - - mkdir work/x86-ansi - wget -q -O ./work/x86-ansi/nsProcess.dll "https://shorsh.de/upload/2y9p/nsProcess.dll" - wget -q -O ./work/vc_redist.x64.exe "https://aka.ms/vs/17/release/vc_redist.x64.exe" - sed "s/pkg_version/$(full_version)/g" < assets/setup.nsi > work/tmp.nsi - cp assets/librewolf.ico work - cp assets/banner.bmp work - ( cd work && $(mozbuild)/nsis/bin/makensis -V1 tmp.nsi ) - rm -rf work/tmp.nsi work/librewolf.ico work/banner.bmp work/x86-ansi vc_redist.x64.exe - mv work/$(setupname) . - - -# this section makes the portable.zip - - - rm -rf work/librewolf-$(full_version) - - mkdir -p work/librewolf-$(full_version)/Profiles/Default - mkdir -p work/librewolf-$(full_version)/LibreWolf - - cp -r work/librewolf/* work/librewolf-$(full_version)/LibreWolf - -# we're using the latest ahk-tools here. - - ( cd work/librewolf-$(full_version) && \ - wget -q -O librewolf-ahk-tools-2023-02-11.zip https://gitlab.com/librewolf-community/browser/windows/uploads/fc5e0483707a1bafdfd8f10b7b6c50b1/librewolf-ahk-tools-2023-02-11.zip && \ - unzip librewolf-ahk-tools-2023-02-11.zip && \ - rm librewolf-ahk-tools-2023-02-11.zip ) - -# issue #224 - Consider including msvcp140 & vcruntime140 in portable package - - ( cd work/librewolf-$(full_version)/LibreWolf && \ - wget -q -O ./vc_redist.x64-extracted.zip "https://gitlab.com/librewolf-community/browser/windows/uploads/7106b776dc663d985bb88eabeb4c5d7d/vc_redist.x64-extracted.zip" && \ - unzip vc_redist.x64-extracted.zip && \ - rm vc_redist.x64-extracted.zip ) - ( rm -f $(zipname) && cd work && zip -qr9 ../$(zipname) librewolf-$(full_version) ) - - - -ahk-tools : -# clone autohotkey stuff - - ( cd work && \ - git clone "https://github.com/ltGuillaume/LibreWolf-Portable" && \ - git clone "https://github.com/ltGuillaume/LibreWolf-WinUpdater" ) - - cp work/LibreWolf-Portable/LibreWolf-Portable.* work/LibreWolf-Portable/*.exe work/librewolf-$(full_version) - cp work/LibreWolf-WinUpdater/LibreWolf-WinUpdater.ahk work/LibreWolf-WinUpdater/*.ico work/librewolf-$(full_version) - - wget -q -O work/ahk.zip "https://www.autohotkey.com/download/ahk.zip" - ( mkdir work/ahk && cd work/ahk && unzip -q ../ahk.zip ) - -# now we can use wine32 to run autohotkey -# --- -# tip from: https://forums.linuxmint.com/viewtopic.php?t=74356 - rm -rf /root/.wine - winecfg - - -( cd work/librewolf-$(full_version) && $(wine) ../ahk/Compiler/Ahk2Exe.exe /in LibreWolf-Portable.ahk ) - [ -f work/librewolf-$(full_version)/LibreWolf-Portable.exe ] # because we ignored previous exit code - ( cd work/librewolf-$(full_version) && rm -f LibreWolf-Portable.ahk LibreWolf-Portable.ico dejsonlz4.exe jsonlz4.exe ) - - -( cd work/librewolf-$(full_version) && $(wine) ../ahk/Compiler/Ahk2Exe.exe /in LibreWolf-WinUpdater.ahk ) - [ -f work/librewolf-$(full_version)/LibreWolf-WinUpdater.exe ] - ( cd work/librewolf-$(full_version) && rm -f LibreWolf-WinUpdater.ahk LibreWolf-WinUpdater*.ico ) - diff --git a/linux/assets/banner.bmp b/linux/assets/banner.bmp deleted file mode 100644 index 05fda40b27db5620b47b8a50d79582de81537a09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154542 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 diff --git a/linux/assets/fix-l10n-package-cmd.patch b/linux/assets/fix-l10n-package-cmd.patch deleted file mode 100644 index b6b66ec..0000000 --- a/linux/assets/fix-l10n-package-cmd.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py -index 10d7a8f..610a4fa 100644 ---- a/python/mozbuild/mozbuild/mach_commands.py -+++ b/python/mozbuild/mozbuild/mach_commands.py -@@ -2457,6 +2457,7 @@ def package_l10n(command_context, verbose=False, locales=[]): - ) - command_context.run_process( - [ -+ "python3", - mozpath.join(command_context.topsrcdir, "mach"), - "build", - "chrome-{}".format(locale), -@@ -2476,6 +2477,7 @@ def package_l10n(command_context, verbose=False, locales=[]): - ) - command_context.run_process( - [ -+ "python3", - mozpath.join(command_context.topsrcdir, "mach"), - "android", - "assemble-app", diff --git a/linux/assets/librewolf.ico b/linux/assets/librewolf.ico deleted file mode 100644 index 30a72f168d8f1cb8689dc7913bc42c7ce70a4f92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32038 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 diff --git a/linux/assets/mozconfig b/linux/assets/mozconfig deleted file mode 100644 index 1877484..0000000 --- a/linux/assets/mozconfig +++ /dev/null @@ -1,86 +0,0 @@ -# mozconfig - crosscompile from Linux to Windows - -export MOZBUILD=$HOME/.mozbuild -ac_add_options --target=x86_64-pc-mingw32 -ac_add_options --enable-bootstrap - -# since v110.0 - liblowercase not needed anymore? -#mk_add_options "export LD_PRELOAD=$MOZBUILD/liblowercase/liblowercase.so" -#mk_add_options "export LOWERCASE_DIRS=$MOZBUILD/win-cross" -# since v110.0 - extra variable? -export WINSYSROOT="$MOZBUILD/win-cross/vs" - -# since v110.0 - no longer needed? -#export WINDOWSSDKDIR="$MOZBUILD/win-cross/vs/windows kits/10" - -EXTRA_PATH="$MOZBUILD/win-cross/vs/vc/tools/msvc/14.29.30133/bin/hostx64/x64:" -mk_add_options "export PATH=$EXTRA_PATH$PATH" -export CC="$MOZBUILD/clang/bin/clang-cl" -export CXX="$MOZBUILD/clang/bin/clang-cl" -export HOST_CC="$MOZBUILD/clang/bin/clang" -export HOST_CXX="$MOZBUILD/clang/bin/clang++" - - - - -#export WINE=wineconsole -#export WINE="$MOZBUILD/wine/bin/wine64" -#export MIDL="$MOZBUILD/wine/bin/widl" - -#export MIDL=midl -#export MIDL=widl - -### -# TODO : fixme -# - -#ac_add_options --without-wasm-sandboxed-libraries - -### -# old config settings -# - -ac_add_options --enable-application=browser - -ac_add_options --allow-addon-sideload -ac_add_options --disable-crashreporter -ac_add_options --disable-debug -ac_add_options --disable-default-browser-agent -ac_add_options --disable-tests -# updater disabled in Settings repo (app.update.auto). -ac_add_options --disable-updater -ac_add_options --enable-hardening -ac_add_options --enable-optimize -ac_add_options --enable-release -ac_add_options --enable-rust-simd - -ac_add_options --with-app-name=firefox -ac_add_options --with-branding=browser/branding/librewolf - -ac_add_options --with-unsigned-addon-scopes=app,system - -# see issue # https://gitlab.com/librewolf-community/browser/arch/-/issues/49 -export MOZ_REQUIRE_SIGNING= - -mk_add_options MOZ_CRASHREPORTER=0 -mk_add_options MOZ_DATA_REPORTING=0 -mk_add_options MOZ_NORMANTY=0 -mk_add_options MOZ_SERVICES_HEALTHREPORT=0 -mk_add_options MOZ_TELEMETRY_REPORTING=0 -export WINE=wineconsole -# -# windows specific. -# -# - no need to specify wasi sdk folder -# - -ac_add_options --disable-maintenance-service -ac_add_options --enable-strip - -# needed for windows/mac auto update ONLY. it's a security risk so other OSses don't need it -# https://firefox-source-docs.mozilla.org/taskcluster/setting-up-an-update-server.html - -#ac_add_options --disable-verify-mar - -# Internationalization -ac_add_options --with-l10n-base=$(pwd)/browser/locales/l10n diff --git a/linux/assets/mozconfig.arch b/linux/assets/mozconfig.arch deleted file mode 100644 index 223344e..0000000 --- a/linux/assets/mozconfig.arch +++ /dev/null @@ -1,5 +0,0 @@ -. "./mozconfig.std" - -ac_add_options --target=x86_64-pc-mingw32 -MOZBUILD=~/.mozbuild -export WINSYSROOT="$MOZBUILD/win-cross/vs" diff --git a/linux/assets/setup.nsi b/linux/assets/setup.nsi deleted file mode 100644 index beaf800..0000000 --- a/linux/assets/setup.nsi +++ /dev/null @@ -1,176 +0,0 @@ -!include "MUI2.nsh" -!include "LogicLib.nsh" -!addplugindir . -!addplugindir x86-ansi - -!define APPNAME "LibreWolf" -!define PROGNAME "librewolf" -!define EXECUTABLE "${PROGNAME}.exe" -!define PROG_VERSION "pkg_version" -!define COMPANYNAME "LibreWolf" -!define ESTIMATED_SIZE 190000 -!define MUI_ICON "librewolf.ico" -!define MUI_WELCOMEFINISHPAGE_BITMAP "banner.bmp" - -Name "${APPNAME}" -OutFile "${PROGNAME}-${PROG_VERSION}.en-US.win64-setup.exe" -InstallDirRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "InstallLocation" -InstallDir $PROGRAMFILES64\${APPNAME} -RequestExecutionLevel admin - -# Pages - -!define MUI_ABORTWARNING - -!define MUI_WELCOMEPAGE_TITLE "Welcome to the LibreWolf Setup" -!define MUI_WELCOMEPAGE_TEXT "This setup will guide you through the installation of LibreWolf.$\r$\n$\r$\n\ -If you don't have it installed already, this will also install the latest Visual C++ Redistributable.$\r$\n$\r$\n\ -Click Next to continue." -!insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_INSTFILES -!insertmacro MUI_PAGE_FINISH - -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES - -!insertmacro MUI_LANGUAGE "English" - -Section - - # Make sure LibreWolf is closed before the installation - nsProcess::_FindProcess "${EXECUTABLE}" - Pop $R0 - ${If} $R0 = 0 - IfSilent 0 +4 - DetailPrint "${APPNAME} is still running, aborting because of silent install." - SetErrorlevel 2 - Abort - - DetailPrint "${APPNAME} is still running" - MessageBox MB_OKCANCEL "LibreWolf is still running and has to be closed for the setup to continue." IDOK continue IDCANCEL break -break: - SetErrorlevel 1 - Abort -continue: - DetailPrint "Closing ${APPNAME} gracefully..." - nsProcess::_CloseProcess "${EXECUTABLE}" - Pop $R0 - Sleep 2000 - nsProcess::_FindProcess "${EXECUTABLE}" - Pop $R0 - ${If} $R0 = 0 - DetailPrint "Failed to close ${APPNAME}, killing it..." - nsProcess::_KillProcess "${EXECUTABLE}" - Sleep 2000 - nsProcess::_FindProcess "${EXECUTABLE}" - Pop $R0 - ${If} $R0 = 0 - DetailPrint "Failed to kill ${APPNAME}, aborting" - MessageBox MB_ICONSTOP "LibreWolf is still running and can't be closed by the installer. Please close it manually and try again." - SetErrorlevel 2 - Abort - ${EndIf} - ${EndIf} - ${EndIf} - - # Install Visual C++ Redistributable (only if not silent) - IfSilent +4 0 - InitPluginsDir - File /oname=$PLUGINSDIR\vc_redist.x64.exe vc_redist.x64.exe - ExecWait "$PLUGINSDIR\vc_redist.x64.exe /install /quiet /norestart" - - # Copy files - SetOutPath $INSTDIR - File /r librewolf\*.* - - # Start Menu - createDirectory "$SMPROGRAMS\${COMPANYNAME}" - createShortCut "$SMPROGRAMS\${COMPANYNAME}\${APPNAME}.lnk" "$INSTDIR\${PROGNAME}.exe" "" "$INSTDIR\${MUI_ICON}" - createShortCut "$SMPROGRAMS\${COMPANYNAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "" - - # Uninstaller - writeUninstaller "$INSTDIR\uninstall.exe" - - # Registry information for add/remove programs - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "DisplayName" "${APPNAME}" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\"" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "InstallLocation" "$\"$INSTDIR$\"" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "DisplayIcon" "$\"$INSTDIR\${MUI_ICON}$\"" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "Publisher" "${COMPANYNAME}" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "DisplayVersion" "${PROG_VERSION}" - # There is no option for modifying or repairing the install - WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "NoModify" 1 - WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "NoRepair" 1 - # Set the INSTALLSIZE constant (!defined at the top of this script) so Add/Remove Programs can accurately report the size - WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "EstimatedSize" ${ESTIMATED_SIZE} - - - # - # Registry information to let Windows pick us up in the list of available browsers - # - - WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf" "" "LibreWolf" - - WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\Capabilities" "ApplicationDescription" "LibreWolf" - WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\Capabilities" "ApplicationIcon" "$INSTDIR\librewolf.exe,0" - WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\Capabilities" "ApplicationName" "LibreWolf" - WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\Capabilities\FileAssociations" ".htm" "LibreWolfHTM" - WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\Capabilities\FileAssociations" ".html" "LibreWolfHTM" - WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\Capabilities\FileAssociations" ".pdf" "LibreWolfHTM" - WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\Capabilities\Startmenu" "StartMenuInternet" "LibreWolf" - WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\Capabilities\URLAssociations" "http" "LibreWolfHTM" - WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\Capabilities\URLAssociations" "https" "LibreWolfHTM" - - WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\DefaultIcon" "" "$INSTDIR\librewolf.exe,0" - WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\shell\open\command" "" "$INSTDIR\librewolf.exe" - - WriteRegStr HKLM "Software\RegisteredApplications" "LibreWolf" "Software\Clients\StartMenuInternet\LibreWolf\Capabilities" - - WriteRegStr HKLM "Software\Classes\LibreWolfHTM" "" "LibreWolf Handler" - WriteRegStr HKLM "Software\Classes\LibreWolfHTM" "AppUserModelId" "LibreWolf" - WriteRegStr HKLM "Software\Classes\LibreWolfHTM\Application" "AppUserModelId" "LibreWolf" - WriteRegStr HKLM "Software\Classes\LibreWolfHTM\Application" "ApplicationIcon" "$INSTDIR\librewolf.exe,0" - WriteRegStr HKLM "Software\Classes\LibreWolfHTM\Application" "ApplicationName" "LibreWolf" - WriteRegStr HKLM "Software\Classes\LibreWolfHTM\Application" "ApplicationDescription" "Start the LibreWolf Browser" - WriteRegStr HKLM "Software\Classes\LibreWolfHTM\Application" "ApplicationCompany" "LibreWolf Community" - WriteRegStr HKLM "Software\Classes\LibreWolfHTM\DefaultIcon" "" "$INSTDIR\librewolf.exe,0" - WriteRegStr HKLM "Software\Classes\LibreWolfHTM\shell\open\command" "" "$\"$INSTDIR\librewolf.exe$\" -osint -url $\"%1$\"" - -SectionEnd - - -# Uninstaller -section "Uninstall" - - # Kill LibreWolf if it is still running - nsProcess::_FindProcess "${EXECUTABLE}" - Pop $R0 - ${If} $R0 = 0 - DetailPrint "${APPNAME} is still running, killing it..." - nsProcess::_KillProcess "${EXECUTABLE}" - Sleep 2000 - ${EndIf} - - # Remove Start Menu launcher - delete "$SMPROGRAMS\${COMPANYNAME}\${APPNAME}.lnk" - delete "$SMPROGRAMS\${COMPANYNAME}\Uninstall.lnk" - # Try to remove the Start Menu folder - this will only happen if it is empty - rmDir "$SMPROGRAMS\${COMPANYNAME}" - - # Remove files - rmDir /r $INSTDIR - - # Remove uninstaller information from the registry - DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" - - # - # Windows default browser integration - # - - DeleteRegKey HKLM "Software\Clients\StartMenuInternet\LibreWolf" - DeleteRegKey HKLM "Software\RegisteredApplications" - DeleteRegKey HKLM "Software\Classes\LibreWolfHTM" - -sectionEnd diff --git a/linux/assets/tryfix-reslink-fail.patch b/linux/assets/tryfix-reslink-fail.patch deleted file mode 100644 index c8a4270..0000000 --- a/linux/assets/tryfix-reslink-fail.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/browser/app/splash.rc b/browser/app/splash.rc -index 259a806..78cd58e 100644 ---- a/browser/app/splash.rc -+++ b/browser/app/splash.rc -@@ -12,7 +12,7 @@ IDI_APPLICATION ICON FIREFOX_ICO - IDI_NEWWINDOW ICON NEWWINDOW_ICO - IDI_NEWTAB ICON NEWTAB_ICO - IDI_PBMODE ICON PBMODE_ICO --IDI_DOCUMENT_PDF ICON DOCUMENT_PDF_ICO -+IDI_DOCUMENT_PDF ICON DOCUMENT_ICO - - STRINGTABLE DISCARDABLE - BEGIN diff --git a/linux/release b/linux/release deleted file mode 100644 index d00491f..0000000 --- a/linux/release +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/winbuild/Makefile b/winbuild/Makefile deleted file mode 100644 index 166e383..0000000 --- a/winbuild/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -.PHONY : help all clean veryclean fetch build artifacts update full-mar serve-mar langpacks - -help : - @echo "Use: make [all] [clean] [veryclean] [check] ..." - @echo "" - @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 " update - update 'version' and 'source_release' files." - @echo " full-mar - create mar setup file, and update.xml." - @echo " serve-mar - serve the update files" - @echo " langpacks - build language packs." - @echo "" - @echo " fetch - Fetch the latest librewolf source." - @echo " build - Perform './mach build && ./mach package' on it." - @echo " debug - Perform a debug build with different 'mozconfig'." - @echo " artifacts - Create the setup.exe and the portable.zip." - @echo "" - @echo "Note: to upload, after artifacts, into the windows repo, use:" - @echo "" - @echo " python3 mk.py upload " - @echo "" - -all : fetch build artifacts - -clean : - cp version source_release linux && cp version source_release linux-mar - $(MAKE) -C linux clean && $(MAKE) -C linux-mar clean - rm -rf work - -veryclean : clean - cp version source_release linux && cp version source_release linux-mar - $(MAKE) -C linux veryclean && $(MAKE) -C linux-mar veryclean - rm -f librewolf-$(shell cat version)*.en-US.win64* sha256sums.txt upload.txt firefox-$(shell cat version)*.en-US.win64.zip firefox-$(shell cat version)*.en-US.win64.installer.exe - 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 - -build : - python3 mk.py build - -debug : - python3 mk.py build-debug - -artifacts : langpacks - python3 mk.py artifacts - -full-mar : - python3 mk.py full-mar - -serve-mar : - (cd librewolf-$(shell cat version)-$(shell cat source_release)/MAR && python3 -m http.server 8000) - -langpacks : - (cd librewolf-$(shell cat version)-$(shell cat source_release) && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales) diff --git a/winbuild/assets/PrivateBrowsing_150.png b/winbuild/assets/PrivateBrowsing_150.png deleted file mode 100644 index af676d1b5f4349d4e8184ab93b454cc3760aa0a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16207 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 diff --git a/winbuild/assets/PrivateBrowsing_70.png b/winbuild/assets/PrivateBrowsing_70.png deleted file mode 100644 index 5e5f57687cff902e4830886a6a88c9d5f212a736..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5931 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 diff --git a/winbuild/assets/aboutDialog/aboutDialog.css b/winbuild/assets/aboutDialog/aboutDialog.css deleted file mode 100644 index 37b8ef9..0000000 --- a/winbuild/assets/aboutDialog/aboutDialog.css +++ /dev/null @@ -1,136 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -@namespace html "http://www.w3.org/1999/xhtml"; - -#aboutDialog { - width: 620px; - /* Set an explicit line-height to avoid discrepancies in 'auto' spacing - across screens with different device DPI, which may cause font metrics - to round differently. */ - line-height: 1.5; -} - -#rightBox { - background-image: url("chrome://branding/content/about-wordmark.svg"); - background-repeat: no-repeat; - background-size: 288px auto; - /* padding-top creates room for the wordmark */ - padding-top: 38px; - margin-top: 20px; -} - -#rightBox:-moz-locale-dir(rtl) { - background-position: 100% 0; -} - -#bottomBox { - padding: 15px 10px 0; - height: 52px; -} - -#release { - font-weight: bold; - font-size: 125%; - margin-top: 10px; - margin-inline-start: 0; -} - -#version { - font-weight: bold; - margin-inline-start: 0; - user-select: text; - -moz-user-focus: normal; - cursor: text; -} - -#version.update { - font-weight: normal; -} - -#distribution, -#distributionId { - display: none; - margin-block: 0; -} - -.text-blurb { - margin-bottom: 10px; - margin-inline-start: 0; - padding-inline-start: 0; -} - -#updateDeck > *:not(.selected) { - visibility: hidden; -} - -#updateButton, -#updateDeck > hbox > label { - margin-inline-start: 0; - padding-inline-start: 0; -} - -.update-throbber { - width: 16px; - min-height: 16px; - margin-inline-end: 3px; -} - -html|img.update-throbber { - vertical-align: middle; -} - -image.update-throbber { - list-style-image: url("chrome://global/skin/icons/loading.png"); -} - -@media (min-resolution: 1.1dppx) { - .update-throbber { - list-style-image: url("chrome://global/skin/icons/loading@2x.png"); - } -} - -description > .text-link { - margin: 0; - padding: 0; -} - -#submit-feedback { - margin-inline-start: .9em; -} - -.bottom-link { - text-align: center; - margin: 0 40px; -} - -#currentChannel { - margin: 0; - padding: 0; - font-weight: bold; -} - -#updateBox { - line-height: normal; -} - -#icons > .icon { - -moz-context-properties: fill; - margin: 5px; - width: 16px; - height: 16px; -} - -#icons:not(.checkingForUpdates, .downloading, .applying, .restarting) > .update-throbber, -#icons:not(.noUpdatesFound) > .noUpdatesFound, -#icons:not(.apply) > .apply { - display: none; -} - -#icons > .noUpdatesFound { - fill: #30e60b; -} - -#icons > .apply { - fill: white; -} diff --git a/winbuild/assets/aboutDialog/aboutDialog.js b/winbuild/assets/aboutDialog/aboutDialog.js deleted file mode 100644 index 69e7c51..0000000 --- a/winbuild/assets/aboutDialog/aboutDialog.js +++ /dev/null @@ -1,121 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -"use strict"; - -/* import-globals-from aboutDialog-appUpdater.js */ - -// Services = object with smart getters for common XPCOM services -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); -var { AppConstants } = ChromeUtils.import( - "resource://gre/modules/AppConstants.jsm" -); -if (AppConstants.MOZ_UPDATER) { - Services.scriptloader.loadSubScript( - "chrome://browser/content/aboutDialog-appUpdater.js", - this - ); -} - -async function init(aEvent) { - if (aEvent.target != document) { - return; - } - - let defaults = Services.prefs.getDefaultBranch(null); - let distroId = defaults.getCharPref("distribution.id", ""); - if (distroId) { - let distroAbout = defaults.getStringPref("distribution.about", ""); - // If there is about text, we always show it. - if (distroAbout) { - let distroField = document.getElementById("distribution"); - distroField.value = distroAbout; - distroField.style.display = "block"; - } - // If it's not a mozilla distribution, show the rest, - // unless about text exists, then we always show. - if (!distroId.startsWith("mozilla-") || distroAbout) { - let distroVersion = defaults.getCharPref("distribution.version", ""); - if (distroVersion) { - distroId += " - " + distroVersion; - } - - let distroIdField = document.getElementById("distributionId"); - distroIdField.value = distroId; - distroIdField.style.display = "block"; - } - } - - // Include the build ID and display warning if this is an "a#" (nightly or aurora) build - let versionId = "aboutDialog-version"; - let versionAttributes = { - version: AppConstants.MOZ_APP_VERSION_DISPLAY, - bits: Services.appinfo.is64Bit ? 64 : 32, - }; - - let version = Services.appinfo.version; - if (/a\d+$/.test(version)) { - versionId = "aboutDialog-version-nightly"; - let buildID = Services.appinfo.appBuildID; - let year = buildID.slice(0, 4); - let month = buildID.slice(4, 6); - let day = buildID.slice(6, 8); - versionAttributes.isodate = `${year}-${month}-${day}`; - - document.getElementById("experimental").hidden = false; - document.getElementById("communityDesc").hidden = true; - } - - // Use Fluent arguments for append version and the architecture of the build - let versionField = document.getElementById("version"); - - document.l10n.setAttributes(versionField, versionId, versionAttributes); - - await document.l10n.translateElements([versionField]); - - // Show a release notes link if we have a URL. - let relNotesLink = document.getElementById("releasenotes"); - let relNotesPrefType = Services.prefs.getPrefType( - "app.releaseNotesURL.aboutDialog" - ); - if (relNotesPrefType != Services.prefs.PREF_INVALID) { - let relNotesURL = Services.urlFormatter.formatURLPref( - "app.releaseNotesURL.aboutDialog" - ); - if (relNotesURL != "about:blank") { - relNotesLink.href = relNotesURL; - relNotesLink.hidden = false; - } - } - - if (AppConstants.MOZ_UPDATER) { - gAppUpdater = new appUpdater({ buttonAutoFocus: true }); - - let channelLabel = document.getElementById("currentChannel"); - let currentChannelText = document.getElementById("currentChannelText"); - channelLabel.value = UpdateUtils.UpdateChannel; - let hasWinPackageId = false; - try { - hasWinPackageId = Services.sysinfo.getProperty("hasWinPackageId"); - } catch (_ex) { - // The hasWinPackageId property doesn't exist; assume it should be false. - } - if (/^release($|\-)/.test(channelLabel.value) || hasWinPackageId) { - currentChannelText.hidden = true; - } - } - - if (AppConstants.IS_ESR) { - document.getElementById("release").hidden = false; - } - - window.sizeToContent(); - - if (AppConstants.platform == "macosx") { - window.moveTo( - screen.availWidth / 2 - window.outerWidth / 2, - screen.availHeight / 5 - ); - } -} diff --git a/winbuild/assets/aboutDialog/aboutDialog.xhtml b/winbuild/assets/aboutDialog/aboutDialog.xhtml deleted file mode 100644 index 90a568a..0000000 --- a/winbuild/assets/aboutDialog/aboutDialog.xhtml +++ /dev/null @@ -1,168 +0,0 @@ - - -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - - - - - - -#ifdef XP_MACOSX -#include macWindow.inc.xhtml -#else -