diff --git a/README.md b/README.md index 0ee0f37..c7f9391 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,83 @@ +LibreWolf for Win64 +------------------- + This repository is still a work in progress. -But we have a zip file available for testing right now.. +But we have a zip file and an installer available for testing right now.. -Download link to the prerelease alpha zip file is [here](https://gitlab.com/librewolf-community/browser/windows/uploads/5e9d436515d315d4e8953f88bf02bd99/librewolf-85.0.en-US.win64.zip). +Download link to this prerelease is: +* Zip file is: [librewolf-85.0.en-US.win64.zip](https://gitlab.com/librewolf-community/browser/windows/uploads/5e9d436515d315d4e8953f88bf02bd99/librewolf-85.0.en-US.win64.zip). +* Installer file is: [librewolf-85.0.en-US.win64-setup.exe](). -To do: -* Creating an installer. -* Branding issues, include a good icon for librewolf.exe -* Other Branding Issues -* Improve this README.md to contain detailed instructions on how to build. +Building the package: +--------------------- For now, if you want to attempt to build, this build does require you to: * First build the mozilla-unified as explained in the mozilla docs, using all the ./mach bootstrap stuff * You can delete this mozilla-unified thing to save some space (try ./mach run on it just for fun) * Then clone the windows repo -* cd into it, and build with: **time bash build.sh fetch prepare build package installer_win** -* you can perform each of the build steps individually and the overall script structure follows PKGBULD as used on Archlinux +* cd into it, and build with: **time bash build.sh** +* You can perform each of the build steps individually and the overall script structure follows PKGBULD as used on Archlinux * This will produce a **librewolf-85.0.en-US.win64.zip** in this windows folder. +Once you have built the entire mozilla-unified with all the mach bootstrap stuff (which will +install the needed binaries in $HOME/.mozbuild), don't forget to copy the entire +C:\Program Files\Git folder to /c/mozilla-source to get a sed.exe that understands the -z option, +and to get sha256sum.exe. + +build.sh +-------- + +You can perform all the steps on one go, or perform the build steps individually, to note: +* build.sh fetch prepare build package installer_win + +To do: +------ + +* Branding issues. +* Improve this README.md to contain better, detailed instructions on how to build. +* problem with old sed. does not recognize -z. using the one from Git might be a work around. + + +Branding issue: resource files +------------------------------ + +* This section is just some notes. +* Build fail on missing stubinstaller (might be a FF bug as it should just take missing +stuff from the nightly branding folder?) + +``` +$ mkdir stubinstaller +$ cp bgstub.jpg stubinstaller +$ pwd +/c/mozilla-source/firefox-85.0/browser/branding/librewolf +$ + +* checking all the different files in nightly and librewolf + +$ cd nightly +$ find . | sort > /c/mozilla-source/branding-nightly.txt +$ cd ../librewolf/ +$ find . | sort > /c/mozilla-source/branding-librewolf.txt + + +$ diff branding-nightly.txt branding-librewolf.txt +4a5,6 +> ./bgstub.jpg +> ./bgstub_2x.jpg +7a10 +> ./content/about-background.png +9,10d11 +< ./content/about-logo.svg +< ./content/about-logo@2x.png +14,15d14 +< ./content/aboutlogins.svg +< ./content/firefox-wordmark.svg +22,24d20 +< ./default22.png +< ./default24.png +< ./default256.png +$ +``` diff --git a/README2.md b/README2.md index 792bf47..73c93b4 100644 --- a/README2.md +++ b/README2.md @@ -1,12 +1,6 @@ Just some notes --------------- -Once you have built the entire mozilla-unified with all the mach bootstrap stuff (which will -install the needed binaries in $HOME/.mozbuild), don't forget to copy the entire -C:\Program Files\Git folder to /c/mozilla-source to get a sed.exe that understands the -z option, -and to get sha256sum.exe. - - To build, one should use the following command in the checked out windows repo: $ time bash build.sh fetch prepare build package @@ -16,46 +10,5 @@ the final .zip is in: C:\mozilla-source\windows -* problem with old sed. does not recognize -z. using the one from Git might be a work around. -BRANDING: resource files -======================== - -* build fail on missing stubinstaller (might be a FF bug as it should just take missing -stuff from the nightly branding folder?) - -``` -$ mkdir stubinstaller -$ cp bgstub.jpg stubinstaller -$ pwd -/c/mozilla-source/firefox-85.0/browser/branding/librewolf -$ - -* checking all the different files in nightly and librewolf - -$ cd nightly -$ find . | sort > /c/mozilla-source/branding-nightly.txt -$ cd ../librewolf/ -$ find . | sort > /c/mozilla-source/branding-librewolf.txt - - -$ diff branding-nightly.txt branding-librewolf.txt -4a5,6 -> ./bgstub.jpg -> ./bgstub_2x.jpg -7a10 -> ./content/about-background.png -9,10d11 -< ./content/about-logo.svg -< ./content/about-logo@2x.png -14,15d14 -< ./content/aboutlogins.svg -< ./content/firefox-wordmark.svg -22,24d20 -< ./default22.png -< ./default24.png -< ./default256.png -$ -``` - diff --git a/build.sh b/build.sh index f071bc3..b09c882 100644 --- a/build.sh +++ b/build.sh @@ -160,6 +160,7 @@ installer_win() { } + # windows: change $PATH to find all the build tools in .mozbuild # this might do the trick on macos aswell? if [ -f '/c/mozilla-build/start-shell.bat' ]; then @@ -192,12 +193,11 @@ if [[ "$*" == *installer_win* ]]; then done_something=1 fi - +# by default, do the whole thing.. if (( done_something == 0 )); then fetch prepare build package installer_win - exit fi diff --git a/installer_win.sh b/installer_win.sh index ede8372..002adbe 100644 --- a/installer_win.sh +++ b/installer_win.sh @@ -2,23 +2,23 @@ cp -rv ../settings/* obj-x86_64-pc-mingw32/dist/librewolf # recreate the zip file.. - cd obj-x86_64-pc-mingw32/dist -# clean garbage files -rm -rf librewolf/uninstall librewolf/maintenanceservice* librewolf/pingsender.exe -# be sure to remove the previous zip file.. -rm -f librewolf-$pkgver.en-US.win64.txt librewolf-$pkgver.en-US.win64.zip -zip -r9 librewolf-$pkgver.en-US.win64.zip librewolf -/c/mozilla-source/Git/usr/bin/sha256sum.exe librewolf-$pkgver.en-US.win64.zip > librewolf-$pkgver.en-US.win64.zip.sha256sum -# copy the resulting zip file -rm -vf ../../../librewolf-$pkgver.en-US.win64.zip* -cp -v librewolf-$pkgver.en-US.win64.zip* ../../.. + # clean garbage files + rm -vrf librewolf/uninstall librewolf/maintenanceservice* librewolf/pingsender.exe + # be sure to remove the previous zip file.. + rm -vf librewolf-$pkgver.en-US.win64.txt librewolf-$pkgver.en-US.win64.zip + zip -r9 librewolf-$pkgver.en-US.win64.zip librewolf + /c/mozilla-source/Git/usr/bin/sha256sum.exe librewolf-$pkgver.en-US.win64.zip > librewolf-$pkgver.en-US.win64.zip.sha256sum + # copy the resulting zip file + rm -vf ../../../librewolf-$pkgver.en-US.win64.zip* + cp -v librewolf-$pkgver.en-US.win64.zip* ../../.. cd ../.. # now to try to make the installer pushd .. -rm -vrf librewolf -unzip librewolf-$pkgver.en-US.win64.zip -cp -v missing_branding_files/firefox.ico librewolf/librewolf.ico -makensis-3.01.exe librewolf.nsi + rm -vrf librewolf + unzip librewolf-$pkgver.en-US.win64.zip + cp -v missing_branding_files/firefox.ico librewolf/librewolf.ico + makensis-3.01.exe librewolf.nsi + /c/mozilla-source/Git/usr/bin/sha256sum.exe librewolf-$pkgver.en-US.win64-setup.exe > librewolf-$pkgver.en-US.win64-setup.exe.sha256sum popd