Revision: 1579
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1579&view=rev
Author: rorthomas
Date: 2011-01-18 00:15:06 +0000 (Tue, 18 Jan 2011)
Log Message:
-----------
updated nsi and vccrt
Modified Paths:
--------------
trunk/tools/windows/installer/setup.nsi
Added Paths:
-----------
trunk/tools/windows/installer/VCCRTVS2010.msi
Removed Paths:
-------------
trunk/tools/windows/installer/VCCRT2.msi
trunk/tools/windows/installer/VCCRT4.msi
trunk/tools/windows/installer/vcredist_x86.exe
Deleted: trunk/tools/windows/installer/VCCRT2.msi
===================================================================
(Binary files differ)
Deleted: trunk/tools/windows/installer/VCCRT4.msi
===================================================================
(Binary files differ)
Added: trunk/tools/windows/installer/VCCRTVS2010.msi
===================================================================
(Binary files differ)
Property changes on: trunk/tools/windows/installer/VCCRTVS2010.msi
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/tools/windows/installer/setup.nsi
===================================================================
--- trunk/tools/windows/installer/setup.nsi 2011-01-18 00:07:56 UTC (rev
1578)
+++ trunk/tools/windows/installer/setup.nsi 2011-01-18 00:15:06 UTC (rev
1579)
@@ -59,9 +59,30 @@
!undef Index_RemoveFilesAndSubDirs
!macroend
+Function WriteToFile
+ Exch $0 ;file to write to
+ Exch
+ Exch $1 ;text to write
+
+ FileOpen $0 $0 a #open file
+ FileSeek $0 0 END #go to end
+ FileWrite $0 $1 #write to file
+ FileClose $0
+
+ Pop $1
+ Pop $0
+FunctionEnd
+
+!macro WriteToFile String File
+ Push "${String}"
+ Push "${File}"
+ Call WriteToFile
+!macroend
+!define WriteToFile "!insertmacro WriteToFile"
+
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "Rigs of Rods"
-!define PRODUCT_VERSION "0.37.126"
+!define PRODUCT_VERSION "0.38.1"
!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}"
@@ -193,17 +214,21 @@
InitPluginsDir
File /oname=$PLUGINSDIR\dxwebsetup.exe "dxwebsetup.exe"
Banner::show /NOUNLOAD "Installing latest DirectX"
- ExecWait '"$PLUGINSDIR\dxwebsetup.exe"'
+ DetailPrint "Running DirectX Setup ..."
+ ExecWait '"$PLUGINSDIR\dxwebsetup.exe"' $0
+ DetailPrint "dxwebsetup returned $0"
Delete $PLUGINSDIR\dxwebsetup.exe
Banner::destroy
FunctionEnd
Function InstallVisualStudioRuntime
InitPluginsDir
- File /oname=$PLUGINSDIR\VCCRT4.msi "VCCRT4.msi"
+ File /oname=$PLUGINSDIR\VCCRTVS2010.msi "VCCRTVS2010.msi"
Banner::show /NOUNLOAD "Installing Visual Studio Runtime"
- ExecWait '"msiexec" /i "VCCRT4.msi"'
- Delete $PLUGINSDIR\VCCRT4.msi
+ DetailPrint "Installing Visual Studio Runtime ..."
+ ExecWait '"msiexec" /i "VCCRTVS2010.msi"' $0
+ DetailPrint "VCCRT setup returned $0"
+ Delete $PLUGINSDIR\VCCRTVS2010.msi
Banner::destroy
FunctionEnd
@@ -259,6 +284,9 @@
; data
File /r /x .svn installerfiles\*
+ # add version text file
+ ${WriteToFile} "${PRODUCT_VERSION}" "$INSTDIR\version.txt"
+
SectionEnd
;Section "Modding Tools" SEC03
@@ -327,7 +355,12 @@
RMDir "/r" "$SMPROGRAMS\Rigs of Rods ${PRODUCT_VERSION}"
Delete "$STARTMENU.lnk"
RMDir "$INSTDIR"
-
DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
+
+ SetShellVarContext current
+ MessageBox MB_YESNO|MB_ICONEXCLAMATION "Remove RoR user content in
$DOCUMENTS/Rigs of Rods?" IDYES removedoc IDNO end
+removedoc:
+ RMDir "/r" "$DOCUMENTS\Rigs of Rods"
+end:
SetAutoClose false
SectionEnd
Deleted: trunk/tools/windows/installer/vcredist_x86.exe
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
