summaryrefslogtreecommitdiffstats
path: root/application/basilisk/installer/windows
diff options
context:
space:
mode:
authorAscrod <32915892+Ascrod@users.noreply.github.com>2018-10-06 18:23:07 -0400
committerAscrod <32915892+Ascrod@users.noreply.github.com>2018-10-06 18:24:41 -0400
commit312b0e42cfb3982b8e2f62ba17052dfe1a616b7e (patch)
treef489be442bce0661c343856c7fc1cb77f3a46275 /application/basilisk/installer/windows
parent5e954837164e1747f52d23100b6399cf85295968 (diff)
downloadUXP-312b0e42cfb3982b8e2f62ba17052dfe1a616b7e.tar
UXP-312b0e42cfb3982b8e2f62ba17052dfe1a616b7e.tar.gz
UXP-312b0e42cfb3982b8e2f62ba17052dfe1a616b7e.tar.lz
UXP-312b0e42cfb3982b8e2f62ba17052dfe1a616b7e.tar.xz
UXP-312b0e42cfb3982b8e2f62ba17052dfe1a616b7e.zip
Basilisk Installer: Remove unused stub defines and strings.
Diffstat (limited to 'application/basilisk/installer/windows')
-rw-r--r--application/basilisk/installer/windows/Makefile.in4
-rw-r--r--application/basilisk/installer/windows/nsis/defines.nsi.in27
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