Backed out 15 changesets (bug 1466222) for breaking android nightly a=backout

Backed out changeset 7bb7694f5d5d (bug 1466222)
Backed out changeset 185a82778d94 (bug 1466222)
Backed out changeset 18fe0eb0545c (bug 1466222)
Backed out changeset bb28c2d9d5f5 (bug 1466222)
Backed out changeset 38d7f885284e (bug 1466222)
Backed out changeset 0970518ff4bd (bug 1466222)
Backed out changeset c71a6be37cfc (bug 1466222)
Backed out changeset 507fe13a3867 (bug 1466222)
Backed out changeset 3c9e951bdc9e (bug 1466222)
Backed out changeset 259365b927a7 (bug 1466222)
Backed out changeset 705e5e28693b (bug 1466222)
Backed out changeset 7b9f759f30fc (bug 1466222)
Backed out changeset b50f13740021 (bug 1466222)
Backed out changeset 7cf0da1e476b (bug 1466222)
Backed out changeset 9250705be918 (bug 1466222)
This commit is contained in:
Coroiu Cristina 2018-06-07 14:37:40 +03:00
Родитель d2f82e1f42
Коммит 8c5dff3ef1
53 изменённых файлов: 462 добавлений и 28 удалений

Просмотреть файл

@ -0,0 +1,15 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-beta.json",
"locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/",
"required_config_vars": ["tag_override"],
"l10n_dir": "mozilla-beta",
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/release"
}

Просмотреть файл

@ -0,0 +1,15 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-beta.json",
"locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/",
"required_config_vars": ["tag_override"],
"l10n_dir": "mozilla-beta",
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/release"
}

Просмотреть файл

@ -0,0 +1,14 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-beta.json",
"locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/",
"required_config_vars": ["tag_override"],
"l10n_dir": "mozilla-beta",
"mozilla_dir": "build"
}

Просмотреть файл

@ -0,0 +1,15 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-release.json",
"locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/",
"required_config_vars": ["tag_override"],
"l10n_dir": "mozilla-release",
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/release"
}

Просмотреть файл

@ -0,0 +1,15 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-release.json",
"locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/",
"required_config_vars": ["tag_override"],
"l10n_dir": "mozilla-release",
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/release"
}

Просмотреть файл

@ -0,0 +1,14 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-release.json",
"locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/",
"required_config_vars": ["tag_override"],
"l10n_dir": "mozilla-release",
"mozilla_dir": "build"
}

Просмотреть файл

@ -0,0 +1,41 @@
import os
# The name of the directory we'll pull our source into.
BUILD_DIR = "mozilla-central"
# This is where the l10n repos are (everything after https://hg.mozilla.org/)
# for mozilla-central, that's "l10n-central".
# For mozilla-aurora, that's "releases/l10n/mozilla-aurora"
L10N_REPO_PATH = "l10n-central"
# Currently this is assumed to be a subdirectory of your build dir
OBJDIR = "objdir-droid"
# Absolute path to your mozconfig.
# By default it looks at "./mozconfig"
MOZCONFIG = os.path.join(os.getcwd(), "mozconfig")
config = {
"work_dir": ".",
"log_name": "multilocale",
"objdir": OBJDIR,
"locales_file": "%s/mobile/locales/l10n-changesets.json" % BUILD_DIR,
"locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"vcs_share_base": "/builds/hg-shared",
"l10n_repos": [],
"hg_l10n_base": "https://hg.mozilla.org/%s" % L10N_REPO_PATH,
"hg_l10n_tag": "default",
"l10n_dir": "l10n",
"mozilla_dir": BUILD_DIR,
"mozconfig": MOZCONFIG,
"default_actions": [
"pull-locale-source",
"build",
"package-en-US",
"backup-objdir",
"restore-objdir",
"add-locales",
"android-assemble-app",
"package-multi",
"summary",
],
}

Просмотреть файл

@ -1,8 +1,27 @@
# This configuration uses mozilla-central binaries (en-US, localized complete
# mars) and urls but it generates 'alder' artifacts. With this setup, binaries
# generated on alder are NOT overwriting mozilla-central files.
# Using this configuration, on a successful build, artifacts will be uploaded
# here:
#
# * http://dev-stage01.srv.releng.scl3.mozilla.com/pub/mozilla.org/firefox/nightly/latest-alder-l10n/
# (in staging environment)
# * https://ftp.mozilla.org/pub/firefox/nightly/latest-alder-l10n/
# (in production environment)
#
# If you really want to have localized alder builds, use the use the following
# values:
# * "en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/alder-%(platform)s/latest/",
# * "mar_tools_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/alder-%(platform)s/latest/",
# * "repo": "https://hg.mozilla.org/projects/alder",
#
import os
config = {
"nightly_build": True,
"branch": "alder",
"en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/",
"update_channel": "nightly",
# l10n

Просмотреть файл

@ -1,8 +1,27 @@
# This configuration uses mozilla-central binaries (en-US, localized complete
# mars) and urls but it generates 'ash' artifacts. With this setup, binaries
# generated on ash are NOT overwriting mozilla-central files.
# Using this configuration, on a successful build, artifacts will be uploaded
# here:
#
# * http://dev-stage01.srv.releng.scl3.mozilla.com/pub/mozilla.org/firefox/nightly/latest-ash-l10n/
# (in staging environment)
# * https://ftp.mozilla.org/pub/firefox/nightly/latest-ash-l10n/
# (in production environment)
#
# If you really want to have localized ash builds, use the use the following
# values:
# * "en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/ash-%(platform)s/latest/",
# * "mar_tools_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/ash-%(platform)s/latest/",
# * "repo": "https://hg.mozilla.org/projects/ash",
#
import os
config = {
"nightly_build": True,
"branch": "ash",
"en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/",
"update_channel": "nightly",
# l10n

Просмотреть файл

@ -1,9 +1,8 @@
import os
BRANCH = "ash"
MOZ_UPDATE_CHANNEL = "nightly"
MOZILLA_DIR = BRANCH
OBJDIR = "obj-firefox"
EN_US_BINARY_URL = "http://archive.mozilla.org/pub/mobile/nightly/latest-%s-android-api-16/en-US" % BRANCH
HG_SHARE_BASE_DIR = "/builds/hg-shared"
config = {
@ -11,6 +10,7 @@ config = {
"log_name": "single_locale",
"objdir": OBJDIR,
"is_automation": True,
"locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US"],
"nightly_build": True,
@ -27,9 +27,11 @@ config = {
# so ugly, bug 951238
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"MOZ_OBJDIR": OBJDIR,
"EN_US_BINARY_URL": os.environ['EN_US_BINARY_URL'],
"EN_US_BINARY_URL": EN_US_BINARY_URL,
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"upload_branch": "%s-android-api-16" % BRANCH,
"platform": "android",
# Balrog
"build_target": "Android_arm-eabi-gcc3",

Просмотреть файл

@ -3,6 +3,7 @@ import os
config = {
"nightly_build": True,
"branch": "mozilla-central",
"en_us_binary_url": "http://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central",
"update_channel": "nightly",
# l10n

Просмотреть файл

@ -4,6 +4,7 @@ BRANCH = "autoland"
MOZ_UPDATE_CHANNEL = "nightly"
MOZILLA_DIR = BRANCH
OBJDIR = "obj-firefox"
EN_US_BINARY_URL = "http://archive.mozilla.org/pub/mobile/nightly/latest-%s-android-api-16/en-US" % BRANCH
HG_SHARE_BASE_DIR = "/builds/hg-shared"
config = {
@ -11,6 +12,7 @@ config = {
"log_name": "single_locale",
"objdir": OBJDIR,
"is_automation": True,
"locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US"],
"nightly_build": True,
@ -27,9 +29,11 @@ config = {
# so ugly, bug 951238
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"MOZ_OBJDIR": OBJDIR,
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"upload_branch": "%s-android-api-16" % BRANCH,
"platform": "android",
# Balrog
"build_target": "Android_arm-eabi-gcc3",

Просмотреть файл

@ -0,0 +1,11 @@
config = {
"branch": "jamun",
"nightly_build": True,
"update_channel": "beta",
# l10n
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
# purge options
'is_automation': True,
}

Просмотреть файл

@ -0,0 +1,11 @@
config = {
"branch": "jamun",
"nightly_build": True,
"update_channel": "release",
# l10n
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
# purge options
'is_automation': True,
}

Просмотреть файл

@ -3,6 +3,7 @@ import os
config = {
"nightly_build": True,
"branch": "jamun",
"en_us_binary_url": "http://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central",
"update_channel": "nightly-jamun",
# l10n

Просмотреть файл

@ -2,12 +2,14 @@ import os
BRANCH = "jamun"
MOZILLA_DIR = BRANCH
EN_US_BINARY_URL = None # No build has been uploaded to archive.m.o
config = {
"branch": BRANCH,
"log_name": "single_locale",
"objdir": "obj-firefox",
"is_automation": True,
"locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US"],
"nightly_build": True,
@ -24,9 +26,11 @@ config = {
# so ugly, bug 951238
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
"MOZ_UPDATE_CHANNEL": "nightly-jamun",
},
"upload_branch": "%s-android-api-16" % BRANCH,
"platform": "android",
# Balrog
"build_target": "Android_arm-eabi-gcc3",

Просмотреть файл

@ -1,4 +1,5 @@
config = {
"platform": "linux",
"app_name": "browser",
"mozconfig_platform": "linux32",
"mozconfig_variant": "l10n-mozconfig",
@ -13,6 +14,7 @@ config = {
"hg_l10n_tag": "default",
# MAR
"application_ini": "application.ini",
"local_mar_tool_dir": "dist/host/bin",
"mar": "mar",
"mbsdiff": "mbsdiff",

Просмотреть файл

@ -1,4 +1,5 @@
config = {
"platform": "linux64",
"app_name": "browser",
"mozconfig_platform": "linux64",
"mozconfig_variant": "l10n-mozconfig",
@ -8,10 +9,12 @@ config = {
# l10n
"ignore_locales": ["en-US", "ja-JP-mac"],
"l10n_dir": "l10n",
"locales_file": "src/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
# MAR
"application_ini": "application.ini",
"local_mar_tool_dir": "dist/host/bin",
"mar": "mar",
"mbsdiff": "mbsdiff",

Просмотреть файл

@ -1,4 +1,5 @@
config = {
"platform": "linux64",
"app_name": "browser",
"mozconfig_platform": "linux64",
"mozconfig_variant": "l10n-mozconfig-devedition",
@ -8,10 +9,12 @@ config = {
# l10n
"ignore_locales": ["en-US", "ja-JP-mac"],
"l10n_dir": "l10n",
"locales_file": "src/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
# MAR
"application_ini": "application.ini",
"local_mar_tool_dir": "dist/host/bin",
"mar": "mar",
"mbsdiff": "mbsdiff",

Просмотреть файл

@ -1,4 +1,5 @@
config = {
"platform": "linux",
"app_name": "browser",
"mozconfig_platform": "linux32",
"mozconfig_variant": "l10n-mozconfig-devedition",
@ -8,10 +9,12 @@ config = {
# l10n
"ignore_locales": ["en-US", "ja-JP-mac"],
"l10n_dir": "l10n",
"locales_file": "src/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
# MAR
"application_ini": "application.ini",
"local_mar_tool_dir": "dist/host/bin",
"mar": "mar",
"mbsdiff": "mbsdiff",

Просмотреть файл

@ -1,5 +1,6 @@
config = {
# mozconfig file to use, it depends on branch and platform names
"platform": "macosx64",
"app_name": "browser",
"mozconfig_platform": "macosx64",
"mozconfig_variant": "l10n-mozconfig",
@ -13,10 +14,12 @@ config = {
# l10n
"ignore_locales": ["en-US", "ja"],
"l10n_dir": "l10n",
"locales_file": "src/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
# MAR
"application_ini": "Contents/Resources/application.ini",
"local_mar_tool_dir": "dist/host/bin",
"mar": "mar",
"mbsdiff": "mbsdiff",

Просмотреть файл

@ -1,5 +1,6 @@
config = {
# mozconfig file to use, it depends on branch and platform names
"platform": "macosx64",
"app_name": "browser",
"mozconfig_platform": "macosx64",
"mozconfig_variant": "l10n-mozconfig-devedition",
@ -14,10 +15,12 @@ config = {
# l10n
"ignore_locales": ["en-US", "ja"],
"l10n_dir": "l10n",
"locales_file": "src/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
# MAR
"application_ini": "Contents/Resources/application.ini",
"local_mar_tool_dir": "dist/host/bin",
"mar": "mar",
"mbsdiff": "mbsdiff",

Просмотреть файл

@ -2,12 +2,15 @@ import os
BRANCH = "maple"
MOZILLA_DIR = BRANCH
EN_US_BINARY_URL = "http://archive.mozilla.org/pub/" \
"mobile/nightly/latest-maple-android-api-16/en-US"
config = {
"branch": BRANCH,
"log_name": "single_locale",
"objdir": "obj-firefox",
"is_automation": True,
"locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US"],
"nightly_build": True,
@ -24,9 +27,11 @@ config = {
# so ugly, bug 951238
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
"MOZ_UPDATE_CHANNEL": "nightly-maple",
},
"upload_branch": "%s-android-api-16" % BRANCH,
"platform": "android",
# Balrog
"build_target": "Android_arm-eabi-gcc3",

Просмотреть файл

@ -3,6 +3,7 @@ import os
config = {
"nightly_build": True,
"branch": "mozilla-aurora",
"en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-aurora/",
"update_channel": "aurora",
# l10n

Просмотреть файл

@ -4,6 +4,7 @@ BRANCH = "mozilla-aurora"
MOZ_UPDATE_CHANNEL = "aurora"
MOZILLA_DIR = BRANCH
OBJDIR = "obj-firefox"
EN_US_BINARY_URL = "http://archive.mozilla.org/pub/mobile/nightly/latest-%s-android-api-16/en-US" % BRANCH
HG_SHARE_BASE_DIR = "/builds/hg-shared"
config = {
@ -11,6 +12,7 @@ config = {
"log_name": "single_locale",
"objdir": OBJDIR,
"is_automation": True,
"locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US"],
"nightly_build": True,
@ -27,9 +29,11 @@ config = {
# so ugly, bug 951238
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"MOZ_OBJDIR": OBJDIR,
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"upload_branch": "%s-android-api-16" % BRANCH,
"platform": "android",
# Balrog
"build_target": "Android_arm-eabi-gcc3",

Просмотреть файл

@ -3,6 +3,7 @@ import os
config = {
"nightly_build": True,
"branch": "mozilla-beta",
"en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-beta/",
"update_channel": "beta",
# l10n

Просмотреть файл

@ -11,8 +11,11 @@ config = {
"log_name": "single_locale",
"objdir": OBJDIR,
"is_automation": True,
"locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
"locales_dir": "mobile/android/locales",
"locales_platform": "android-api-16",
"ignore_locales": ["en-US"],
"platform": "android",
"build_target": "Android_arm-eabi-gcc3",
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
@ -26,8 +29,9 @@ config = {
"repack_env": {
# so ugly, bug 951238
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
"MOZ_OBJDIR": OBJDIR,
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"upload_branch": "%s-android-api-16" % BRANCH,
}

Просмотреть файл

@ -1,6 +1,7 @@
config = {
"nightly_build": True,
"branch": "mozilla-beta",
"en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-beta/",
"update_channel": "aurora", # devedition uses aurora based branding
# l10n

Просмотреть файл

@ -3,6 +3,7 @@ import os
config = {
"nightly_build": True,
"branch": "mozilla-central",
"en_us_binary_url": "http://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central",
"update_channel": "nightly",
# l10n

Просмотреть файл

@ -4,6 +4,7 @@ BRANCH = "mozilla-central"
MOZ_UPDATE_CHANNEL = "nightly"
MOZILLA_DIR = BRANCH
OBJDIR = "obj-firefox"
EN_US_BINARY_URL = "http://archive.mozilla.org/pub/mobile/nightly/latest-%s-android-api-16/en-US" % BRANCH
HG_SHARE_BASE_DIR = "/builds/hg-shared"
config = {
@ -11,6 +12,7 @@ config = {
"log_name": "single_locale",
"objdir": OBJDIR,
"is_automation": True,
"locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US"],
"nightly_build": True,
@ -27,9 +29,11 @@ config = {
# so ugly, bug 951238
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"MOZ_OBJDIR": OBJDIR,
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"upload_branch": "%s-android-api-16" % BRANCH,
"platform": "android",
# Balrog
"build_target": "Android_arm-eabi-gcc3",

Просмотреть файл

@ -0,0 +1,17 @@
# This config references releases/l10n/mozilla-release instead of l10n-central
# because 52 predates cross-channel localization, which rides the train
# with 57.
# If you copy this config for the ESR following 57, change hg_l10n_base
# to l10n-central.
config = {
"nightly_build": True,
"branch": "mozilla-esr52",
"en_us_binary_url": "https://archive.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-esr52/",
"update_channel": "esr",
# l10n
"hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-release",
# purge options
'is_automation': True,
}

Просмотреть файл

@ -0,0 +1,17 @@
import os
config = {
"nightly_build": True,
"branch": "mozilla-esr60",
"en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-esr60/",
"update_channel": "esr",
# l10n
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
# mar
"mar_tools_url": os.environ["MAR_TOOLS_URL"],
# purge options
'is_automation': True,
}

Просмотреть файл

@ -3,6 +3,7 @@ import os
config = {
"nightly_build": True,
"branch": "mozilla-inbound",
"en_us_binary_url": "http://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central",
"update_channel": "nightly",
# l10n

Просмотреть файл

@ -4,6 +4,7 @@ BRANCH = "mozilla-inbound"
MOZ_UPDATE_CHANNEL = "default"
MOZILLA_DIR = BRANCH
OBJDIR = "obj-firefox"
EN_US_BINARY_URL = "http://archive.mozilla.org/pub/mobile/nightly/latest-%s-android-api-16/en-US" % BRANCH
HG_SHARE_BASE_DIR = "/builds/hg-shared"
config = {
@ -11,6 +12,7 @@ config = {
"log_name": "single_locale",
"objdir": OBJDIR,
"is_automation": True,
"locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US"],
"nightly_build": True,
@ -27,9 +29,11 @@ config = {
# so ugly, bug 951238
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"MOZ_OBJDIR": OBJDIR,
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"upload_branch": "%s-android-api-16" % BRANCH,
"platform": "android",
# Balrog
"build_target": "Android_arm-eabi-gcc3",

Просмотреть файл

@ -3,6 +3,7 @@ import os
config = {
"nightly_build": True,
"branch": "mozilla-release",
"en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-release/",
"update_channel": "release",
# l10n

Просмотреть файл

@ -3,6 +3,7 @@ BRANCH = "mozilla-release"
MOZ_UPDATE_CHANNEL = "release"
MOZILLA_DIR = BRANCH
OBJDIR = "obj-firefox"
EN_US_BINARY_URL = None
HG_SHARE_BASE_DIR = "/builds/hg-shared"
config = {
@ -10,8 +11,11 @@ config = {
"log_name": "single_locale",
"objdir": OBJDIR,
"is_automation": True,
"locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
"locales_dir": "mobile/android/locales",
"locales_platform": "android-api-16",
"ignore_locales": ["en-US"],
"platform": "android",
"build_target": "Android_arm-eabi-gcc3",
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
@ -25,8 +29,9 @@ config = {
"repack_env": {
# so ugly, bug 951238
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
"MOZ_OBJDIR": OBJDIR,
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"upload_branch": "%s-android-api-16" % BRANCH,
}

Просмотреть файл

@ -1,4 +1,5 @@
config = {
"locales_file": "src/mobile/locales/l10n-changesets.json",
"mozconfig": "src/mobile/android/config/mozconfigs/android-api-16/l10n-nightly",
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",

Просмотреть файл

@ -1,10 +1,13 @@
import os
EN_US_BINARY_URL = "%(en_us_binary_url)s"
config = {
"locales_file": "src/browser/locales/all-locales",
"bootstrap_env": {
"NO_MERCURIAL_SETUP_CHECK": "1",
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
"L10NBASEDIR": "../../l10n",

Просмотреть файл

@ -1,10 +1,13 @@
import os
EN_US_BINARY_URL = "%(en_us_binary_url)s"
config = {
"locales_file": "src/browser/locales/all-locales",
"bootstrap_env": {
"NO_MERCURIAL_SETUP_CHECK": "1",
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
"L10NBASEDIR": "../../l10n",

Просмотреть файл

@ -1,10 +1,13 @@
import os
EN_US_BINARY_URL = "%(en_us_binary_url)s"
config = {
"locales_file": "src/browser/locales/all-locales",
"bootstrap_env": {
"NO_MERCURIAL_SETUP_CHECK": "1",
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
"L10NBASEDIR": "../../l10n",

Просмотреть файл

@ -1,14 +1,18 @@
import os
EN_US_BINARY_URL = "%(en_us_binary_url)s"
config = {
"locales_file": "src/browser/locales/all-locales",
'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
"bootstrap_env": {
"NO_MERCURIAL_SETUP_CHECK": "1",
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
# EN_US_INSTALLER_BINARY_URL falls back on EN_US_BINARY_URL
"EN_US_INSTALLER_BINARY_URL": os.environ.get(
"EN_US_INSTALLER_BINARY_URL", os.environ["EN_US_BINARY_URL"]),
"EN_US_INSTALLER_BINARY_URL", os.environ.get(
"EN_US_BINARY_URL", EN_US_BINARY_URL)),
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
"L10NBASEDIR": "../../l10n",

Просмотреть файл

@ -1,14 +1,18 @@
import os
EN_US_BINARY_URL = "%(en_us_binary_url)s"
config = {
"locales_file": "src/browser/locales/all-locales",
'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
"bootstrap_env": {
"NO_MERCURIAL_SETUP_CHECK": "1",
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
# EN_US_INSTALLER_BINARY_URL falls back on EN_US_BINARY_URL
"EN_US_INSTALLER_BINARY_URL": os.environ.get(
"EN_US_INSTALLER_BINARY_URL", os.environ["EN_US_BINARY_URL"]),
"EN_US_INSTALLER_BINARY_URL", os.environ.get(
"EN_US_BINARY_URL", EN_US_BINARY_URL)),
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
"L10NBASEDIR": "../../l10n",

Просмотреть файл

@ -3,6 +3,7 @@ import os
config = {
"nightly_build": False,
"branch": "try",
"en_us_binary_url": "http://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central",
"update_channel": "nightly-try",
# l10n

Просмотреть файл

@ -2,12 +2,15 @@ import os
BRANCH = "try"
MOZILLA_DIR = BRANCH
EN_US_BINARY_URL = "http://archive.mozilla.org/pub/" \
"mobile/nightly/latest-mozilla-central-android-api-16/en-US"
config = {
"branch": "try",
"log_name": "single_locale",
"objdir": "obj-firefox",
"is_automation": True,
"locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US"],
"tooltool_config": {
@ -24,9 +27,11 @@ config = {
# so ugly, bug 951238
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
"MOZ_UPDATE_CHANNEL": "try", # XXX Invalid
},
"upload_branch": "%s-android-api-16" % BRANCH,
"platform": "android", # XXX Validate
# Balrog
"build_target": "Android_arm-eabi-gcc3",

Просмотреть файл

@ -1,4 +1,5 @@
config = {
"platform": "win32",
"app_name": "browser",
"mozconfig_platform": "win32",
"mozconfig_variant": "l10n-mozconfig",
@ -13,10 +14,12 @@ config = {
# l10n
"ignore_locales": ["en-US", "ja-JP-mac"],
"l10n_dir": "l10n",
"locales_file": "src/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
# MAR
"application_ini": "application.ini",
"local_mar_tool_dir": "dist\\host\\bin",
"mar": "mar.exe",
"mbsdiff": "mbsdiff.exe",

Просмотреть файл

@ -1,4 +1,5 @@
config = {
"platform": "win32",
"app_name": "browser",
"mozconfig_platform": "win32",
"mozconfig_variant": "l10n-mozconfig-devedition",
@ -12,10 +13,12 @@ config = {
# l10n
"ignore_locales": ["en-US", "ja-JP-mac"],
"l10n_dir": "l10n",
"locales_file": "src/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
# MAR
"application_ini": "application.ini",
"local_mar_tool_dir": "dist\\host\\bin",
"mar": "mar.exe",
"mbsdiff": "mbsdiff.exe",

Просмотреть файл

@ -1,4 +1,5 @@
config = {
"platform": "win64",
"app_name": "browser",
"mozconfig_platform": "win64",
"mozconfig_variant": "l10n-mozconfig",
@ -12,10 +13,12 @@ config = {
# l10n
"ignore_locales": ["en-US", "ja-JP-mac"],
"l10n_dir": "l10n",
"locales_file": "src/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
# MAR
"application_ini": "application.ini",
"local_mar_tool_dir": "dist\\host\\bin",
"mar": "mar.exe",
"mbsdiff": "mbsdiff.exe",

Просмотреть файл

@ -1,4 +1,5 @@
config = {
"platform": "win64",
"app_name": "browser",
"mozconfig_platform": "win64",
"mozconfig_variant": "l10n-mozconfig-devedition",
@ -12,10 +13,12 @@ config = {
# l10n
"ignore_locales": ["en-US", "ja-JP-mac"],
"l10n_dir": "l10n",
"locales_file": "src/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
# MAR
"application_ini": "application.ini",
"local_mar_tool_dir": "dist\\host\\bin",
"mar": "mar.exe",
"mbsdiff": "mbsdiff.exe",

Просмотреть файл

@ -8,8 +8,12 @@
"""
import os
from urlparse import urljoin
import pprint
import sys
from copy import deepcopy
sys.path.insert(1, os.path.dirname(sys.path[0]))
from mozharness.base.config import parse_config_file

Просмотреть файл

@ -9,12 +9,14 @@
This should be a mostly generic multilocale build script.
"""
from copy import deepcopy
import os
import sys
sys.path.insert(1, os.path.dirname(os.path.dirname(sys.path[0])))
from mozharness.base.errors import MakefileErrorList
from mozharness.base.errors import MakefileErrorList, SSHErrorList
from mozharness.base.log import FATAL
from mozharness.base.vcs.vcsbase import MercurialScript
from mozharness.mozilla.l10n.locales import LocalesMixin
@ -74,18 +76,54 @@ class MultiLocaleBuild(LocalesMixin, MercurialScript):
def __init__(self, require_config_file=True):
LocalesMixin.__init__(self)
MercurialScript.__init__(self, config_options=self.config_options,
all_actions=['pull-locale-source',
all_actions=['clobber',
'pull-build-source',
'pull-locale-source',
'build',
'package-en-US',
'upload-en-US',
'backup-objdir',
'restore-objdir',
'add-locales',
'android-assemble-app',
'package-multi',
'upload-multi',
'summary'],
require_config_file=require_config_file)
def query_l10n_env(self):
return self.query_env()
def clobber(self):
c = self.config
if c['work_dir'] != '.':
path = os.path.join(c['base_work_dir'], c['work_dir'])
if os.path.exists(path):
self.rmtree(path, error_level=FATAL)
else:
self.info("work_dir is '.'; skipping for now.")
def pull_build_source(self):
c = self.config
repos = c['repos']
self.vcs_checkout_repos(repos, tag_override=c.get('tag_override'))
# pull_locale_source() defined in LocalesMixin.
def build(self):
c = self.config
dirs = self.query_abs_dirs()
self.copyfile(os.path.join(dirs['abs_work_dir'], c['mozconfig']),
os.path.join(dirs['abs_mozilla_dir'], 'mozconfig'),
error_level=FATAL)
mach = os.path.join(dirs['abs_mozilla_dir'], 'mach')
env = self.query_env()
if self._process_command(command=[sys.executable, mach, 'build'],
cwd=dirs['abs_mozilla_dir'],
env=env, error_list=MakefileErrorList):
self.fatal("Erroring out after the build failed.")
def android_assemble_app(self):
dirs = self.query_abs_dirs()
@ -97,6 +135,7 @@ class MultiLocaleBuild(LocalesMixin, MercurialScript):
self.fatal("Erroring out after assembling Android APKs failed.")
def add_locales(self):
c = self.config
dirs = self.query_abs_dirs()
locales = self.query_locales()
@ -112,6 +151,9 @@ class MultiLocaleBuild(LocalesMixin, MercurialScript):
else:
self.add_summary("Added locale %s successfully." % locale)
def package_en_US(self):
self.package(package_type='en-US')
def preflight_package_multi(self):
dirs = self.query_abs_dirs()
self.run_command("rm -rfv dist/fennec*", cwd=dirs['abs_objdir'])
@ -150,6 +192,40 @@ class MultiLocaleBuild(LocalesMixin, MercurialScript):
halt_on_failure=True)
self.additional_packaging(package_type=package_type, env=env)
def upload_en_US(self):
# TODO
self.info("Not written yet.")
def backup_objdir(self):
dirs = self.query_abs_dirs()
if not os.path.isdir(dirs['abs_objdir']):
self.warning("%s doesn't exist! Skipping..." % dirs['abs_objdir'])
return
rsync = self.query_exe('rsync')
backup_dir = '%s-bak' % dirs['abs_objdir']
self.rmtree(backup_dir)
self.mkdir_p(backup_dir)
self.run_command([rsync, '-a', '--delete', '--partial',
'%s/' % dirs['abs_objdir'],
'%s/' % backup_dir],
error_list=SSHErrorList)
def restore_objdir(self):
dirs = self.query_abs_dirs()
rsync = self.query_exe('rsync')
backup_dir = '%s-bak' % dirs['abs_objdir']
if not os.path.isdir(dirs['abs_objdir']) or not os.path.isdir(backup_dir):
self.warning("Both %s and %s need to exist to restore the objdir! Skipping..." % (dirs['abs_objdir'], backup_dir))
return
self.run_command([rsync, '-a', '--delete', '--partial',
'%s/' % backup_dir,
'%s/' % dirs['abs_objdir']],
error_list=SSHErrorList)
def upload_multi(self):
# TODO
self.info("Not written yet.")
def _process_command(self, **kwargs):
"""Stub wrapper function that allows us to call scratchbox in
MaemoMultiLocaleBuild.

Просмотреть файл

@ -23,7 +23,9 @@ class MarMixin(object):
dst_dir = self._mar_tool_dir()
self.mkdir_p(dst_dir)
config = self.config
url = config['mar_tools_url']
replace_dict = {'platform': config['platform'],
'branch': config['branch']}
url = config['mar_tools_url'] % replace_dict
binaries = (config['mar'], config['mbsdiff'])
for binary in binaries:
from_url = "/".join((url, binary))

Просмотреть файл

@ -15,7 +15,7 @@ import sys
import shlex
# load modules from parent dir
sys.path.insert(1, os.path.dirname(sys.path[0])) # noqa
sys.path.insert(1, os.path.dirname(sys.path[0]))
from mozharness.base.errors import MakefileErrorList
from mozharness.base.script import BaseScript
@ -45,13 +45,18 @@ FAILURE_STR = "Failed"
# mandatory configuration options, without them, this script will not work
# it's a list of values that are already known before starting a build
configuration_tokens = ('branch', 'update_channel')
configuration_tokens = ('branch',
'platform',
'update_channel',
)
# some other values such as "%(version)s", ...
# are defined at run time and they cannot be enforced in the _pre_config_lock
# phase
runtime_config_tokens = ('version', 'locale', 'abs_objdir', 'revision',
'en_us_installer_binary_url')
runtime_config_tokens = ('version', 'locale', 'from_buildid',
'abs_objdir', 'revision',
'to_buildid', 'en_us_binary_url',
'en_us_installer_binary_url', 'mar_tools_url',
'who')
# DesktopSingleLocale {{{1
@ -65,6 +70,12 @@ class DesktopSingleLocale(LocalesMixin, AutomationMixin,
"type": "string",
"help": "Specify the locale(s) to sign and update. Optionally pass"
" revision separated by colon, en-GB:default."}
], [
['--locales-file', ],
{"action": "store",
"dest": "locales_file",
"type": "string",
"help": "Specify a file to determine which locales to sign and update"}
], [
['--tag-override', ],
{"action": "store",
@ -103,12 +114,17 @@ class DesktopSingleLocale(LocalesMixin, AutomationMixin,
"list-locales",
"setup",
"repack",
"funsize-props",
"summary",
],
'config': {
"ignore_locales": ["en-US"],
"locales_dir": "browser/locales",
"buildid_section": "App",
"buildid_option": "BuildID",
"application_ini": "application.ini",
"log_name": "single_locale",
"hashType": "sha512",
},
}
@ -247,6 +263,9 @@ class DesktopSingleLocale(LocalesMixin, AutomationMixin,
config = self.config
replace_dict = self.query_abs_dirs()
replace_dict['en_us_binary_url'] = config.get('en_us_binary_url')
# Override en_us_binary_url if packageUrl is passed as a property from
# the en-US build
bootstrap_env = self.query_env(partial_env=config.get("bootstrap_env"),
replace_dict=replace_dict)
for binary in self._mar_binaries():
@ -621,6 +640,12 @@ class DesktopSingleLocale(LocalesMixin, AutomationMixin,
config = self.config
return (config['mar'], config['mbsdiff'])
def _mar_dir(self, dirname):
"""returns the full path of dirname;
dirname is an entry in configuration"""
dirs = self.query_abs_dirs()
return os.path.join(dirs['abs_objdir'], self.config[dirname])
# TODO: replace with ToolToolMixin
def _get_tooltool_auth_file(self):
# set the default authentication file based on platform; this

Просмотреть файл

@ -22,7 +22,7 @@ except ImportError:
import json
# load modules from parent dir
sys.path.insert(1, os.path.dirname(sys.path[0])) # noqa
sys.path.insert(1, os.path.dirname(sys.path[0]))
from mozharness.base.errors import MakefileErrorList
from mozharness.base.log import OutputParser
@ -43,6 +43,13 @@ class MobileSingleLocale(LocalesMixin, TooltoolMixin, AutomationMixin,
"type": "string",
"help": "Specify the locale(s) to sign and update"
}
], [
['--locales-file', ],
{"action": "store",
"dest": "locales_file",
"type": "string",
"help": "Specify a file to determine which locales to sign and update"
}
], [
['--tag-override', ],
{"action": "store",