mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1249912 - Fix the buildid.h generation in mobile_l10n.py; r=jlund
Previously, 'make export' in objdir/config was sufficient to create the buildid file. But now that buildid.h is created at the top-level, we have to run 'make buildid.h' there instead. The 'make_dirs' config value for android builds was also removed since this is all that it appears to be used for.
This commit is contained in:
parent
47b0d8b88d
commit
db5dff42bf
@ -58,7 +58,6 @@ config = {
|
||||
"upload_branch": "%s-android-api-15" % BRANCH,
|
||||
"ssh_key_dir": "~/.ssh",
|
||||
"merge_locales": True,
|
||||
"make_dirs": ['config'],
|
||||
"mozilla_dir": MOZILLA_DIR,
|
||||
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-15/l10n-nightly" % MOZILLA_DIR,
|
||||
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
|
||||
|
@ -58,7 +58,6 @@ config = {
|
||||
"upload_branch": "%s-android-api-9" % BRANCH,
|
||||
"ssh_key_dir": "~/.ssh",
|
||||
"merge_locales": True,
|
||||
"make_dirs": ['config'],
|
||||
"mozilla_dir": MOZILLA_DIR,
|
||||
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-9-10-constrained/l10n-nightly" % MOZILLA_DIR,
|
||||
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
|
||||
|
@ -58,7 +58,6 @@ config = {
|
||||
"upload_branch": "%s-android-api-15" % BRANCH,
|
||||
"ssh_key_dir": "~/.ssh",
|
||||
"merge_locales": True,
|
||||
"make_dirs": ['config'],
|
||||
"mozilla_dir": MOZILLA_DIR,
|
||||
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-15/l10n-nightly" % MOZILLA_DIR,
|
||||
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
|
||||
|
@ -58,7 +58,6 @@ config = {
|
||||
"upload_branch": "%s-android-api-9" % BRANCH,
|
||||
"ssh_key_dir": "~/.ssh",
|
||||
"merge_locales": True,
|
||||
"make_dirs": ['config'],
|
||||
"mozilla_dir": MOZILLA_DIR,
|
||||
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-9-10-constrained/l10n-nightly" % MOZILLA_DIR,
|
||||
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
|
||||
|
@ -58,7 +58,6 @@ config = {
|
||||
"upload_branch": "%s-android-api-15" % BRANCH,
|
||||
"ssh_key_dir": "~/.ssh",
|
||||
"merge_locales": True,
|
||||
"make_dirs": ['config'],
|
||||
"mozilla_dir": MOZILLA_DIR,
|
||||
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-15/l10n-nightly" % MOZILLA_DIR,
|
||||
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
|
||||
|
@ -58,7 +58,6 @@ config = {
|
||||
"upload_branch": "%s-android-api-9" % BRANCH,
|
||||
"ssh_key_dir": "~/.ssh",
|
||||
"merge_locales": True,
|
||||
"make_dirs": ['config'],
|
||||
"mozilla_dir": MOZILLA_DIR,
|
||||
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-9-10-constrained/l10n-nightly" % MOZILLA_DIR,
|
||||
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
|
||||
|
@ -62,7 +62,6 @@ config = {
|
||||
"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",
|
||||
"merge_locales": True,
|
||||
"make_dirs": ['config'],
|
||||
"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",
|
||||
|
@ -62,7 +62,6 @@ config = {
|
||||
"ssh_key_dir": "~/.ssh",
|
||||
"base_post_upload_cmd": "post_upload.py -p mobile -n %(buildnum)s -v %(version)s --builddir android-api-9/%(locale)s --release-to-mobile-candidates-dir --nightly-dir=candidates",
|
||||
"merge_locales": True,
|
||||
"make_dirs": ['config'],
|
||||
"mozilla_dir": MOZILLA_DIR,
|
||||
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-9-10-constrained/l10n-release" % MOZILLA_DIR,
|
||||
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
|
||||
|
@ -62,7 +62,6 @@ config = {
|
||||
"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",
|
||||
"merge_locales": True,
|
||||
"make_dirs": ['config'],
|
||||
"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",
|
||||
|
@ -62,7 +62,6 @@ config = {
|
||||
"ssh_key_dir": "~/.ssh",
|
||||
"base_post_upload_cmd": "post_upload.py -p mobile -n %(buildnum)s -v %(version)s --builddir android-api-9/%(locale)s --release-to-mobile-candidates-dir --nightly-dir=candidates",
|
||||
"merge_locales": True,
|
||||
"make_dirs": ['config'],
|
||||
"mozilla_dir": MOZILLA_DIR,
|
||||
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-9-10-constrained/l10n-release" % MOZILLA_DIR,
|
||||
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
|
||||
|
@ -62,7 +62,6 @@ config = {
|
||||
"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",
|
||||
"merge_locales": True,
|
||||
"make_dirs": ['config'],
|
||||
"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",
|
||||
|
@ -62,7 +62,6 @@ config = {
|
||||
"ssh_key_dir": "~/.ssh",
|
||||
"base_post_upload_cmd": "post_upload.py -p mobile -n %(buildnum)s -v %(version)s --builddir android-api-9/%(locale)s --release-to-mobile-candidates-dir --nightly-dir=candidates",
|
||||
"merge_locales": True,
|
||||
"make_dirs": ['config'],
|
||||
"mozilla_dir": MOZILLA_DIR,
|
||||
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-9-10-constrained/l10n-release" % MOZILLA_DIR,
|
||||
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
|
||||
|
@ -65,7 +65,6 @@ config = {
|
||||
"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",
|
||||
"merge_locales": True,
|
||||
"make_dirs": ['config'],
|
||||
"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",
|
||||
|
@ -65,7 +65,6 @@ config = {
|
||||
"ssh_key_dir": "~/.ssh",
|
||||
"base_post_upload_cmd": "post_upload.py -p mobile -n %(buildnum)s -v %(version)s --builddir android-api-9/%(locale)s --release-to-mobile-candidates-dir --nightly-dir=candidates",
|
||||
"merge_locales": True,
|
||||
"make_dirs": ['config'],
|
||||
"mozilla_dir": MOZILLA_DIR,
|
||||
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-9-10-constrained/l10n-release" % MOZILLA_DIR,
|
||||
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
|
||||
|
@ -366,18 +366,23 @@ class MobileSingleLocale(MockMixin, LocalesMixin, ReleaseMixin,
|
||||
env=env,
|
||||
error_list=MakefileErrorList):
|
||||
self.fatal("Configure failed!")
|
||||
for make_dir in c.get('make_dirs', []):
|
||||
|
||||
# Run 'make export' in objdir/config to get nsinstall
|
||||
self.run_command_m([make, 'export'],
|
||||
cwd=os.path.join(dirs['abs_objdir'], make_dir),
|
||||
cwd=os.path.join(dirs['abs_objdir'], 'config'),
|
||||
env=env,
|
||||
error_list=MakefileErrorList,
|
||||
halt_on_failure=True)
|
||||
|
||||
# Run 'make buildid.h' in objdir/ to get the buildid.h file
|
||||
cmd = [make, 'buildid.h']
|
||||
if buildid:
|
||||
self.run_command_m([make, 'export',
|
||||
'MOZ_BUILD_DATE=%s' % str(buildid)],
|
||||
cwd=os.path.join(dirs['abs_objdir'], make_dir),
|
||||
cmd.append('MOZ_BUILD_DATE=%s' % str(buildid))
|
||||
self.run_command_m(cmd,
|
||||
cwd=dirs['abs_objdir'],
|
||||
env=env,
|
||||
error_list=MakefileErrorList)
|
||||
error_list=MakefileErrorList,
|
||||
halt_on_failure=True)
|
||||
|
||||
def setup(self):
|
||||
c = self.config
|
||||
|
Loading…
Reference in New Issue
Block a user