phosit/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Minor fixes for NSIS - Windows distribution script, HTTP > HTTPS.

Browse Source 
Reviewed By: Stan
Differential Revision: https://code.wildfiregames.com/D4756
This was SVN commit r27073.
This commit is contained in:
Vladislav Belov 2022-08-26 16:01:57 +00:00
parent d1586e0edf
commit 2ee13983a1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/lib/sysdep/os/win/wseh.cpp
View File

@ -277,7 +277,7 @@ long __stdcall wseh_ExceptionFilter(struct _EXCEPTION_POINTERS* ep)
const wchar_t* messageFormat = const wchar_t* messageFormat =
L"Much to our regret we must report the program has encountered an error.\r\n" L"Much to our regret we must report the program has encountered an error.\r\n"
L"\r\n" L"\r\n"
L"Please let us know at http://trac.wildfiregames.com/ and attach the crashlog.txt and crashlog.dmp files.\r\n" L"Please let us know at https://trac.wildfiregames.com/ and attach the crashlog.txt and crashlog.dmp files.\r\n"
L"You may find paths to these files at https://trac.wildfiregames.com/wiki/GameDataPaths \r\n" L"You may find paths to these files at https://trac.wildfiregames.com/wiki/GameDataPaths \r\n"
L"\r\n" L"\r\n"
L"Details: unhandled exception (%ls)\r\n"; L"Details: unhandled exception (%ls)\r\n";

8
source/tools/dist/0ad.nsi vendored
View File

@ -133,7 +133,7 @@ Section "!Game and data files" GameSection
File /r "${CHECKOUTPATH}\binaries\system\*.txt" File /r "${CHECKOUTPATH}\binaries\system\*.txt"
; Copy logs for writable root ; Copy logs for writable root
SetOutPath "$INSTDIR\binaries\logs" SetOutPath "$INSTDIR\binaries"
File /r "${CHECKOUTPATH}\binaries\logs" File /r "${CHECKOUTPATH}\binaries\logs"
!ifdef ARCHIVE_PATH !ifdef ARCHIVE_PATH
@ -152,7 +152,7 @@ Section "!Game and data files" GameSection
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
CreateShortCut "$INSTDIR\0 A.D..lnk" "$INSTDIR\binaries\system\pyrogenesis.exe" "" CreateShortCut "$INSTDIR\0 A.D..lnk" "$INSTDIR\binaries\system\pyrogenesis.exe" ""
CreateShortCut "$INSTDIR\Map editor.lnk" "$INSTDIR\binaries\system\pyrogenesis.exe" "-editor" "$INSTDIR\binaries\data\tools\atlas\icons\ScenarioEditor.ico" CreateShortCut "$INSTDIR\Map editor.lnk" "$INSTDIR\binaries\system\pyrogenesis.exe" "-editor" "$INSTDIR\binaries\data\tools\atlas\icons\ScenarioEditor.ico"
WriteINIStr "$INSTDIR\Web site.url" "InternetShortcut" "URL" "http://play0ad.com/" WriteINIStr "$INSTDIR\Web site.url" "InternetShortcut" "URL" "https://play0ad.com/"
;Store installation folder ;Store installation folder
WriteRegStr SHCTX "Software\0 A.D." "" $INSTDIR WriteRegStr SHCTX "Software\0 A.D." "" $INSTDIR
@ -170,7 +170,7 @@ Section "!Game and data files" GameSection
WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\0 A.D." "InstallLocation" "$\"$INSTDIR$\"" WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\0 A.D." "InstallLocation" "$\"$INSTDIR$\""
WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\0 A.D." "UninstallString" "$\"$INSTDIR\Uninstall.exe$\"" WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\0 A.D." "UninstallString" "$\"$INSTDIR\Uninstall.exe$\""
WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\0 A.D." "QuietUninstallString" "$\"$INSTDIR\Uninstall.exe$\" /S" WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\0 A.D." "QuietUninstallString" "$\"$INSTDIR\Uninstall.exe$\" /S"
WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\0 A.D." "URLInfoAbout" "http://play0ad.com" WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\0 A.D." "URLInfoAbout" "https://play0ad.com"
WriteRegDWORD SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\0 A.D." "NoModify" 1 WriteRegDWORD SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\0 A.D." "NoModify" 1
WriteRegDWORD SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\0 A.D." "NoRepair" 1 WriteRegDWORD SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\0 A.D." "NoRepair" 1
@ -184,7 +184,7 @@ Section "!Game and data files" GameSection
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Open logs folder.lnk" "$INSTDIR\OpenLogsFolder.bat" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Open logs folder.lnk" "$INSTDIR\OpenLogsFolder.bat"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
WriteINIStr "$SMPROGRAMS\$StartMenuFolder\Web site.url" "InternetShortcut" "URL" "http://play0ad.com/" WriteINIStr "$SMPROGRAMS\$StartMenuFolder\Web site.url" "InternetShortcut" "URL" "https://play0ad.com/"
!insertmacro MUI_STARTMENU_WRITE_END !insertmacro MUI_STARTMENU_WRITE_END