diff --git a/Makefile b/Makefile index 82e8f4b..2ad5c5f 100644 --- a/Makefile +++ b/Makefile @@ -24,9 +24,9 @@ clean : rm -rf work veryclean : clean - rm -f librewolf-$(shell cat version)*.en-US.win64* sha256sums.txt upload.txt firefox-$(shell cat version)*.en-US.win64.zip + rm -f librewolf-$(shell cat version)*.en-US.win64* sha256sums.txt upload.txt firefox-$(shell cat version)*.en-US.win64.zip rm -rf librewolf-$(shell cat version)-$(shell cat source_release) - rm -f librewolf-$(shell cat version)-*.source.tar.gz + rm -f librewolf-$(shell cat version)-*.source.tar.gz* fetch : python3 mk.py fetch diff --git a/README.md b/README.md index f873c81..30e8ea2 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,10 @@ * **[download latest release](https://gitlab.com/librewolf-community/browser/windows/-/releases)** * Visit [the FAQ](https://librewolf.net/docs/faq/). * Install via _[chocolatey](https://community.chocolatey.org/packages/librewolf)_: `choco install librewolf` +* or install via _[scoop](https://scoop.sh)_: `scoop bucket add extras`, then `scoop install librewolf` * or install via _winget_: `winget install librewolf` -* **If your LibreWolf crashes on startup**, you probably miss the right [Visual C++ Runtime](https://support.microsoft.com/en-us/topic/the-latest-supported-visual-c-downloads-2647da03-1eea-4433-9aff-95f26a218cc0). You want the _Visual Studio 2015, 2017 and 2019_ version for **x64**, which would be **[this file](https://aka.ms/vs/16/release/vc_redist.x64.exe)**. -* The latest type **.zip files** are _'portable zip files'_ that allows for a user profile in the extracted zip file folders. It is _self-contained_ and runs on an usb stick. +* **If your LibreWolf crashes on startup**, you're probably missing the right [Visual C++ Runtime](https://support.microsoft.com/en-us/topic/the-latest-supported-visual-c-downloads-2647da03-1eea-4433-9aff-95f26a218cc0). You'll want the _Visual Studio 2015, 2017 and 2019_ version for **x64**, which would be **[this file](https://aka.ms/vs/16/release/vc_redist.x64.exe)**. +* The latest type of **.zip files** allows for a user profile inside the extracted folder. It is _self-contained_ and runs on removable storage. # Where to submit tickets diff --git a/librewolf-portable/.gitignore b/assets/librewolf-portable/.gitignore similarity index 100% rename from librewolf-portable/.gitignore rename to assets/librewolf-portable/.gitignore diff --git a/librewolf-portable/README.md b/assets/librewolf-portable/README.md similarity index 100% rename from librewolf-portable/README.md rename to assets/librewolf-portable/README.md diff --git a/librewolf-portable/Resource.h b/assets/librewolf-portable/Resource.h similarity index 100% rename from librewolf-portable/Resource.h rename to assets/librewolf-portable/Resource.h diff --git a/librewolf-portable/build.bat b/assets/librewolf-portable/build.bat similarity index 100% rename from librewolf-portable/build.bat rename to assets/librewolf-portable/build.bat diff --git a/librewolf-portable/librewolf-portable.aps b/assets/librewolf-portable/librewolf-portable.aps similarity index 100% rename from librewolf-portable/librewolf-portable.aps rename to assets/librewolf-portable/librewolf-portable.aps diff --git a/librewolf-portable/librewolf-portable.cpp b/assets/librewolf-portable/librewolf-portable.cpp similarity index 100% rename from librewolf-portable/librewolf-portable.cpp rename to assets/librewolf-portable/librewolf-portable.cpp diff --git a/librewolf-portable/librewolf-portable.ico b/assets/librewolf-portable/librewolf-portable.ico similarity index 100% rename from librewolf-portable/librewolf-portable.ico rename to assets/librewolf-portable/librewolf-portable.ico diff --git a/librewolf-portable/librewolf-portable.rc b/assets/librewolf-portable/librewolf-portable.rc similarity index 100% rename from librewolf-portable/librewolf-portable.rc rename to assets/librewolf-portable/librewolf-portable.rc diff --git a/librewolf-portable/librewolf-portable.sln b/assets/librewolf-portable/librewolf-portable.sln similarity index 100% rename from librewolf-portable/librewolf-portable.sln rename to assets/librewolf-portable/librewolf-portable.sln diff --git a/librewolf-portable/librewolf-portable.vcxproj b/assets/librewolf-portable/librewolf-portable.vcxproj similarity index 100% rename from librewolf-portable/librewolf-portable.vcxproj rename to assets/librewolf-portable/librewolf-portable.vcxproj diff --git a/librewolf-portable/librewolf-portable.vcxproj.filters b/assets/librewolf-portable/librewolf-portable.vcxproj.filters similarity index 100% rename from librewolf-portable/librewolf-portable.vcxproj.filters rename to assets/librewolf-portable/librewolf-portable.vcxproj.filters diff --git a/librewolf-portable/librewolf-portable.vcxproj.user b/assets/librewolf-portable/librewolf-portable.vcxproj.user similarity index 100% rename from librewolf-portable/librewolf-portable.vcxproj.user rename to assets/librewolf-portable/librewolf-portable.vcxproj.user diff --git a/librewolf-portable/targetver.h b/assets/librewolf-portable/targetver.h similarity index 100% rename from librewolf-portable/targetver.h rename to assets/librewolf-portable/targetver.h diff --git a/assets/mozconfig.windows32 b/assets/mozconfig.windows32 new file mode 100644 index 0000000..c65a3c8 --- /dev/null +++ b/assets/mozconfig.windows32 @@ -0,0 +1,11 @@ +################ +# build 32-bit version.. +#ac_add_options --target=x86_64-pc-mingw32 +ac_add_options --target=i686-pc-mingw32 +#ac_add_options --enable-bootstrap +ac_add_options --without-wasm-sandboxed-libraries + +# currently fails on when building.. +#def deps_win32(): +# exec('rustup target add i686-pc-windows-msvc') +# \ No newline at end of file diff --git a/assets/setup.nsi b/assets/setup.nsi index 6592eba..ab701fa 100644 --- a/assets/setup.nsi +++ b/assets/setup.nsi @@ -120,7 +120,7 @@ Section 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 %1" + WriteRegStr HKLM "Software\Classes\LibreWolfHTM\shell\open\command" "" "$\"$INSTDIR\librewolf.exe$\" -osint -url $\"%1$\"" SectionEnd diff --git a/mk.py b/mk.py index 46c15a4..ac33b0c 100644 --- a/mk.py +++ b/mk.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 + #!/usr/bin/env python3 import os,sys,subprocess,os.path @@ -10,17 +10,23 @@ from tools import exec, patch # +def deps_win32(): + exec('rustup target add i686-pc-windows-msvc') + + def fetch(): - exec('wget -q -O version https://gitlab.com/librewolf-community/browser/source/-/raw/main/version') exec('wget -q -O source_release https://gitlab.com/librewolf-community/browser/source/-/raw/main/release') + exec('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') exec('wget -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') + exec('sha256sum -c librewolf-$(cat version)-$(cat source_release).source.tar.gz.sha256sum') + exec('cat librewolf-$(cat version)-$(cat source_release).source.tar.gz.sha256sum') def build(debug=False): - exec('rm -rf librewolf-$(cat version)') + exec('rm -rf librewolf-$(cat version)-$(cat source_release)') exec('tar xf librewolf-$(cat version)-$(cat source_release).source.tar.gz') with open('version','r') as file: diff --git a/version b/version index 9d1377b..5b3cfb1 100644 --- a/version +++ b/version @@ -1 +1 @@ -97.0.2 \ No newline at end of file +98.0.2 \ No newline at end of file