Bug 1185637 - part 1 - move APP_VERSION defines into moz.build; r=glandium

This commit is contained in:
Nathan Froyd 2015-07-20 14:35:31 -04:00
parent dcb374303b
commit 535404b566
4 changed files with 3 additions and 4 deletions

View File

@ -6,8 +6,6 @@ include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
CONFIG_DIR = instgen CONFIG_DIR = instgen
SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.sfx SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.sfx
APP_VERSION := $(FIREFOX_VERSION)
DEFINES += -DAPP_VERSION=$(APP_VERSION)
INSTALLER_FILES = \ INSTALLER_FILES = \
app.tag \ app.tag \

View File

@ -4,3 +4,4 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
DEFINES['APP_VERSION'] = CONFIG['FIREFOX_VERSION']

View File

@ -15,8 +15,6 @@ include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
CONFIG_DIR = instgen CONFIG_DIR = instgen
SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.sfx SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.sfx
APP_VERSION := $(FIREFOX_VERSION)
DEFINES += -DAPP_VERSION=$(APP_VERSION)
# Uninstaller # Uninstaller
ifdef LOCALE_MERGEDIR ifdef LOCALE_MERGEDIR

View File

@ -17,6 +17,8 @@ DEFINES['XPCOM_GLUE'] = True
if CONFIG['DEBUG']: if CONFIG['DEBUG']:
DEFINES['DEBUG'] = True DEFINES['DEBUG'] = True
DEFINES['APP_VERSION'] = CONFIG['FIREFOX_VERSION']
# Statically link against the CRT # Statically link against the CRT
USE_STATIC_LIBS = True USE_STATIC_LIBS = True