From 6ccf66167826e3db046dc41978598f6ff5bc5ca7 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Thu, 13 Dec 2018 23:43:15 +0100
Subject: [PATCH] Change windows setup filename

---
 dist/CMakeLists.txt                                       | 8 ++++----
 ...wberry-debug-64.nsi.in => strawberry-debug-x64.nsi.in} | 0
 ...trawberry-debug.nsi.in => strawberry-debug-x86.nsi.in} | 0
 .../{strawberry-64.nsi.in => strawberry-x64.nsi.in}       | 2 +-
 dist/windows/{strawberry.nsi.in => strawberry-x86.nsi.in} | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename dist/windows/{strawberry-debug-64.nsi.in => strawberry-debug-x64.nsi.in} (100%)
 rename dist/windows/{strawberry-debug.nsi.in => strawberry-debug-x86.nsi.in} (100%)
 rename dist/windows/{strawberry-64.nsi.in => strawberry-x64.nsi.in} (99%)
 rename dist/windows/{strawberry.nsi.in => strawberry-x86.nsi.in} (99%)

diff --git a/dist/CMakeLists.txt b/dist/CMakeLists.txt
index f266211ad..fbb4208cd 100644
--- a/dist/CMakeLists.txt
+++ b/dist/CMakeLists.txt
@@ -9,10 +9,10 @@ endif()
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/debian/changelog.in ${CMAKE_CURRENT_SOURCE_DIR}/debian/changelog)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pacman/PKGBUILD.in ${CMAKE_CURRENT_SOURCE_DIR}/pacman/PKGBUILD @ONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi.in ${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry-64.nsi.in ${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry-64.nsi @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry-debug.nsi.in ${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry-debug.nsi @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry-debug-64.nsi.in ${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry-debug-64.nsi @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry-x86.nsi.in ${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry-x86.nsi @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry-x64.nsi.in ${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry-x64.nsi @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry-debug-x86.nsi.in ${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry-debug-x86.nsi @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry-debug-x64.nsi.in ${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry-debug-x64.nsi @ONLY)
 
 if (UNIX AND NOT APPLE)
   install(FILES ../data/icons/48x48/strawberry.png DESTINATION share/icons/hicolor/48x48/apps/)
diff --git a/dist/windows/strawberry-debug-64.nsi.in b/dist/windows/strawberry-debug-x64.nsi.in
similarity index 100%
rename from dist/windows/strawberry-debug-64.nsi.in
rename to dist/windows/strawberry-debug-x64.nsi.in
diff --git a/dist/windows/strawberry-debug.nsi.in b/dist/windows/strawberry-debug-x86.nsi.in
similarity index 100%
rename from dist/windows/strawberry-debug.nsi.in
rename to dist/windows/strawberry-debug-x86.nsi.in
diff --git a/dist/windows/strawberry-64.nsi.in b/dist/windows/strawberry-x64.nsi.in
similarity index 99%
rename from dist/windows/strawberry-64.nsi.in
rename to dist/windows/strawberry-x64.nsi.in
index 6ab96240d..92b60b0a6 100644
--- a/dist/windows/strawberry-64.nsi.in
+++ b/dist/windows/strawberry-x64.nsi.in
@@ -48,7 +48,7 @@ SetCompressor /SOLID lzma
 !insertmacro MUI_LANGUAGE "English" ;first language is the default language
 
 Name "${PRODUCT_NAME}"
-OutFile "${PRODUCT_NAME}Setup-${PRODUCT_DISPLAY_VERSION}-Release-x64.exe"
+OutFile "${PRODUCT_NAME}Setup-${PRODUCT_DISPLAY_VERSION}-x64.exe"
 InstallDir "${PRODUCT_INSTALL_DIR}"
 
 ; Get the path where Strawberry was installed previously and set it as default path
diff --git a/dist/windows/strawberry.nsi.in b/dist/windows/strawberry-x86.nsi.in
similarity index 99%
rename from dist/windows/strawberry.nsi.in
rename to dist/windows/strawberry-x86.nsi.in
index 0dc8081af..b11288b7b 100644
--- a/dist/windows/strawberry.nsi.in
+++ b/dist/windows/strawberry-x86.nsi.in
@@ -48,7 +48,7 @@ SetCompressor /SOLID lzma
 !insertmacro MUI_LANGUAGE "English" ;first language is the default language
 
 Name "${PRODUCT_NAME}"
-OutFile "${PRODUCT_NAME}Setup-${PRODUCT_DISPLAY_VERSION}-Release.exe"
+OutFile "${PRODUCT_NAME}Setup-${PRODUCT_DISPLAY_VERSION}-x86.exe"
 InstallDir "${PRODUCT_INSTALL_DIR}"
 
 ; Get the path where Strawberry was installed previously and set it as default path