diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-10-08 08:15:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-08 08:15:41 +0200 |
| commit | a844a9b08c661217c2bc14e424cdd70b5a42e681 (patch) | |
| tree | b61f350c8c4b47ae559547131cb632cb19ebd61e /application/basilisk/installer/windows | |
| parent | 7e96154b878e6e08ccc1220ad252aeac312d4753 (diff) | |
| parent | 312b0e42cfb3982b8e2f62ba17052dfe1a616b7e (diff) | |
| download | UXP-a844a9b08c661217c2bc14e424cdd70b5a42e681.tar UXP-a844a9b08c661217c2bc14e424cdd70b5a42e681.tar.gz UXP-a844a9b08c661217c2bc14e424cdd70b5a42e681.tar.lz UXP-a844a9b08c661217c2bc14e424cdd70b5a42e681.tar.xz UXP-a844a9b08c661217c2bc14e424cdd70b5a42e681.zip | |
Merge pull request #814 from Ascrod/nsis-cleanup
Clean up NSIS installer code
Diffstat (limited to 'application/basilisk/installer/windows')
| -rw-r--r-- | application/basilisk/installer/windows/Makefile.in | 4 | ||||
| -rw-r--r-- | application/basilisk/installer/windows/nsis/defines.nsi.in | 27 |
2 files changed, 0 insertions, 31 deletions
diff --git a/application/basilisk/installer/windows/Makefile.in b/application/basilisk/installer/windows/Makefile.in index d5580b53d..bab6ded1a 100644 --- a/application/basilisk/installer/windows/Makefile.in +++ b/application/basilisk/installer/windows/Makefile.in @@ -79,10 +79,6 @@ $(CONFIG_DIR)/setup.exe:: $(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 diff --git a/application/basilisk/installer/windows/nsis/defines.nsi.in b/application/basilisk/installer/windows/nsis/defines.nsi.in index 5ad9b7966..dbb58ca33 100644 --- a/application/basilisk/installer/windows/nsis/defines.nsi.in +++ b/application/basilisk/installer/windows/nsis/defines.nsi.in @@ -3,23 +3,6 @@ # 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/. -# Defining FunnelcakeVersion will append the value of StubURLVersionAppend to -# StubURLVersion, append the value of URLManualDownloadAppend to -# URLManualDownload, and append the value of URLStubDownloadAppend to -# URLStubDownload. The value of FunnelcakeVersion should not be defined when it -# is not used and when it is defined its value should never be empty. -# !define FunnelcakeVersion "999" - -!ifdef FunnelcakeVersion -!define URLManualDownloadAppend "&f=${FunnelcakeVersion}" -!define URLStubDownloadAppend "-f${FunnelcakeVersion}" -!define StubURLVersionAppend "-${FunnelcakeVersion}" -!else -!define URLManualDownloadAppend "" -!define URLStubDownloadAppend "" -!define StubURLVersionAppend "" -!endif - # These defines should match application.ini settings !define AppName "Basilisk" !define AppVersion "@APP_VERSION@" @@ -84,13 +67,3 @@ VIAddVersionKey "FileVersion" "${AppVersion}" VIAddVersionKey "ProductVersion" "${AppVersion}" # Comments is not used but left below commented out for future reference # VIAddVersionKey "Comments" "Comments" - -# Control positions in Dialog Units so they are placed correctly with -# non-default DPI settings -!define OPTIONS_ITEM_EDGE_DU 90u -!define OPTIONS_ITEM_WIDTH_DU 356u -!define OPTIONS_SUBITEM_EDGE_DU 119u -!define OPTIONS_SUBITEM_WIDTH_DU 327u -!define INSTALL_BLURB_TOP_DU 78u -!define APPNAME_BMP_EDGE_DU 19u -!define APPNAME_BMP_TOP_DU 12u |