зеркало из https://github.com/mozilla/pjs.git
b=448155; fixup patch for hg identify -i not working in scratchbox to fix mobile build bustage; r=me
This commit is contained in:
Родитель
4d7c105040
Коммит
bae1653c19
|
@ -72,7 +72,7 @@ GRE_BUILDID = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBX
|
||||||
|
|
||||||
DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID)
|
DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID)
|
||||||
|
|
||||||
SOURCE_STAMP := $(shell hg identify -i $(topsrcdir) 2>/dev/null)
|
SOURCE_STAMP := $(shell hg identify $(topsrcdir) 2>/dev/null | cut -f1 -d' ')
|
||||||
ifdef SOURCE_STAMP
|
ifdef SOURCE_STAMP
|
||||||
DEFINES += -DMOZ_SOURCE_STAMP="$(SOURCE_STAMP)"
|
DEFINES += -DMOZ_SOURCE_STAMP="$(SOURCE_STAMP)"
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -58,7 +58,7 @@ DEFINES += \
|
||||||
-DCPPFLAGS="$(CPPFLAGS)" \
|
-DCPPFLAGS="$(CPPFLAGS)" \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
CHANGESET := $(shell hg identify -i $(topsrcdir) 2>/dev/null)
|
CHANGESET := $(shell hg identify $(topsrcdir) 2>/dev/null | cut -f1 -d' ')
|
||||||
ifdef CHANGESET
|
ifdef CHANGESET
|
||||||
DEFINES += -DSOURCE_CHANGESET="$(CHANGESET)"
|
DEFINES += -DSOURCE_CHANGESET="$(CHANGESET)"
|
||||||
endif
|
endif
|
||||||
|
|
Загрузка…
Ссылка в новой задаче