diff options
| author | ohfp <1813007-ohfp@users.noreply.gitlab.com> | 2020-03-29 00:29:09 +0100 |
|---|---|---|
| committer | ohfp <1813007-ohfp@users.noreply.gitlab.com> | 2020-03-29 00:29:09 +0100 |
| commit | 45614f50a6238a71af602512d06730336d1005a0 (patch) | |
| tree | ee5558ea8e5a1846690849436997ba0ba8c8d1eb | |
| parent | several small script fixes (diff) | |
| download | librewolf-linux-45614f50a6238a71af602512d06730336d1005a0.tar.gz librewolf-linux-45614f50a6238a71af602512d06730336d1005a0.tar.bz2 librewolf-linux-45614f50a6238a71af602512d06730336d1005a0.zip | |
bootstrap recreates mozconfig, it seems
| -rwxr-xr-x | binary_tarball/scripts/3_Configure_Source_Code.sh | 2 | ||||
| -rwxr-xr-x | binary_tarball/scripts/4_Build_Binary_Tarball.sh | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/binary_tarball/scripts/3_Configure_Source_Code.sh b/binary_tarball/scripts/3_Configure_Source_Code.sh index 3927dec..9145243 100755 --- a/binary_tarball/scripts/3_Configure_Source_Code.sh +++ b/binary_tarball/scripts/3_Configure_Source_Code.sh @@ -97,5 +97,3 @@ sed -i 's#SaveToPocket.init();#// SaveToPocket.init();#g' browser/components/Bro # allow SearchEngines option in non-ESR builds sed -i 's#"enterprise_only": true,#"enterprise_only": false,#g' browser/components/enterprisepolicies/schemas/policies-schema.json - -rm -f common/source_files/mozconfig diff --git a/binary_tarball/scripts/4_Build_Binary_Tarball.sh b/binary_tarball/scripts/4_Build_Binary_Tarball.sh index c1dc1f9..dfbb28a 100755 --- a/binary_tarball/scripts/4_Build_Binary_Tarball.sh +++ b/binary_tarball/scripts/4_Build_Binary_Tarball.sh @@ -24,6 +24,13 @@ export SHELL=/bin/bash; # Changes current folder to the source code folder cd $srcdir; +# Runs bootstrapper to install dependencies +printf "\nRunning bootstrapper to install build dependencies (using ./mach script within source code)\n"; +./mach bootstrap --application-choice=browser --no-interactive; + +# deleting it earlier breaks because bootstrap seems to create a new one +rm -f common/source_files/mozconfig + # Do 3-tier PGO echo "Building instrumented browser..." @@ -40,9 +47,6 @@ ac_add_options --enable-profile-generate=cross END fi -# Runs bootstrapper to install dependencies -printf "\nRunning bootstrapper to install build dependencies (using ./mach script within source code)\n"; -./mach bootstrap --application-choice=browser --no-interactive; # Executes the actual build printf "\nBuilding LibreWolf\n"; |