diff options
| author | Ruben Rodriguez <ruben@gnu.org> | 2018-09-13 20:49:27 -0400 |
|---|---|---|
| committer | Ruben Rodriguez <ruben@gnu.org> | 2018-09-13 21:02:13 -0400 |
| commit | 6f457392c68f66036f46205f3c9079c9509cf261 (patch) | |
| tree | 227785aa3bccd492919f2c3b145a2c87d15b22a0 | |
| parent | 24e2995096a7b8def4ffea374c7a650c89f0ac1f (diff) | |
Buildscripts updated for v60
| -rw-r--r-- | data/buildscripts/build-gnulinux.sh | 1 | ||||
| -rw-r--r-- | data/buildscripts/buildall.sh | 12 | ||||
| -rw-r--r-- | data/buildscripts/mozconfig-gnulinux | 2 |
3 files changed, 5 insertions, 10 deletions
diff --git a/data/buildscripts/build-gnulinux.sh b/data/buildscripts/build-gnulinux.sh index 86e6199..9cc4d83 100644 --- a/data/buildscripts/build-gnulinux.sh +++ b/data/buildscripts/build-gnulinux.sh @@ -3,7 +3,6 @@ set -e set -x apt-get -q -y --force-yes build-dep firefox -apt-get -q -y --force-yes install libgstreamermm-0.10-dev cp ../../data/buildscripts/mozconfig-common .mozconfig cat ../../data/buildscripts/mozconfig-gnulinux >> .mozconfig diff --git a/data/buildscripts/buildall.sh b/data/buildscripts/buildall.sh index d3d48be..c078b30 100644 --- a/data/buildscripts/buildall.sh +++ b/data/buildscripts/buildall.sh @@ -15,8 +15,6 @@ cat << EOF > $SRCDIR/run.sh set -e set -x -export LD_PRELOAD="/usr/lib/libeatmydata/libeatmydata.so" - mkdir -p $HOME/ccache/$1-$3 || true export CCACHE_DIR=$HOME/ccache/$1-$3 mkdir $SRCDIR/../../toolchains || true @@ -25,9 +23,9 @@ sh ../data/buildscripts/toolchain-${1}.sh apt-get install -y --force-yes mercurial cd /usr/local/src -hg clone http://hg.mozilla.org/build/compare-locales/ +hg clone http://hg.mozilla.org/l10n/compare-locales/ cd compare-locales/ -hg checkout FIREFOX_45_2_0esr_RELEASE +hg checkout RELEASE_3_3_0 python setup.py install cp /usr/local/bin/compare* /usr/bin @@ -35,14 +33,14 @@ cd $SRCDIR sh ../../data/buildscripts/build-${1}.sh EOF -env -i TERM=screen eatmydata sudo HOME=/home/ruben BUILDDIST=$2 ARCH=$3 pbuilder execute $SRCDIR/run.sh +env -i TERM=screen sudo HOME=/home/ruben BUILDDIST=$2 ARCH=$3 pbuilder execute $SRCDIR/run.sh } #buildpackage windows belenos amd64 |tee windows.log 2>&1 #buildpackage mac belenos amd64 |tee mac.log 2>&1 -buildpackage gnulinux belenos i386 |tee gnulinux-i386.log 2>&1 +buildpackage gnulinux flidas i386 |tee gnulinux-i386.log 2>&1 sudo mv $SRCDIR/obj-gnulinux $SRCDIR/obj-gnulinux-i386 -buildpackage gnulinux belenos amd64 |tee gnulinux-amd64.log 2>&1 +buildpackage gnulinux flidas amd64 |tee gnulinux-amd64.log 2>&1 sudo mv $SRCDIR/obj-gnulinux $SRCDIR/obj-gnulinux-amd64 #buildpackage android belenos amd64 |tee android.log 2>&1 diff --git a/data/buildscripts/mozconfig-gnulinux b/data/buildscripts/mozconfig-gnulinux index 29413d8..1a4fe60 100644 --- a/data/buildscripts/mozconfig-gnulinux +++ b/data/buildscripts/mozconfig-gnulinux @@ -3,6 +3,4 @@ mk_add_options MOZ_OBJDIR=./obj-gnulinux ac_add_options --disable-webrtc -ac_add_options --enable-gio - ac_add_options --disable-gconf |