de-Archify some aspects of builds and -scripts; allow to initiate separate steps manually; first attempt to build tarball on ubuntu 16.04

1 files changed, 80 insertions, 0 deletions

diff --git a/binary_tarball/scripts/4_Build_Binary_Tarball.sh b/binary_tarball/scripts/4_Build_Binary_Tarball.sh
index ebb5fd4..e8c9f5a 100755
--- a/binary_tarball/scripts/4_Build_Binary_Tarball.sh
+++ b/binary_tarball/scripts/4_Build_Binary_Tarball.sh
@@ -4,14 +4,42 @@ printf "\n\n--------------------------------------- BUILD ----------------------
 # Setup Script Variables
 SOURCE_FOLDER=$1;
 OUTPUT_TARBALL=$2;
+CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../../)}
 _SOURCE_CODE_BINARY_TARBALL_LOCATION="./obj*/dist/librewolf*.tar.bz2";
 
+export MOZ_NOSPAM=1
+export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
+
+# LTO needs more open files
+ulimit -n 4096
+
+# -fno-plt with cross-LTO causes obscure LLVM errors
+# LLVM ERROR: Function Import: link error
+CFLAGS="${CFLAGS/-fno-plt/}"
+CXXFLAGS="${CXXFLAGS/-fno-plt/}"
+
 # Prevents build from breaking in CI/CD environments
 export SHELL=/bin/bash;
 
 # Changes current folder to the source code folder
 cd $SOURCE_FOLDER;
 
+# Do 3-tier PGO
+echo "Building instrumented browser..."
+
+if [[ $CARCH == 'aarch64' ]]; then
+
+cat >.mozconfig ../mozconfig - <<END
+ac_add_options --enable-profile-generate
+END
+
+else
+
+cat >.mozconfig ../mozconfig - <<END
+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;
@@ -20,6 +48,58 @@ printf "\nRunning bootstrapper to install build dependencies (using ./mach scrip
 printf "\nBuilding LibreWolf\n";
 ./mach build;
 
+echo "Profiling instrumented browser..."
+./mach package
+LLVM_PROFDATA=llvm-profdata \
+  JARLOG_FILE="$PWD/jarlog" \
+  xvfb-run -s "-screen 0 1920x1080x24 -nolisten local" \
+  ./mach python build/pgo/profileserver.py
+
+if [[ ! -s merged.profdata ]]; then
+  echo "No profile data produced."
+  return 1
+fi
+
+if [[ ! -s jarlog ]]; then
+  echo "No jar log produced."
+  return 1
+fi
+
+echo "Removing instrumented browser..."
+./mach clobber
+
+echo "Building optimized browser..."
+
+if [[ $CARCH == 'aarch64' ]]; then
+
+cat >.mozconfig ../mozconfig - <<END
+ac_add_options --enable-lto
+ac_add_options --enable-profile-use
+ac_add_options --with-pgo-profile-path=${PWD@Q}/merged.profdata
+ac_add_options --with-pgo-jarlog=${PWD@Q}/jarlog
+# seems to break on arm
+# ac_add_options --enable-linker=gold
+END
+
+else
+
+cat >.mozconfig ../mozconfig - <<END
+ac_add_options --enable-lto=cross
+ac_add_options --enable-profile-use=cross
+ac_add_options --with-pgo-profile-path=${PWD@Q}/merged.profdata
+ac_add_options --with-pgo-jarlog=${PWD@Q}/jarlog
+ac_add_options --enable-linker=gold
+END
+
+fi
+
+./mach build
+
+echo "Building symbol archive..."
+./mach buildsymbols
+
+# End "build()" equivalent.
+
 # Packages the build into a binary tarball
 printf "\nPackaging LibreWolf\n";
 ./mach package;