wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1192068 - Use long hg revision for sourcestamp in mozharness; r=gps,jlund

Browse Source
This commit is contained in:
Mike Shal 2015-08-06 15:39:38 -04:00
parent 8559ecf665
commit 7d654a7df9
10 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/Makefile.in
View File

@ -20,7 +20,7 @@ DEFINES += -DAPP_BUILDID=$(APP_BUILDID)
APP_INI_DEPS += $(DEPTH)/config/autoconf.mk
MOZ_SOURCE_STAMP := $(firstword $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg parent --template='{node|short}\n' 2>/dev/null))
MOZ_SOURCE_STAMP := $(firstword $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg parent --template='{node}\n' 2>/dev/null))
ifdef MOZ_SOURCE_STAMP
DEFINES += -DMOZ_SOURCE_STAMP='$(MOZ_SOURCE_STAMP)'
endif

2
testing/mozharness/mozharness/base/vcs/mercurial.py
View File

@ -99,7 +99,7 @@ class MercurialVCS(ScriptMixin, LogMixin, object):
def get_revision_from_path(self, path):
"""Returns which revision directory `path` currently has checked out."""
return self.get_output_from_command(
self.hg + ['parent', '--template', '{node|short}'], cwd=path
self.hg + ['parent', '--template', '{node}'], cwd=path
)
def get_branch_from_path(self, path):

2
testing/mozharness/mozharness/mozilla/building/buildb2gbase.py
View File

@ -184,7 +184,7 @@ class B2GBuildBaseScript(BuildbotMixin, MockMixin,
if repo_type == 'hg':
hg = self.query_exe('hg', return_type='list')
revision = self.get_output_from_command(
hg + ['parent', '--template', '{node|short}'], cwd=repo
hg + ['parent', '--template', '{node}'], cwd=repo
)
elif repo_type == 'git':
git = self.query_exe('git', return_type='list')

2
testing/mozharness/mozharness/mozilla/building/buildbase.py
View File

@ -1136,7 +1136,7 @@ or run without that action (ie: --no-{action})"
if os.path.exists(source_path):
hg = self.query_exe('hg', return_type='list')
revision = self.get_output_from_command(
hg + ['parent', '--template', '{node|short}'], cwd=source_path
hg + ['parent', '--template', '{node}'], cwd=source_path
)
return revision.encode('ascii', 'replace') if revision else None

2
testing/mozharness/scripts/desktop_l10n.py
View File

@ -413,7 +413,7 @@ class DesktopSingleLocale(LocalesMixin, ReleaseMixin, MockMixin, BuildbotMixin,
"""
if self.revision:
return self.revision
r = re.compile(r"^(gecko|fx)_revision ([0-9a-f]{12}\+?)$")
r = re.compile(r"^(gecko|fx)_revision ([0-9a-f]+\+?)$")
output = self._query_make_ident_output()
for line in output.splitlines():
match = r.match(line)

2
testing/mozharness/scripts/mobile_l10n.py
View File

@ -205,7 +205,7 @@ class MobileSingleLocale(MockMixin, LocalesMixin, ReleaseMixin,
"""
if self.revision:
return self.revision
r = re.compile(r"gecko_revision ([0-9a-f]{12}\+?)")
r = re.compile(r"gecko_revision ([0-9a-f]+\+?)")
output = self._query_make_ident_output()
for line in output.splitlines():
m = r.match(line)

4
testing/mozharness/test/test_base_vcs_mercurial.py
View File

@ -14,7 +14,7 @@ baz'''
HG = ['hg'] + mercurial.HG_OPTIONS
# Known default .hgrc
os.environ['HGRCPATH'] = os.path.join(os.path.dirname(__file__), 'helper_files', '.hgrc')
os.environ['HGRCPATH'] = os.path.abspath(os.path.join(os.path.dirname(__file__), 'helper_files', '.hgrc'))
def cleanup():
@ -39,7 +39,7 @@ def get_mercurial_vcs_obj():
def get_revisions(dest):
m = get_mercurial_vcs_obj()
retval = []
for rev in m.get_output_from_command(HG + ['log', '-R', dest, '--template', '{node|short}\n']).split('\n'):
for rev in m.get_output_from_command(HG + ['log', '-R', dest, '--template', '{node}\n']).split('\n'):
rev = rev.strip()
if not rev:
continue

2
toolkit/content/Makefile.in
View File

@ -11,7 +11,7 @@ DEFINES += \
-DCPPFLAGS='$(CPPFLAGS)' \
$(NULL)
MOZ_SOURCE_STAMP ?= $(shell hg -R $(topsrcdir) parent --template='{node|short}\n' 2>/dev/null)
MOZ_SOURCE_STAMP ?= $(shell hg -R $(topsrcdir) parent --template='{node}\n' 2>/dev/null)
ifdef MOZ_SOURCE_STAMP
DEFINES += -DSOURCE_CHANGESET='$(MOZ_SOURCE_STAMP)'
endif

2
toolkit/mozapps/installer/package-name.mk
View File

@ -147,7 +147,7 @@ ifndef INCLUDED_RCS_MK
include $(MOZILLA_DIR)/config/makefiles/makeutils.mk
endif
MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null))
MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node}\n" 2>/dev/null))
###########################################################################
# bug: 746277 - preserve existing functionality.

2
toolkit/xre/Makefile.in
View File

@ -19,7 +19,7 @@ $(call warnIfEmpty,TOOLKIT_EM_VERSION)
# Valid if null: {warn,error}IfEmpty
DEFINES += -DTOOLKIT_EM_VERSION='"$(TOOLKIT_EM_VERSION)"'
MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template='{node|short}\n' 2>/dev/null))
MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template='{node}\n' 2>/dev/null))
ifdef MOZ_SOURCE_STAMP
INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP)