Wed, 31 Dec 2014 07:16:47 +0100
Revert simplistic fix pending revisit of Mozilla integration attempt.
michael@0 | 1 | # This file is sourced by the nightly, beta, and release mozconfigs. |
michael@0 | 2 | |
michael@0 | 3 | . "$topsrcdir/browser/config/mozconfigs/common" |
michael@0 | 4 | |
michael@0 | 5 | ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} |
michael@0 | 6 | ac_add_options --enable-update-packaging |
michael@0 | 7 | ac_add_options --enable-jemalloc |
michael@0 | 8 | if [ -f /c/builds/gapi.data ]; then |
michael@0 | 9 | _gapi_keyfile=/c/builds/gapi.data |
michael@0 | 10 | else |
michael@0 | 11 | _gapi_keyfile=/e/builds/gapi.data |
michael@0 | 12 | fi |
michael@0 | 13 | ac_add_options --with-google-api-keyfile=${_gapi_keyfile} |
michael@0 | 14 | |
michael@0 | 15 | |
michael@0 | 16 | # Needed to enable breakpad in application.ini |
michael@0 | 17 | export MOZILLA_OFFICIAL=1 |
michael@0 | 18 | |
michael@0 | 19 | export MOZ_TELEMETRY_REPORTING=1 |
michael@0 | 20 | |
michael@0 | 21 | if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then |
michael@0 | 22 | . $topsrcdir/build/win32/mozconfig.vs2010-win64 |
michael@0 | 23 | else |
michael@0 | 24 | . $topsrcdir/build/win32/mozconfig.vs2010 |
michael@0 | 25 | fi |
michael@0 | 26 | |
michael@0 | 27 | # Treat warnings as errors in directories with FAIL_ON_WARNINGS. |
michael@0 | 28 | ac_add_options --enable-warnings-as-errors |
michael@0 | 29 | |
michael@0 | 30 | # Package js shell. |
michael@0 | 31 | export MOZ_PACKAGE_JSSHELL=1 |