diff --git a/SConstruct b/SConstruct index c54afb650b5..a9432231df1 100755 --- a/SConstruct +++ b/SConstruct @@ -732,13 +732,10 @@ env.Alias('data-dist', data_tarball) # Windows installer # -text_builder = Builder(action = Copy("$TARGET", "$SOURCE"), single_source = True, suffix = ".txt") env.WindowsInstaller([ wesnoth, wesnothd, Dir(installable_subs), env["nls"] and Dir("translations") or [], - glob("*.dll"), - text_builder(env, source = Split("README.md copyright COPYING changelog players_changelog")), - "cwesnoth.cmd" + glob("*.dll") ]) # diff --git a/packaging/windows/Wesnoth.nsi.in b/packaging/windows/Wesnoth.nsi.in index 0e104d501d2..f49bb4a7ccb 100644 --- a/packaging/windows/Wesnoth.nsi.in +++ b/packaging/windows/Wesnoth.nsi.in @@ -105,7 +105,14 @@ Section "Battle for Wesnoth" BfWSection SetOutPath "$INSTDIR" File packaging\windows\wesnoth_editor-icon.ico - + + File "/oname=README.txt" README.md + File "/oname=copyright.txt" copyright + File "/oname=COPYING.txt" COPYING + File "/oname=changelog.txt" changelog + File "/oname=players_changelog.txt" players_changelog + File cwesnoth.cmd + %NSIS_INSTALL_FILES SetOutPath "$INSTDIR" @@ -221,6 +228,13 @@ Section "Uninstall" %NSIS_UNINSTALL_FILES Delete "$INSTDIR\wesnoth_editor-icon.ico" RMDir /r "$INSTDIR\manual" + Delete $INSTDIR\std*.txt + Delete $INSTDIR\README.txt + Delete $INSTDIR\copyright.txt + Delete $INSTDIR\COPYING.txt + Delete $INSTDIR\changelog.txt + Delete $INSTDIR\players_changelog.txt + Delete $INSTDIR\cwesnoth.cmd Delete "$INSTDIR\Uninstall.exe"