adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Win32 installer for UAC integration on Vista/7 and for the new download paths.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3557 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2011-02-14 08:00:27 +00:00
parent 38e317e75d
commit 19e4587288
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+2
View File
@@ -1,4 +1,6 @@
Changes towards version 0.7: Changes towards version 0.7:
- Update download paths for the new SourceForge File Release system - Michael
- Fix UAC issues with installer for cleaner Vista/Win7 installs - Michael
- Fixed compilation with Netplay disabled (bug #1091), from Sze Howe Koh - Fixed compilation with Netplay disabled (bug #1091), from Sze Howe Koh
- Fixed ship picking order after a simultaneous destruction, e.g. - Fixed ship picking order after a simultaneous destruction, e.g.
Shofixti picks last after Glory device (bugs #1087, #1088) - Alex Shofixti picks last after Glory device (bugs #1087, #1088) - Alex
sc2/build/win32_install/uqm-installer.nsi
+4 -1
View File
@@ -26,6 +26,9 @@ Var UQMUSERDATA
!define MUI_HEADERIMAGE_BITMAP "ultron.bmp" !define MUI_HEADERIMAGE_BITMAP "ultron.bmp"
!define MUI_HEADERIMAGE_RIGHT !define MUI_HEADERIMAGE_RIGHT
; UAC support
RequestExecutionLevel admin
; Welcome page ; Welcome page
!insertmacro MUI_PAGE_WELCOME !insertmacro MUI_PAGE_WELCOME
; License page ; License page
@@ -234,7 +237,7 @@ AttemptDownload:
GetTempFileName $DOWNLOADTARGET GetTempFileName $DOWNLOADTARGET
Delete $DOWNLOADTARGET Delete $DOWNLOADTARGET
CreateDirectory $DOWNLOADTARGET CreateDirectory $DOWNLOADTARGET
NSISdl::download "http://$2.dl.sourceforge.net/sourceforge/sc2/$1" "$DOWNLOADTARGET\$1" NSISdl::download "http://$2.dl.sourceforge.net/sourceforge/sc2/UQM/0.6.0/$1" "$DOWNLOADTARGET\$1"
Pop $2 Pop $2
StrCmp $2 "success" DownloadSuccessful StrCmp $2 "success" DownloadSuccessful
StrCmp $2 "cancel" DownloadCanceled StrCmp $2 "cancel" DownloadCanceled