From a1be17c1cea81ebb1e8b131a662c698d78f3f7f2 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 4 Jun 2018 13:17:38 +0200 Subject: Issue #303 Part 1: Move basilisk files from /browser to /application/basilisk --- browser/installer/windows/Makefile.in | 90 ----------------------------------- 1 file changed, 90 deletions(-) delete mode 100644 browser/installer/windows/Makefile.in (limited to 'browser/installer/windows/Makefile.in') diff --git a/browser/installer/windows/Makefile.in b/browser/installer/windows/Makefile.in deleted file mode 100644 index 600bdfeb6..000000000 --- a/browser/installer/windows/Makefile.in +++ /dev/null @@ -1,90 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk - -CONFIG_DIR = instgen -SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/uxp/7zSD.sfx - -INSTALLER_FILES = \ - app.tag \ - nsis/installer.nsi \ - nsis/uninstaller.nsi \ - nsis/shared.nsh \ - $(NULL) - -ifdef MOZ_MAINTENANCE_SERVICE -INSTALLER_FILES += \ - nsis/maintenanceservice_installer.nsi \ - $(NULL) -endif - -BRANDING_FILES = \ - branding.nsi \ - appname.bmp \ - wizHeader.bmp \ - wizHeaderRTL.bmp \ - wizWatermark.bmp \ - $(NULL) - -include $(topsrcdir)/config/config.mk - -ifdef LOCALE_MERGEDIR -PPL_LOCALE_ARGS = \ - --l10n-dir=$(LOCALE_MERGEDIR)/browser/installer \ - --l10n-dir=$(call EXPAND_LOCALE_SRCDIR,browser/locales)/installer \ - --l10n-dir=$(topsrcdir)/browser/locales/en-US/installer \ - $(NULL) -else -PPL_LOCALE_ARGS=$(call EXPAND_LOCALE_SRCDIR,browser/locales)/installer -endif - -OVERRIDE_DEFAULT_GOAL := installer -installer:: - $(MAKE) -C .. installer-stage - $(MAKE) $(CONFIG_DIR)/setup.exe - -# For building the uninstaller during the application build so it can be -# included for mar file generation. -uninstaller:: - $(RM) -r $(CONFIG_DIR) - $(MKDIR) $(CONFIG_DIR) - $(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR) - $(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_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) - -# 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) - $(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR) - $(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_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) - $(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \ - --preprocess-single-file $(topsrcdir) \ - $(PPL_LOCALE_ARGS) $(CONFIG_DIR) \ - nsisstrings.properties nsisstrings.nlf - -GARBARGE_DIRS += instgen - -include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/makensis.mk -- cgit v1.2.3