diff --git a/CHANGELOG b/CHANGELOG index 583b47201e..96ec13e9d9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -66,6 +66,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: diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi index 8e82284283..5b712ac215 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" @@ -95,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" @@ -116,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 "" \ @@ -126,10 +128,6 @@ SectionGroup /e "Settings" SectionEnd SectionGroupEnd -Function .onInit - SectionSetFlags ${PORTABLE} 0 -FunctionEnd - ;*************************** ;Dependency Sections ;*************************** @@ -199,6 +197,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" @@ -234,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