Updated build scripts to match upstream changes

3 files changed, 76 insertions, 3 deletions

diff --git a/data/buildscripts/build-gnulinux.sh b/data/buildscripts/build-gnulinux.sh
index 6fb9667..e3fdb70 100644
--- a/data/buildscripts/build-gnulinux.sh
+++ b/data/buildscripts/build-gnulinux.sh
@@ -2,8 +2,17 @@
 set -e
 set -x
 
+wget https://deb.nodesource.com/setup_16.x -O /tmp/nodesource_setup.sh
+sed '/toutatis/s|precise|focal|;s/toutatis/nabia/' -i /tmp/nodesource_setup.sh
+bash /tmp/nodesource_setup.sh
+
 apt-get update
-apt-get -q -y --force-yes build-dep firefox
+apt install nodejs
+aptitude -q -y  build-dep firefox
+cargo install cbindgen --version 0.23.0
+
+ln -s /usr/lib/llvm*/bin/clang /bin/clang -f
+ln -s /usr/lib/llvm*/bin/clang++ /bin/clang++ -f
 
 cp ../../data/buildscripts/mozconfig-common .mozconfig
 cat ../../data/buildscripts/mozconfig-gnulinux >> .mozconfig
diff --git a/data/buildscripts/buildall-sbuild.sh b/data/buildscripts/buildall-sbuild.sh
new file mode 100644
index 0000000..43cef41
--- /dev/null
+++ b/data/buildscripts/buildall-sbuild.sh
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+# This script expects a Trisquel sbuild environment, such as the one provided by https://gitlab.trisquel.org/trisquel/trisquel-builder/-/blob/master/sbuild-create.sh
+
+set -e
+set -x
+
+if [ $# != 1 ]; then
+  echo E: pass the source dir as parameter
+  exit 1
+fi
+
+SRCDIR=$(readlink -f $1)
+VERSION=$(echo $1|sed 's|.*icecat-||')
+ROOTDIR=$(readlink -f $SRCDIR/../../)
+BUILDDIR=/var/lib/sbuild/build/
+BUILDDIST=nabia
+
+sudo rm -rf /var/lib/sbuild/build/gnuzilla
+cp -a $ROOTDIR $BUILDDIR/gnuzilla
+
+
+function buildpackage(){
+cat << EOF > $BUILDDIR/run.sh
+set -e
+set -x
+
+apt update
+apt-get build-dep -y --force-yes firefox 
+
+apt-get install -y --force-yes mercurial python-setuptools
+cd /usr/local/src
+hg clone http://hg.mozilla.org/l10n/compare-locales/
+cd compare-locales/
+hg checkout RELEASE_3_3_0
+python2 setup.py install
+cp /usr/local/bin/compare* /usr/bin
+
+cd /build/gnuzilla/output/icecat-$VERSION
+
+bash ../../data/buildscripts/build-${1}.sh
+bash
+rm /build/run.sh
+
+EOF
+
+env -i sudo schroot --directory / -c $BUILDDIST-$3 -- bash  /build/run.sh
+}
+
+#buildpackage windows $BUILDDIST amd64 |tee  windows.log 2>&1
+#buildpackage mac $BUILDDIST amd64 |tee mac.log 2>&1
+#buildpackage gnulinux $BUILDDIST i386 |tee gnulinux-i386.log 2>&1
+#sudo mv $SRCDIR/obj-gnulinux $SRCDIR/obj-gnulinux-i386
+buildpackage gnulinux $BUILDDIST amd64 |tee gnulinux-amd64.log 2>&1
+sudo mv $SRCDIR/obj-gnulinux $SRCDIR/obj-gnulinux-amd64
+#buildpackage android $BUILDDIST amd64  |tee android.log 2>&1
+
+rm binaries -rf
+mkdir binaries/langpacks -p
+#cp $1/obj-windows/dist/icecat*.zip binaries
+#cp $1/obj-mac/dist/icecat/icecat*.dmg binaries
+cp $1/obj-gnulinux*/dist/icecat*.bz2 binaries
+#cp $1/obj-android/dist/icecat*.apk binaries
+cp $1/obj-gnulinux-amd64/dist/linux-x86_64/xpi/* binaries/langpacks
+rename 's/linux/gnulinux/' binaries/*
diff --git a/data/buildscripts/mozconfig-common b/data/buildscripts/mozconfig-common
index 0b2b9e0..581d55f 100644
--- a/data/buildscripts/mozconfig-common
+++ b/data/buildscripts/mozconfig-common
@@ -1,8 +1,6 @@
 ac_add_options --with-l10n-base=$PWD/l10n
 ac_add_options --enable-official-branding
 ac_add_options --with-distribution-id=org.gnu
-mk_add_options MOZ_MAKE_FLAGS=-j7
-ac_add_options --with-ccache=/usr/bin/ccache
 ac_add_options --enable-release
 ac_add_options --with-unsigned-addon-scopes=app,system
 ac_add_options --allow-addon-sideload
@@ -13,3 +11,4 @@ ac_add_options --disable-tests
 ac_add_options --disable-updater
 ac_add_options --disable-crashreporter
 ac_add_options --disable-eme
+ac_add_options --without-wasm-sandboxed-libraries