From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 18 Jan 2015 15:34:42 +0000 (-0800)
Subject: Remove usage of resedit.exe, as it no longer works anyway.
X-Git-Tag: xonotic-v0.8.1~28
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5287e8a508c708ec750aff1e1ab00e5abe41bbb7;p=xonotic%2Fxonotic.git

Remove usage of resedit.exe, as it no longer works anyway.
---

diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index 3fcbb63e..cb6ec826 100644
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@ -212,11 +212,7 @@ case "$cmd" in
 		verbose wget -O "$binary" "http://beta.xonotic.org/autobuild-bin/$rev/$dpname"
 		[ -s "$binary" ] || rm -f "$binary"
 		[ -f "$binary" ]
-		# TODO eventually do the rebranding on travis too.
 		case "$binary" in
-			Xonotic/xonotic*.exe)
-				verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "$binary"
-				;;
 			Xonotic/*osx*|Xonotic/*linux*)
 				chmod +x "$binary"
 				;;
diff --git a/misc/tools/change-icon-of-exe.sh b/misc/tools/change-icon-of-exe.sh
deleted file mode 100755
index e5055c51..00000000
--- a/misc/tools/change-icon-of-exe.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-d=`pwd`
-t=`mktemp -d -t change-icon-of-exe.XXXXXX`
-cp "$1" "$t/darkplaces-icon.ico"
-cp "$2" "$t/darkplaces.exe"
-cat >"$t/darkplaces.rc" <<EOF
-#include <windows.h> // include for version info constants
-
-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "darkplaces-icon.ico"
-
-1 VERSIONINFO
-FILEVERSION 1,0,0,0
-PRODUCTVERSION 1,0,0,0
-FILETYPE VFT_APP
-{
-  BLOCK "StringFileInfo"
-	 {
-		 BLOCK "040904E4"
-		 {
-			 VALUE "CompanyName", "Forest Hale Digital Services"
-			 VALUE "FileVersion", "1.0"
-			 VALUE "FileDescription", "DarkPlaces Game Engine"
-			 VALUE "InternalName", "darkplaces.exe"
-			 VALUE "LegalCopyright", "id Software, Forest Hale, and contributors"
-			 VALUE "LegalTrademarks", ""
-			 VALUE "OriginalFilename", "darkplaces.exe"
-			 VALUE "ProductName", "DarkPlaces"
-			 VALUE "ProductVersion", "1.0"
-		 }
-	 }
-}
-EOF
-cd "$t"
-wine "c:/Program Files/ResEdit/ResEdit.exe" -convert darkplaces.rc darkplaces.exe
-cd "$d"
-mv "$t/darkplaces.exe" "$2"
-rm -rf "$t"