Bug 1085513 part3: Remove unused mozconfig files r=lightsofapollo,garndt.
authorWander Lairson Costa <wcosta@mozilla.com>
Wed, 26 Nov 2014 10:11:30 -0800
changeset 225671 c3caeaf015fc04bbd85a6f3c189bb240e0a79e1c
parent 225670 7b098c2b6c2a02f7cdf583e1cf2a96e8fa678490
child 225672 4b8136cc26676db3ed5292f428a8fafbf3955e6d
push id28174
push userryanvm@gmail.com
push dateMon, 26 Jan 2015 21:23:42 +0000
treeherdermozilla-central@c3a90afa2dee [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslightsofapollo, garndt
bugs1085513
milestone38.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1085513 part3: Remove unused mozconfig files r=lightsofapollo,garndt. Since we now use the gecko tree mozconfigs for building, the docker mozconfigs are no longer necessary.
testing/docker/builder/Dockerfile
testing/docker/builder/VERSION
testing/docker/builder/mozconfigs/b2g-desktop
testing/docker/builder/mozconfigs/opt-firefox
--- a/testing/docker/builder/Dockerfile
+++ b/testing/docker/builder/Dockerfile
@@ -1,15 +1,14 @@
 FROM          quay.io/mozilla/base:0.0.2
 MAINTAINER    Jonas Finnemann Jensen <jopsen@gmail.com>
 
 ENV PATH $PATH:/home/worker/bin/
 
 # Add utilities and configuration
-ADD           mozconfigs/           /home/worker/mozconfigs/
 RUN           mkdir -p              /home/worker/bin
 ADD           build.sh              /home/worker/bin/build.sh
 ADD           build-b2g-desktop.sh  /home/worker/bin/build-b2g-desktop.sh
 ADD           get-objdir.py         /home/worker/bin/get-objdir.py
 ADD           get_gaia_repo.js      /home/worker/bin/get_gaia_repo.js
 ADD           get_gaia_revision.js  /home/worker/bin/get_gaia_revision.js
 ADD           build-setup.sh        /home/worker/bin/build-setup.sh
 
--- a/testing/docker/builder/VERSION
+++ b/testing/docker/builder/VERSION
@@ -1,1 +1,1 @@
-0.0.12
+0.0.13
deleted file mode 100644
--- a/testing/docker/builder/mozconfigs/b2g-desktop
+++ /dev/null
@@ -1,48 +0,0 @@
-. "$topsrcdir/b2g/config/mozconfigs/common"
-ac_add_options --enable-stdcxx-compat
-
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
-ac_add_options --enable-signmar
-ac_add_options --enable-debug
-
-# Nightlies only since this has a cost in performance
-#ac_add_options --enable-js-diagnostics
-
-# This will overwrite the default of stripping everything and keep the symbol table.
-# This is useful for profiling and debugging and only increases the package size
-# by 2 MBs.
-STRIP_FLAGS="--strip-debug"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
-# DISABLED WHILE NOT ON TRY ac_add_options --enable-warnings-as-errors
-
-# Use ccache
-#. "$topsrcdir/build/mozconfig.cache"
-
-#B2G options
-ac_add_options --enable-application=b2g
-ENABLE_MARIONETTE=1
-ac_add_options --disable-elf-hack
-export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
-
-GAIADIR=/home/worker/gaia/source
-
-. "$topsrcdir/b2g/config/mozconfigs/common.override"
-
-
-mk_add_options MOZ_OBJDIR=/home/worker/object-folder/
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
-
-# Not sure about this one...
-ac_add_options --disable-libjpeg-turbo
-
-# This option is required if you want to be able to run Gaia's tests
-ac_add_options --enable-tests
deleted file mode 100644
--- a/testing/docker/builder/mozconfigs/opt-firefox
+++ /dev/null
@@ -1,8 +0,0 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-mk_add_options MOZ_OBJDIR=/home/worker/object-folder/
-
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
-