Bug 1240082 - Remove ant requirements; r=nalexander
authorJim Chen <nchen@mozilla.com>
Wed, 13 Jan 2016 13:19:23 -0500
changeset 315456 3e880d2651f98e22634003a9923a50b6668d896b
parent 315455 13b0b0246d81e1235b6922fa7980b09a4f88309c
child 315457 61f4f95d22edbe4b7cd3103024eb1af22ddc1d9b
child 315513 38ba884086c7411f7b20cc3023e038939e1ced3d
push id5703
push userraliiev@mozilla.com
push dateMon, 07 Mar 2016 14:18:41 +0000
treeherdermozilla-beta@31e373ad5b5f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1240082
milestone46.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 1240082 - Remove ant requirements; r=nalexander
mobile/android/b2gdroid/config/mozconfigs/common
mobile/android/config/mozconfigs/common
mobile/android/config/tooltool-manifests/android-armv6/releng.manifest
mobile/android/config/tooltool-manifests/android-x86/releng.manifest
mobile/android/config/tooltool-manifests/android/releng.manifest
mobile/android/config/tooltool-manifests/b2gdroid/releng.manifest
python/mozboot/mozboot/debian.py
python/mozboot/mozboot/fedora.py
python/mozboot/mozboot/osx.py
--- a/mobile/android/b2gdroid/config/mozconfigs/common
+++ b/mobile/android/b2gdroid/config/mozconfigs/common
@@ -15,16 +15,19 @@ MOZ_AUTOMATION_L10N_CHECK=0
 # the relevant env vars are not set up in that case, leaving the build to
 # run from the JRE/JDK in /usr/lib/jvm.
 if [ ! -f /etc/redhat-release ] || [ "$(< /etc/redhat-release)" != "CentOS release 6.2 (Final)" ]; then
     # set JAVA_HOME to find the JRE/JDK from tooltool.  Several scripts in the JDK
     # assume `java` is in PATH, so set that too.  To see how this tarball is built,
     # see testing/taskcluster/scripts/misc/repackage-jdk.sh
     export JAVA_HOME="$topsrcdir/java_home"
     export PATH="$PATH:$topsrcdir/java_home/bin"
+
+    mk_add_options "export JAVA_HOME=$topsrcdir/java_home"
+    mk_add_options "export PATH=$PATH:$topsrcdir/java_home/bin"
 fi
 
 # Set the most aggressive settings for szip. Not the default because it's
 # much slower and we didn't want to slow down developers builds.
 # Has no effect when MOZ_ENABLE_SZIP is not set in mobile/android/confvars.sh.
 MOZ_SZIP_FLAGS="-D auto -f auto"
 
 ac_add_options --enable-elf-hack
@@ -57,19 +60,15 @@ export MOZ_PACKAGE_JSSHELL=1
 . "$topsrcdir/build/mozconfig.cache"
 
 HOST_CC="$topsrcdir/gcc/bin/gcc"
 HOST_CXX="$topsrcdir/gcc/bin/g++"
 
 # Avoid dependency on libstdc++ 4.7
 ac_add_options --enable-stdcxx-compat
 
-mk_add_options "export ANT_HOME=$topsrcdir/apache-ant"
-
-mk_add_options "export PATH=$topsrcdir/apache-ant/bin:$PATH"
-
 JS_BINARY="$topsrcdir/mobile/android/config/js_wrapper.sh"
 
 # Configure gaia
 GAIADIR=$topsrcdir/gaia
 
 # Add moz-tt fonts
 MOZTTDIR=$topsrcdir/moz-tt
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -15,16 +15,19 @@ MOZ_AUTOMATION_L10N_CHECK=0
 # the relevant env vars are not set up in that case, leaving the build to
 # run from the JRE/JDK in /usr/lib/jvm.
 if [ ! -f /etc/redhat-release ] || [ "$(< /etc/redhat-release)" != "CentOS release 6.2 (Final)" ]; then
     # set JAVA_HOME to find the JRE/JDK from tooltool.  Several scripts in the JDK
     # assume `java` is in PATH, so set that too.  To see how this tarball is built,
     # see testing/taskcluster/scripts/misc/repackage-jdk.sh
     export JAVA_HOME="$topsrcdir/java_home"
     export PATH="$PATH:$topsrcdir/java_home/bin"
+
+    mk_add_options "export JAVA_HOME=$topsrcdir/java_home"
+    mk_add_options "export PATH=$PATH:$topsrcdir/java_home/bin"
 fi
 
 # Set the most aggressive settings for szip. Not the default because it's
 # much slower and we didn't want to slow down developers builds.
 # Has no effect when MOZ_ENABLE_SZIP is not set in mobile/android/confvars.sh.
 MOZ_SZIP_FLAGS="-D auto -f auto"
 
 ac_add_options --enable-elf-hack
@@ -56,13 +59,9 @@ export MOZ_PACKAGE_JSSHELL=1
 . "$topsrcdir/build/mozconfig.cache"
 
 HOST_CC="$topsrcdir/gcc/bin/gcc"
 HOST_CXX="$topsrcdir/gcc/bin/g++"
 
 # Avoid dependency on libstdc++ 4.7
 ac_add_options --enable-stdcxx-compat
 
-mk_add_options "export ANT_HOME=$topsrcdir/apache-ant"
-
-mk_add_options "export PATH=$topsrcdir/apache-ant/bin:$PATH"
-
 JS_BINARY="$topsrcdir/mobile/android/config/js_wrapper.sh"
--- a/mobile/android/config/tooltool-manifests/android-armv6/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android-armv6/releng.manifest
@@ -17,23 +17,16 @@
 {
 "size": 167175,
 "digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
 "algorithm": "sha512",
 "filename": "sccache.tar.bz2",
 "unpack": true
 },
 {
-"size": 7920445,
-"digest": "e28b7a12fbbef02ad742958df8dd356ea2adb8ef79e95cd8eb8dbc953eb4cc11888969dac7d636187fd3ace9c63d9a6bc3d7795021c1d811a843e413fe5e52c9",
-"algorithm": "sha512",
-"filename": "apache-ant.tar.bz2",
-"unpack": true
-},
-{
 "size": 4906080,
 "digest": "d735544e039da89382c53b2302b7408d4610247b4f8b5cdc5a4d5a8ec5470947b19e8ea7f7a37e78222e661347e394e0030d81f41534138b527b14e9c4e55634",
 "algorithm": "sha512",
 "filename": "jsshell.tar.xz",
 "unpack": true
 },
 {
 "size": 80458572,
--- a/mobile/android/config/tooltool-manifests/android-x86/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android-x86/releng.manifest
@@ -18,23 +18,16 @@
 {
 "size": 167175,
 "digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
 "algorithm": "sha512",
 "filename": "sccache.tar.bz2",
 "unpack": true
 },
 {
-"size": 7920445,
-"digest": "e28b7a12fbbef02ad742958df8dd356ea2adb8ef79e95cd8eb8dbc953eb4cc11888969dac7d636187fd3ace9c63d9a6bc3d7795021c1d811a843e413fe5e52c9",
-"algorithm": "sha512",
-"filename": "apache-ant.tar.bz2",
-"unpack": true
-},
-{
 "size": 4906080,
 "digest": "d735544e039da89382c53b2302b7408d4610247b4f8b5cdc5a4d5a8ec5470947b19e8ea7f7a37e78222e661347e394e0030d81f41534138b527b14e9c4e55634",
 "algorithm": "sha512",
 "filename": "jsshell.tar.xz",
 "unpack": true
 },
 {
 "size": 80458572,
--- a/mobile/android/config/tooltool-manifests/android/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android/releng.manifest
@@ -19,24 +19,16 @@
 "size": 167175,
 "visibility": "public",
 "digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
 "algorithm": "sha512",
 "filename": "sccache.tar.bz2",
 "unpack": true
 },
 {
-"size": 7920445,
-"visibility": "public",
-"digest": "e28b7a12fbbef02ad742958df8dd356ea2adb8ef79e95cd8eb8dbc953eb4cc11888969dac7d636187fd3ace9c63d9a6bc3d7795021c1d811a843e413fe5e52c9",
-"algorithm": "sha512",
-"filename": "apache-ant.tar.bz2",
-"unpack": true
-},
-{
 "size": 4906080,
 "visibility": "public",
 "unpack": true,
 "digest": "d735544e039da89382c53b2302b7408d4610247b4f8b5cdc5a4d5a8ec5470947b19e8ea7f7a37e78222e661347e394e0030d81f41534138b527b14e9c4e55634",
 "algorithm": "sha512",
 "filename": "jsshell.tar.xz"
 },
 {
--- a/mobile/android/config/tooltool-manifests/b2gdroid/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/b2gdroid/releng.manifest
@@ -19,24 +19,16 @@
 "size": 167175,
 "visibility": "public",
 "digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
 "algorithm": "sha512",
 "filename": "sccache.tar.bz2",
 "unpack": true
 },
 {
-"size": 7920445,
-"visibility": "public",
-"digest": "e28b7a12fbbef02ad742958df8dd356ea2adb8ef79e95cd8eb8dbc953eb4cc11888969dac7d636187fd3ace9c63d9a6bc3d7795021c1d811a843e413fe5e52c9",
-"algorithm": "sha512",
-"filename": "apache-ant.tar.bz2",
-"unpack": true
-},
-{
 "size": 4906080,
 "visibility": "public",
 "unpack": true,
 "digest": "d735544e039da89382c53b2302b7408d4610247b4f8b5cdc5a4d5a8ec5470947b19e8ea7f7a37e78222e661347e394e0030d81f41534138b527b14e9c4e55634",
 "algorithm": "sha512",
 "filename": "jsshell.tar.xz"
 },
 {
--- a/python/mozboot/mozboot/debian.py
+++ b/python/mozboot/mozboot/debian.py
@@ -69,17 +69,16 @@ class DebianBootstrapper(BaseBootstrappe
     # Subclasses can add packages to this variable to have them installed.
     BROWSER_DISTRO_PACKAGES = []
 
     # These are common packages for building Firefox for Android
     # (mobile/android) for all Debian-derived distros (such as Ubuntu).
     MOBILE_ANDROID_COMMON_PACKAGES = [
         'zlib1g-dev',  # mobile/android requires system zlib.
         'openjdk-7-jdk',
-        'ant',
         'wget',  # For downloading the Android SDK and NDK.
         'libncurses5:i386',  # See comments about i386 below.
         'libstdc++6:i386',
         'zlib1g:i386',
     ]
 
     # Subclasses can add packages to this variable to have them installed.
     MOBILE_ANDROID_DISTRO_PACKAGES = []
--- a/python/mozboot/mozboot/fedora.py
+++ b/python/mozboot/mozboot/fedora.py
@@ -38,17 +38,16 @@ class FedoraBootstrapper(BaseBootstrappe
             'libXt-devel',
             'mesa-libGL-devel',
             'pulseaudio-libs-devel',
             'wireless-tools-devel',
             'yasm',
         ]
 
         self.mobile_android_packages = [
-            'ant',
             'ncurses-devel.i686',
             'libstdc++.i686',
             'zlib-devel.i686',
         ]
 
     def install_system_packages(self):
         self.dnf_groupinstall(*self.group_packages)
         self.dnf_install(*self.packages)
--- a/python/mozboot/mozboot/osx.py
+++ b/python/mozboot/mozboot/osx.py
@@ -329,17 +329,16 @@ class OSXBootstrapper(BaseBootstrapper):
         # 1. System packages.
         # 2. Android SDK and NDK.
         # 3. Android packages.
 
         import android
 
         # 1. System packages.
         packages = [
-            ('ant', 'ant'),
             ('brew-cask', 'caskroom/cask/brew-cask'),  # For installing Java later.
             ('wget', 'wget'),
         ]
         self._ensure_homebrew_packages(packages)
 
         casks = [
             ('java', 'java'),
         ]