summaryrefslogtreecommitdiffstats
path: root/application/palemoon/installer/windows/Makefile.in
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-04-04 09:49:48 -0400
committerMatt A. Tobin <email@mattatobin.com>2018-04-04 09:49:48 -0400
commit858eff005aca00563efacaf6cf1ae8755706e561 (patch)
tree3d00ea0f3198d712bbbc4deceb8b247fc02ce18f /application/palemoon/installer/windows/Makefile.in
parent2af28f35d1a5b4b0eeece48cfbdb003a6ebdb09a (diff)
downloadUXP-858eff005aca00563efacaf6cf1ae8755706e561.tar
UXP-858eff005aca00563efacaf6cf1ae8755706e561.tar.gz
UXP-858eff005aca00563efacaf6cf1ae8755706e561.tar.lz
UXP-858eff005aca00563efacaf6cf1ae8755706e561.tar.xz
UXP-858eff005aca00563efacaf6cf1ae8755706e561.zip
[PALEMOON] Update the Windows Installer
Diffstat (limited to 'application/palemoon/installer/windows/Makefile.in')
-rw-r--r--application/palemoon/installer/windows/Makefile.in28
1 files changed, 18 insertions, 10 deletions
diff --git a/application/palemoon/installer/windows/Makefile.in b/application/palemoon/installer/windows/Makefile.in
index 127456765..600bdfeb6 100644
--- a/application/palemoon/installer/windows/Makefile.in
+++ b/application/palemoon/installer/windows/Makefile.in
@@ -5,9 +5,7 @@
include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
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)
+SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/uxp/7zSD.sfx
INSTALLER_FILES = \
app.tag \
@@ -16,6 +14,12 @@ INSTALLER_FILES = \
nsis/shared.nsh \
$(NULL)
+ifdef MOZ_MAINTENANCE_SERVICE
+INSTALLER_FILES += \
+ nsis/maintenanceservice_installer.nsi \
+ $(NULL)
+endif
+
BRANDING_FILES = \
branding.nsi \
appname.bmp \
@@ -24,13 +28,6 @@ BRANDING_FILES = \
wizWatermark.bmp \
$(NULL)
-DEFINES += \
- -DAB_CD=$(AB_CD) \
- -DMOZ_APP_NAME=$(MOZ_APP_NAME) \
- -DMOZ_APP_DISPLAYNAME="${MOZ_APP_DISPLAYNAME}" \
- -DMOZILLA_VERSION=${MOZILLA_VERSION} \
- $(NULL)
-
include $(topsrcdir)/config/config.mk
ifdef LOCALE_MERGEDIR
@@ -61,6 +58,17 @@ uninstaller::
--preprocess-locale $(topsrcdir) \
$(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR)
+# For building the maintenanceservice installer
+ifdef MOZ_MAINTENANCE_SERVICE
+maintenanceservice_installer::
+ $(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
+ $(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
+ $(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)
+ $(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
+ --preprocess-locale $(topsrcdir) \
+ $(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR)
+endif
+
$(CONFIG_DIR)/setup.exe::
$(RM) -r $(CONFIG_DIR)
$(MKDIR) $(CONFIG_DIR)