Bug 1369551 - Remove unused release mozconfigs for fennec, r?mtabara
* removes old files mobile/android/config/mozconfigs/*/{release,l10n-release}
* updates merge day scripts (did some config dumping to verify, but didn't run migration)
* updates testing/mozharness/configs/single_locale/{staging_,}mozilla-{beta,release}_android-api-15.py to remove bogus mozconfig definition, which now comes from single_locale/tc_android-api-15.py
I could go on and look at configs/multi_locale, which appear to be unused, but I've got to draw a line somewhere.
MozReview-Commit-ID: 2zLYlMj0B9t
deleted file mode 100644
--- a/mobile/android/config/mozconfigs/android-aarch64/l10n-release
+++ /dev/null
@@ -1,28 +0,0 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
-# L10n
-ac_add_options --with-l10n-base=../../l10n-central
-
-# Global options
-ac_add_options --disable-tests
-
-# Android
-ac_add_options --with-android-min-sdk=21
-ac_add_options --target=aarch64-linux-android
-
-ac_add_options --with-system-zlib
-ac_add_options --enable-updater
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --enable-official-branding
-ac_add_options --with-branding=mobile/android/branding/beta
-
-ac_add_options --disable-stdcxx-compat
-
-# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
-# Bug 1283438
-mk_add_options AUTOCLOBBER=
-
-. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
deleted file mode 100644
--- a/mobile/android/config/mozconfigs/android-aarch64/release
+++ /dev/null
@@ -1,16 +0,0 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
-# Android
-ac_add_options --with-android-min-sdk=21
-ac_add_options --target=aarch64-linux-android
-
-ac_add_options --with-branding=mobile/android/branding/beta
-
-ac_add_options --enable-updater
-
-export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
-
-ac_add_options --enable-official-branding
-
-. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
deleted file mode 100644
--- a/mobile/android/config/mozconfigs/android-api-15/l10n-release
+++ /dev/null
@@ -1,28 +0,0 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
-# L10n
-ac_add_options --with-l10n-base=../../l10n-central
-
-# Global options
-ac_add_options --disable-tests
-
-# Android
-ac_add_options --with-android-min-sdk=15
-ac_add_options --target=arm-linux-androideabi
-
-ac_add_options --with-system-zlib
-ac_add_options --enable-updater
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --enable-official-branding
-ac_add_options --with-branding=mobile/android/branding/beta
-
-ac_add_options --disable-stdcxx-compat
-
-# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
-# Bug 1283438
-mk_add_options AUTOCLOBBER=
-
-. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
deleted file mode 100644
--- a/mobile/android/config/mozconfigs/android-api-15/release
+++ /dev/null
@@ -1,16 +0,0 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
-# Android
-ac_add_options --with-android-min-sdk=15
-ac_add_options --target=arm-linux-androideabi
-
-ac_add_options --with-branding=mobile/android/branding/beta
-
-ac_add_options --enable-updater
-
-export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
-
-ac_add_options --enable-official-branding
-
-. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
deleted file mode 100644
--- a/mobile/android/config/mozconfigs/android-x86/l10n-release
+++ /dev/null
@@ -1,27 +0,0 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
-# L10n
-ac_add_options --with-l10n-base=../../l10n-central
-
-# Global options
-ac_add_options --disable-tests
-
-# Android
-ac_add_options --target=i386-linux-android
-ac_add_options --with-android-min-sdk=15
-
-ac_add_options --enable-updater
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --enable-official-branding
-ac_add_options --with-branding=mobile/android/branding/beta
-
-ac_add_options --disable-stdcxx-compat
-
-# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
-# Bug 1283438
-mk_add_options AUTOCLOBBER=
-
-. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
deleted file mode 100644
--- a/mobile/android/config/mozconfigs/android-x86/release
+++ /dev/null
@@ -1,16 +0,0 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
-# Android
-ac_add_options --target=i386-linux-android
-ac_add_options --with-android-min-sdk=15
-
-ac_add_options --enable-updater
-
-ac_add_options --with-branding=mobile/android/branding/beta
-
-export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
-
-ac_add_options --enable-official-branding
-
-. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/testing/mozharness/configs/merge_day/beta_to_release.py
+++ b/testing/mozharness/configs/merge_day/beta_to_release.py
@@ -7,30 +7,28 @@ config = {
"copy_files": [
{
"src": "browser/config/version.txt",
"dst": "browser/config/version_display.txt",
},
],
"replacements": [
# File, from, to
- ("{}/{}".format(d, f),
+ ("{}{}".format(d, f),
"ac_add_options --with-branding=mobile/android/branding/beta",
"ac_add_options --with-branding=mobile/android/branding/official")
for d in ["mobile/android/config/mozconfigs/android-api-15/",
"mobile/android/config/mozconfigs/android-x86/"]
- for f in ["debug", "nightly", "l10n-nightly", "l10n-release", "release"]
+ for f in ["debug", "nightly", "l10n-nightly"]
] + [
# File, from, to
- ("{}/{}".format(d, f),
- "ac_add_options --with-l10n-base=../../mozilla-beta",
+ (f, "ac_add_options --with-l10n-base=../../mozilla-beta",
"ac_add_options --with-l10n-base=../../mozilla-release")
- for d in ["mobile/android/config/mozconfigs/android-api-15/",
- "mobile/android/config/mozconfigs/android-x86/"]
- for f in ["l10n-nightly", "l10n-release"]
+ for f in ["mobile/android/config/mozconfigs/android-api-15/l10n-nightly",
+ "mobile/android/config/mozconfigs/android-x86/l10n-nightly"]
] + [
# File, from, to
("browser/confvars.sh",
"ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release",
"ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-release"),
("browser/confvars.sh",
"MAR_CHANNEL_ID=firefox-mozilla-beta",
"MAR_CHANNEL_ID=firefox-mozilla-release"),
--- a/testing/mozharness/configs/merge_day/central_to_beta.py
+++ b/testing/mozharness/configs/merge_day/central_to_beta.py
@@ -6,39 +6,37 @@ config = {
"log_name": "central_to_beta",
"version_files": [
{"file": "browser/config/version.txt", "suffix": ""},
{"file": "browser/config/version_display.txt", "suffix": "b1"},
{"file": "config/milestone.txt", "suffix": ""},
],
"replacements": [
# File, from, to
- ("{}/{}".format(d, f),
+ ("{}{}".format(d, f),
"ac_add_options --with-branding=mobile/android/branding/nightly",
"ac_add_options --with-branding=mobile/android/branding/beta")
for d in ["mobile/android/config/mozconfigs/android-api-15/",
"mobile/android/config/mozconfigs/android-x86/"]
for f in ["debug", "nightly", "l10n-nightly"]
] + [
# File, from, to
(f, "ac_add_options --with-branding=browser/branding/nightly",
"ac_add_options --enable-official-branding")
for f in ["browser/config/mozconfigs/linux32/l10n-mozconfig",
"browser/config/mozconfigs/linux64/l10n-mozconfig",
"browser/config/mozconfigs/win32/l10n-mozconfig",
"browser/config/mozconfigs/win64/l10n-mozconfig",
"browser/config/mozconfigs/macosx64/l10n-mozconfig"]
] + [
# File, from, to
- ("{}/{}".format(d, f),
- "ac_add_options --with-l10n-base=../../l10n-central",
+ (f, "ac_add_options --with-l10n-base=../../l10n-central",
"ac_add_options --with-l10n-base=../../mozilla-beta")
- for d in ["mobile/android/config/mozconfigs/android-api-15/",
- "mobile/android/config/mozconfigs/android-x86/"]
- for f in ["l10n-nightly", "l10n-release"]
+ for f in ["mobile/android/config/mozconfigs/android-api-15/l10n-nightly",
+ "mobile/android/config/mozconfigs/android-x86/l10n-nightly"]
] + [
# File, from, to
(f, "ac_add_options --enable-profiling", "") for f in
["mobile/android/config/mozconfigs/android-api-15/nightly",
"mobile/android/config/mozconfigs/android-x86/nightly",
"browser/config/mozconfigs/linux32/nightly",
"browser/config/mozconfigs/linux64/nightly",
"browser/config/mozconfigs/macosx64/nightly",
--- a/testing/mozharness/configs/single_locale/mozilla-beta_android-api-15.py
+++ b/testing/mozharness/configs/single_locale/mozilla-beta_android-api-15.py
@@ -53,17 +53,16 @@ config = {
"MOZ_OBJDIR": OBJDIR,
"LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"upload_branch": "%s-android-api-15" % BRANCH,
"ssh_key_dir": "~/.ssh",
"merge_locales": True,
"mozilla_dir": MOZILLA_DIR,
- "mozconfig": "%s/mobile/android/config/mozconfigs/android-api-15/l10n-release" % MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
"key_alias": "release",
# Mock
"mock_target": "mozilla-centos6-x86_64-android",
"mock_packages": ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',
'gtk2-devel', 'libnotify-devel', 'yasm',
'alsa-lib-devel', 'libcurl-devel',
--- a/testing/mozharness/configs/single_locale/mozilla-release_android-api-15.py
+++ b/testing/mozharness/configs/single_locale/mozilla-release_android-api-15.py
@@ -53,17 +53,16 @@ config = {
"MOZ_OBJDIR": OBJDIR,
"LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"upload_branch": "%s-android-api-15" % BRANCH,
"ssh_key_dir": "~/.ssh",
"merge_locales": True,
"mozilla_dir": MOZILLA_DIR,
- "mozconfig": "%s/mobile/android/config/mozconfigs/android-api-15/l10n-release" % MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
"key_alias": "release",
# Mock
"mock_target": "mozilla-centos6-x86_64-android",
"mock_packages": ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',
'gtk2-devel', 'libnotify-devel', 'yasm',
'alsa-lib-devel', 'libcurl-devel',
--- a/testing/mozharness/configs/single_locale/staging_release_mozilla-beta_android_api_15.py
+++ b/testing/mozharness/configs/single_locale/staging_release_mozilla-beta_android_api_15.py
@@ -55,17 +55,16 @@ config = {
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"base_en_us_binary_url": EN_US_BINARY_URL,
"upload_branch": "%s-android-api-15" % BRANCH,
"ssh_key_dir": "~/.ssh",
"base_post_upload_cmd": "post_upload.py -p mobile -n %(buildnum)s -v %(version)s --builddir android-api-15/%(locale)s --release-to-mobile-candidates-dir --nightly-dir=candidates %(post_upload_extra)s",
"merge_locales": True,
"mozilla_dir": MOZILLA_DIR,
- "mozconfig": "%s/mobile/android/config/mozconfigs/android-api-15/l10n-release" % MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
# Mock
"mock_target": "mozilla-centos6-x86_64-android",
"mock_packages": ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',
'gtk2-devel', 'libnotify-devel', 'yasm',
'alsa-lib-devel', 'libcurl-devel',
--- a/testing/mozharness/configs/single_locale/staging_release_mozilla-release_android_api_15.py
+++ b/testing/mozharness/configs/single_locale/staging_release_mozilla-release_android_api_15.py
@@ -55,17 +55,16 @@ config = {
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"base_en_us_binary_url": EN_US_BINARY_URL,
"upload_branch": "%s-android-api-15" % BRANCH,
"ssh_key_dir": "~/.ssh",
"base_post_upload_cmd": "post_upload.py -p mobile -n %(buildnum)s -v %(version)s --builddir android-api-15/%(locale)s --release-to-mobile-candidates-dir --nightly-dir=candidates %(post_upload_extra)s",
"merge_locales": True,
"mozilla_dir": MOZILLA_DIR,
- "mozconfig": "%s/mobile/android/config/mozconfigs/android-api-15/l10n-release" % MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
# Mock
"mock_target": "mozilla-centos6-x86_64-android",
"mock_packages": ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',
'gtk2-devel', 'libnotify-devel', 'yasm',
'alsa-lib-devel', 'libcurl-devel',