зеркало из https://github.com/mozilla/gecko-dev.git
Bug 649373 - Remove PRE_RELEASE_SUFFIX. This is a wallpaper. r=rstrong, a=LegNeato
This commit is contained in:
Родитель
d22c04efbe
Коммит
5fd52f20d0
|
@ -62,8 +62,7 @@ EXTRA_JS_MODULES = \
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
PRE_RELEASE_SUFFIX := $(shell $(PYTHON) $(topsrcdir)/config/printprereleasesuffix.py \
|
||||
$(shell cat $(srcdir)/../config/version.txt))
|
||||
PRE_RELEASE_SUFFIX := ""
|
||||
|
||||
DEFINES += \
|
||||
-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
|
||||
|
|
|
@ -51,7 +51,7 @@ CONFIG_DIR = instgen
|
|||
SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.sfx
|
||||
APP_VERSION := $(shell cat $(srcdir)/../../config/version.txt)
|
||||
DEFINES += -DAPP_VERSION=$(APP_VERSION)
|
||||
PRE_RELEASE_SUFFIX := $(shell $(PYTHON) $(topsrcdir)/config/printprereleasesuffix.py $(APP_VERSION))
|
||||
PRE_RELEASE_SUFFIX := ""
|
||||
DEFINES += -DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)"
|
||||
|
||||
INSTALLER_FILES = \
|
||||
|
|
|
@ -112,10 +112,7 @@ MOZ_PKG_APPNAME_LC = $(shell echo $(MOZ_PKG_APPNAME) | tr '[A-Z]' '[a-z]')
|
|||
|
||||
|
||||
ifndef MOZ_PKG_LONGVERSION
|
||||
MOZ_PKG_LONGVERSION = $(shell echo $(MOZ_PKG_VERSION) |\
|
||||
sed -e 's/a\([0-9][0-9]*\)$$/ Alpha \1/' |\
|
||||
sed -e 's/b\([0-9][0-9]*\)$$/ Beta \1/' |\
|
||||
sed -e 's/rc\([0-9][0-9]*\)$$/ RC \1/')
|
||||
MOZ_PKG_LONGVERSION = $(shell echo $(MOZ_PKG_VERSION))
|
||||
endif
|
||||
|
||||
ifeq (,$(filter-out Darwin OS2, $(OS_ARCH))) # Mac and OS2
|
||||
|
|
Загрузка…
Ссылка в новой задаче