From 7596876d45605d8a69fd816ca2aecbee8f85e1f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sat, 15 Feb 2014 18:41:47 +0100
Subject: [PATCH 1/4] ship documentation

---
 packaging/windows/OpenRA.nsi | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi
index 8e82284283..1dd4ca42ad 100644
--- a/packaging/windows/OpenRA.nsi
+++ b/packaging/windows/OpenRA.nsi
@@ -77,6 +77,9 @@ Section "Game" GAME
 	File "${SRCDIR}\AUTHORS"
 	File "${SRCDIR}\CHANGELOG"
 	File "${SRCDIR}\COPYING"
+	File "${SRCDIR}\README.html"
+	File "${SRCDIR}\CONTRIBUTING.html"
+	File "${SRCDIR}\DOCUMENTATION.html"
 	File "${SRCDIR}\*.ttf"
 	File "${SRCDIR}\OpenRA.ico"
 	File "${SRCDIR}\Tao.*.dll"
@@ -199,6 +202,9 @@ Function ${UN}Clean
 	Delete $INSTDIR\AUTHORS
 	Delete $INSTDIR\CHANGELOG
 	Delete $INSTDIR\COPYING
+	Delete $INSTDIR\README.html
+	Delete $INSTDIR\CONTRIBUTING.html
+	Delete $INSTDIR\DOCUMENTATION.html
 	Delete $INSTDIR\OpenRA.ico
 	Delete $INSTDIR\*.ttf
 	Delete "$INSTDIR\global mix database.dat"

From dc8605825bf0224c32a1a19686b52cf501eaf96a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sat, 15 Feb 2014 18:42:04 +0100
Subject: [PATCH 2/4] link the README.html in the start menu

---
 packaging/windows/OpenRA.nsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi
index 1dd4ca42ad..e43afab696 100644
--- a/packaging/windows/OpenRA.nsi
+++ b/packaging/windows/OpenRA.nsi
@@ -98,6 +98,8 @@ Section "Game" GAME
 		CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
 		CreateShortCut "$SMPROGRAMS\$StartMenuFolder\OpenRA.lnk" $OUTDIR\OpenRA.Game.exe "" \
 			"$OUTDIR\OpenRA.Game.exe" "" "" "" ""
+		CreateShortCut "$SMPROGRAMS\$StartMenuFolder\README.lnk" $OUTDIR\README.html "" \
+			"$OUTDIR\README.html" "" "" "" ""
 	!insertmacro MUI_STARTMENU_WRITE_END
 
 	SetOutPath "$INSTDIR\cg"

From de574910e5a1b6b67acfea47e1bab45c08c40b0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sat, 15 Feb 2014 18:50:24 +0100
Subject: [PATCH 3/4] removed portable install from setup

as it became a common problem when installed to %ProgramFiles
---
 packaging/windows/OpenRA.nsi | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi
index e43afab696..5b712ac215 100644
--- a/packaging/windows/OpenRA.nsi
+++ b/packaging/windows/OpenRA.nsi
@@ -121,9 +121,6 @@ Section "Editor" EDITOR
 SectionEnd
 
 SectionGroup /e "Settings"
-	Section "Portable Install" PORTABLE
-		CreateDirectory $INSTDIR\Support
-	SectionEnd
 	Section "Desktop Shortcut" DESKTOPSHORTCUT
 		SetOutPath "$INSTDIR"
 		CreateShortCut "$DESKTOP\OpenRA.lnk" $INSTDIR\OpenRA.Game.exe "" \
@@ -131,10 +128,6 @@ SectionGroup /e "Settings"
 	SectionEnd
 SectionGroupEnd
 
-Function .onInit
-	SectionSetFlags ${PORTABLE} 0
-FunctionEnd
-
 ;***************************
 ;Dependency Sections
 ;***************************
@@ -242,13 +235,11 @@ SectionEnd
 ;***************************
 LangString DESC_GAME ${LANG_ENGLISH} "OpenRA engine, official mods and dependencies"
 LangString DESC_EDITOR ${LANG_ENGLISH} "OpenRA map editor"
-LangString DESC_PORTABLE ${LANG_ENGLISH} "Store support files in the install directory."
 LangString DESC_DESKTOPSHORTCUT ${LANG_ENGLISH} "Place shortcut on the Desktop."
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
 	!insertmacro MUI_DESCRIPTION_TEXT ${GAME} $(DESC_GAME)
 	!insertmacro MUI_DESCRIPTION_TEXT ${EDITOR} $(DESC_EDITOR)
-	!insertmacro MUI_DESCRIPTION_TEXT ${PORTABLE} $(DESC_PORTABLE)
 	!insertmacro MUI_DESCRIPTION_TEXT ${DESKTOPSHORTCUT} $(DESC_DESKTOPSHORTCUT)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 

From 2ec3d2c3a584ffcba35fe8918e18d480777accfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sun, 16 Feb 2014 00:18:10 +0100
Subject: [PATCH 4/4] update CHANGELOG

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 88c687c986..4448d60408 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -63,6 +63,9 @@ NEW:
 		Mods that use custom TileSize must specify both width and height.
 		If you spot black tiles in your Dune 2000 ARRAKIS maps, replace them with the remaining sand and rock tiles. Go to Map → Fix Open Areas to randomize them.
 		The TestFile check in mod.yaml has been renamed to TestFiles (plural!) and now supports a comma-separated list of assets that are required to load the game.
+	Packaging:
+		Removed portable install option from Windows installer as the game left without write access breaks content download and error log generation.
+		Added HTML documentation to the Windows installer.
 
 20131223:
 	All mods: