From ab69d7602f646b60be2019c15fa09e7051c25e17 Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Sat, 26 Aug 2017 11:53:04 +0000
Subject: [PATCH] Move back to statically named mod.(ico|icns).

This simplifies early packaging attempts: showing
a placeholder icon is more user friendly than
throwing an error.
---
 packaging/osx/buildpackage.sh              |   2 +-
 packaging/osx/{example.icns => mod.icns}   | Bin
 packaging/windows/buildpackage.sh          |   4 ++--
 packaging/windows/{example.ico => mod.ico} | Bin
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename packaging/osx/{example.icns => mod.icns} (100%)
 rename packaging/windows/{example.ico => mod.ico} (100%)

diff --git a/packaging/osx/buildpackage.sh b/packaging/osx/buildpackage.sh
index 2b51cae..3cdb366 100755
--- a/packaging/osx/buildpackage.sh
+++ b/packaging/osx/buildpackage.sh
@@ -80,7 +80,7 @@ popd > /dev/null
 
 # Add mod files
 cp -r "${TEMPLATE_ROOT}/mods/"* "${BUILTDIR}/OpenRA.app/Contents/Resources/mods"
-cp "${MOD_ID}.icns" "${BUILTDIR}/OpenRA.app/Contents/Resources/"
+cp "mod.icns" "${BUILTDIR}/OpenRA.app/Contents/Resources/${MOD_ID}.icns"
 
 pushd "${BUILTDIR}" > /dev/null
 mv "OpenRA.app" "${PACKAGING_OSX_APP_NAME}"
diff --git a/packaging/osx/example.icns b/packaging/osx/mod.icns
similarity index 100%
rename from packaging/osx/example.icns
rename to packaging/osx/mod.icns
diff --git a/packaging/windows/buildpackage.sh b/packaging/windows/buildpackage.sh
index 05d3006..75020d0 100755
--- a/packaging/windows/buildpackage.sh
+++ b/packaging/windows/buildpackage.sh
@@ -68,12 +68,12 @@ popd > /dev/null
 
 # Add mod files
 cp -r "${TEMPLATE_ROOT}/mods/"* "${BUILTDIR}/mods"
-cp "${MOD_ID}.ico" "${BUILTDIR}"
+cp "mod.ico" "${BUILTDIR}/${MOD_ID}.ico"
 cp "${SRC_DIR}/OpenRA.Game.exe.config" "${BUILTDIR}"
 
 echo "Compiling Windows launcher"
 sed "s|DISPLAY_NAME|${PACKAGING_DISPLAY_NAME}|" "${SRC_DIR}/packaging/windows/WindowsLauncher.cs.in" | sed "s|MOD_ID|${MOD_ID}|" | sed "s|FAQ_URL|${PACKAGING_FAQ_URL}|" > "${BUILTDIR}/WindowsLauncher.cs"
-mcs -sdk:4.5 "${BUILTDIR}/WindowsLauncher.cs" -warn:4 -codepage:utf8 -warnaserror -out:"${BUILTDIR}/${PACKAGING_WINDOWS_LAUNCHER_NAME}.exe" -t:winexe ${LAUNCHER_LIBS} -win32icon:"${MOD_ID}.ico"
+mcs -sdk:4.5 "${BUILTDIR}/WindowsLauncher.cs" -warn:4 -codepage:utf8 -warnaserror -out:"${BUILTDIR}/${PACKAGING_WINDOWS_LAUNCHER_NAME}.exe" -t:winexe ${LAUNCHER_LIBS} -win32icon:"${BUILTDIR}/${MOD_ID}.ico"
 rm "${BUILTDIR}/WindowsLauncher.cs"
 mono "${SRC_DIR}/fixheader.exe" "${BUILTDIR}/${PACKAGING_WINDOWS_LAUNCHER_NAME}.exe" > /dev/null
 
diff --git a/packaging/windows/example.ico b/packaging/windows/mod.ico
similarity index 100%
rename from packaging/windows/example.ico
rename to packaging/windows/mod.ico