Final parts of bug 300092, preprocess installer.cfg as well as the other stuff, NPOTDB

browser/locales/Makefile.in

@@ -54,8 +54,9 @@ APP_VERSION := $(shell cat $(srcdir)/../config/version.txt)
 
 DEFINES += \
 	-DAB_CD=$(AB_CD) \
-	-DAPP_VERSION=$(MOZ_APP_VERSION) \
+	-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
 	-DLOCALE_SRCDIR=$(LOCALE_SRCDIR) \
+	-DPKG_BASENAME=$(PKG_BASENAME) \
 	$(NULL)
 
 ifdef MOZ_USE_OFFICIAL_BRANDING
@@ -154,8 +155,10 @@ repackage-win32-installer: $(WIN32_INSTALLER_IN)
 	  -I$(DIST)/l10n-temp-stage/installer.inc \
 	  -I$(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/installer/windows/install.it \
 	  $(topsrcdir)/browser/installer/windows/install.it > install.it
+	$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \
+	  $(topsrcdir)/browser/installer/windows/installer.cfg > installer.cfg
 	$(PERL) $(topsrcdir)/toolkit/mozapps/installer/makeinstallini.pl \
-	  $(topsrcdir)/browser/installer/windows/installer.cfg install.it
+	  installer.cfg install.it
 	$(SYSINSTALL) install.ini $(DIST)/l10n-stage
 	cd $(DIST)/l10n-stage && \
 	  $(CYGWIN_WRAPPER) 7z a -t7z ../l10n-temp-stage/app.7z *.* -mx -m0=BCJ2 -m1=LZMA:d24 -m2=LZMA:d19 -m3=LZMA:d19 -mb0:1 -mb0s1:2 -mb0s2:3

browser/locales/generic/install.rdf

@@ -44,7 +44,7 @@
   <Description about="urn:mozilla:install-manifest"
                em:id="@MOZ_LANGPACK_EID@"
                em:name="@MOZ_LANG_TITLE@ Language Pack"
-               em:version="@APP_VERSION@"
+               em:version="@MOZ_APP_VERSION@"
                em:creator="@MOZ_LANGPACK_CREATOR@">
 #ifdef MOZ_LANGPACK_CONTRIBUTORS
     @MOZ_LANGPACK_CONTRIBUTORS@

mail/locales/Makefile.in

@@ -53,8 +53,9 @@ APP_VERSION = $(shell cat $(srcdir)/../config/version.txt)
 
 DEFINES += \
 	-DAB_CD=$(AB_CD) \
-	-DAPP_VERSION=$(APP_VERSION) \
+	-DMOZ_APP_VERSION=$(APP_VERSION) \
 	-DLOCALE_SRCDIR=$(LOCALE_SRCDIR) \
+	-DPKG_BASENAME=$(PKG_BASENAME) \
 	$(NULL)
 
 ifdef MOZ_USE_OFFICIAL_BRANDING
@@ -108,8 +109,10 @@ repackage-win32-installer: $(WIN32_INSTALLER_IN)
 	  -I$(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/installer/windows/install.it \
 	  -I$(DIST)/l10n-temp-stage/installer.inc \
 	  $(topsrcdir)/mail/installer/windows/install.it > install.it
+	$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \
+	  $(topsrcdir)/mail/installer/windows/installer.cfg > installer.cfg
 	$(PERL) $(topsrcdir)/toolkit/mozapps/installer/makeinstallini.pl \
-	  $(topsrcdir)/mail/installer/windows/installer.cfg install.it
+	  installer.cfg install.it
 	$(SYSINSTALL) install.ini $(DIST)/l10n-stage
 	cd $(DIST)/l10n-stage && \
 	  $(CYGWIN_WRAPPER) 7z a -t7z ../l10n-temp-stage/app.7z *.* -mx -m0=BCJ2 -m1=LZMA:d24 -m2=LZMA:d19 -m3=LZMA:d19 -mb0:1 -mb0s1:2 -mb0s2:3

mail/locales/generic/install.rdf

@@ -44,7 +44,7 @@
   <Description about="urn:mozilla:install-manifest"
                em:id="@MOZ_LANGPACK_EID@"
                em:name="@MOZ_LANG_TITLE@ Language Pack"
-               em:version="@APP_VERSION@"
+               em:version="@MOZ_APP_VERSION@"
                em:creator="@MOZ_LANGPACK_CREATOR@">
 #ifdef MOZ_LANGPACK_CONTRIBUTORS
     @MOZ_LANGPACK_CONTRIBUTORS@