Revision: 1623
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1623&view=rev
Author: rorthomas
Date: 2011-01-31 20:48:11 +0000 (Mon, 31 Jan 2011)
Log Message:
-----------
fixed vcredist setup in nsi installer (see also
http://blogs.msdn.com/b/astebner/archive/2007/02/07/update-regarding-silent-install-of-the-vc-8-0-runtime-vcredist-packages.aspx
and http://forums.winamp.com/showthread.php?t=267834)
Modified Paths:
--------------
trunk/tools/windows/installer/setup.nsi
Added Paths:
-----------
trunk/tools/windows/installer/installerfiles/dxwebsetup.exe
trunk/tools/windows/installer/installerfiles/vcredist_x86.exe
Removed Paths:
-------------
trunk/tools/windows/installer/VCCRTVS2010.msi
trunk/tools/windows/installer/dxwebsetup.exe
Deleted: trunk/tools/windows/installer/VCCRTVS2010.msi
===================================================================
(Binary files differ)
Deleted: trunk/tools/windows/installer/dxwebsetup.exe
===================================================================
(Binary files differ)
Added: trunk/tools/windows/installer/installerfiles/dxwebsetup.exe
===================================================================
(Binary files differ)
Property changes on: trunk/tools/windows/installer/installerfiles/dxwebsetup.exe
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/tools/windows/installer/installerfiles/vcredist_x86.exe
===================================================================
(Binary files differ)
Property changes on:
trunk/tools/windows/installer/installerfiles/vcredist_x86.exe
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/tools/windows/installer/setup.nsi
===================================================================
--- trunk/tools/windows/installer/setup.nsi 2011-01-31 10:51:12 UTC (rev
1622)
+++ trunk/tools/windows/installer/setup.nsi 2011-01-31 20:48:11 UTC (rev
1623)
@@ -1,6 +1,6 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "Rigs of Rods"
-!define PRODUCT_VERSION "0.38.6"
+!define PRODUCT_VERSION "0.38.5"
!define PRODUCT_PUBLISHER "Rigs of Rods Team"
!define PRODUCT_WEB_SITE "http://www.rigsofrods.com";
!define PRODUCT_UNINST_KEY
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
@@ -211,32 +211,21 @@
ShowUnInstDetails show
Function InstallDirectX
- InitPluginsDir
- File /oname=$PLUGINSDIR\dxwebsetup.exe "dxwebsetup.exe"
Banner::show /NOUNLOAD "Installing latest DirectX"
DetailPrint "Running DirectX Setup ..."
- ExecWait '"$PLUGINSDIR\dxwebsetup.exe"' $0
+ ExecWait '"$INSTDIR\dxwebsetup.exe"' $0
DetailPrint "dxwebsetup returned $0"
- Delete $PLUGINSDIR\dxwebsetup.exe
Banner::destroy
FunctionEnd
Function InstallVisualStudioRuntime
- InitPluginsDir
- File /oname=$PLUGINSDIR\VCCRTVS2010.msi "VCCRTVS2010.msi"
Banner::show /NOUNLOAD "Installing Visual Studio Runtime"
DetailPrint "Installing Visual Studio Runtime ..."
- ExecWait '"msiexec" /i "VCCRTVS2010.msi"' $0
+ ExecWait '"$INSTDIR\vcredist_x86.exe" /q:a /c:"VCREDI~1.EXE /q:a
/c:""msiexec /i vcredist.msi /qb!"" "' $0
DetailPrint "VCCRT setup returned $0"
- Delete $PLUGINSDIR\VCCRTVS2010.msi
Banner::destroy
FunctionEnd
-Section -Prerequisites
- Call InstallDirectX
- Call InstallVisualStudioRuntime
-SectionEnd
-
Function UninstallOld
ReadRegStr $R0 HKCU "Software\RigsOfRods\" "directory"
StrCmp $R0 "" done
@@ -313,6 +302,10 @@
SectionEnd
Section -Post
+
+ Call InstallDirectX
+ Call InstallVisualStudioRuntime
+
WriteUninstaller "$INSTDIR\uninst.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
"DisplayName" "$(^Name)"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
"UninstallString" "$INSTDIR\uninst.exe"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
