[rkward-cvs] SF.net SVN: rkward:[3128] trunk/rkward

[tfry at users.sourceforge.net]

Revision: 3128
          http://rkward.svn.sourceforge.net/rkward/?rev=3128&view=rev
Author:   tfry
Date:     2010-10-17 08:45:38 +0000 (Sun, 17 Oct 2010)

Log Message:
-----------
Merge 3127 into trunk

Modified Paths:
--------------
    trunk/rkward/windows_nsis/installer.nsi

Property Changed:
----------------
    trunk/rkward/


Property changes on: trunk/rkward
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/release_branch_0.5.4:3098-3102
   + /branches/release_branch_0.5.4:3098-3102,3127

Modified: trunk/rkward/windows_nsis/installer.nsi
===================================================================
--- trunk/rkward/windows_nsis/installer.nsi	2010-10-17 08:43:31 UTC (rev 3127)
+++ trunk/rkward/windows_nsis/installer.nsi	2010-10-17 08:45:38 UTC (rev 3128)
@@ -26,6 +26,7 @@
 Var KDEPrefixOk
 Var DownloadLinkText
 Var DownloadLinkDest
+Var RDll_location
 
 # pages
 Page custom WelcomeCreate
@@ -103,11 +104,14 @@
 		StrCpy $0 "$FileSelectCurrent\bin\R.exe exists"
 		IntOp $RHomeOk_count $RHomeOk_count + 1
 	NextCheck:
-	IfFileExists $FileSelectCurrent\bin\R.dll Rdll_found
-		StrCpy $1 "$FileSelectCurrent\bin\R.dll does not exist"
+	StrCpy $RDll_location $FileSelectCurrent\bin\R.dll
+	IfFileExists $RDll_location Rdll_found
+		StrCpy $RDll_location $FileSelectCurrent\bin\i386\R.dll
+	IfFileExists $RDll_location Rdll_found
+		StrCpy $1 "$FileSelectCurrent\bin[\i386]\R.dll does not exist"
 	Goto done
 	Rdll_Found:
-		GetDllVersion "$FileSelectCurrent\bin\R.dll" $R0 $R1
+		GetDllVersion "$RDll_location" $R0 $R1
 		IntOp $R2 $R0 / 0x00010000
 		IntOp $R3 $R0 & 0x0000FFFF
 		StrCpy $1 "Version $R2.$R3"
@@ -119,7 +123,7 @@
 		${Else}
 			StrCpy $2 "is too old!"
 		${EndIf}
-		StrCpy $1 "$FileSelectCurrent\bin\R.dll exists ($1 $2)"
+		StrCpy $1 "$RDll_location exists ($1 $2)"
 	done:
 	${If} $RHomeOk_count >= 2
 		StrCpy $2 "OK!"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.