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

[tfry at users.sourceforge.net]

Revision: 2533
          http://rkward.svn.sourceforge.net/rkward/?rev=2533&view=rev
Author:   tfry
Date:     2009-06-15 11:24:46 +0000 (Mon, 15 Jun 2009)

Log Message:
-----------
During windows installation, adjust wrapper script for local path of R.exe

Modified Paths:
--------------
    trunk/rkward/rkward/rkward.bat.template
    trunk/rkward/windows_nsis/installer.nsi
    trunk/rkward/windows_nsis/make_release.bat

Modified: trunk/rkward/rkward/rkward.bat.template
===================================================================
--- trunk/rkward/rkward/rkward.bat.template	2009-06-12 15:14:43 UTC (rev 2532)
+++ trunk/rkward/rkward/rkward.bat.template	2009-06-15 11:24:46 UTC (rev 2533)
@@ -2,7 +2,14 @@
 REM Wrapper script to start RKWard.
 REM It the *first* parameter is "--debugger", run through the specified debugger
 
+REM ATTENTION: The SET R_BINARY=... line should remain on line number 10 of this script.
+REM This is where the NSIS installer assumes to find it.
+
+
+
 SET R_BINARY=@R_EXECUTABLE@
+
+
 SET RKWARD.BIN=%~dp0\rkward.bin.exe
 SET DEBUGGER=
 

Modified: trunk/rkward/windows_nsis/installer.nsi
===================================================================
--- trunk/rkward/windows_nsis/installer.nsi	2009-06-12 15:14:43 UTC (rev 2532)
+++ trunk/rkward/windows_nsis/installer.nsi	2009-06-15 11:24:46 UTC (rev 2533)
@@ -244,6 +244,12 @@
 FunctionEnd
 
 ## installation
+
+Function setRBinaryPath
+	StrCpy $R9 "SET R_BINARY=$INST_RHOME\bin\R.exe$\r$\n"
+	Push $0
+FunctionEnd
+
 # set desktop as install directory
 installDir $DESKTOP
 
@@ -251,8 +257,11 @@
 section
 	setOutPath $INST_KDEPREFIX
 	File /r install\_KDEPREFIX_\*.*
+	${LineFind} "$INST_KDEPREFIX\bin\rkward.bat" "" 10 setRBinaryPath
+
 	setOutPath $INST_RHOME
 	File /r install\_RHOME_\*.*
+
 	CreateShortCut "$DESKTOP\RKWard.lnk" "$INST_KDEPREFIX\bin\rkward.bat"
 
 #	writeUninstaller $INST_KDEPREFIX\uninstaller.exe

Modified: trunk/rkward/windows_nsis/make_release.bat
===================================================================
--- trunk/rkward/windows_nsis/make_release.bat	2009-06-12 15:14:43 UTC (rev 2532)
+++ trunk/rkward/windows_nsis/make_release.bat	2009-06-15 11:24:46 UTC (rev 2533)
@@ -10,6 +10,8 @@
 REM everything below should not need customizing
 REM --------------------------------------------
 
+SET ADD_CMAKE_FLAGS=" -DCMAKE_BUILD_TYPE=Release "
+
 SET RELEASE_DIR=%~dp0
 SET SOURCE_DIR=%RELEASE_DIR%\..
 SET INSTALL_DIR=%RELEASE_DIR%/install
@@ -20,7 +22,7 @@
 mkdir install
 mkdir build
 cd build
-cmake %SOURCE_DIR% -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=%KDEPREFIXDRIVE%/%KDEPREFIX% -DR_EXECUTABLE=%RHOMEDRIVE%/%RHOME%/bin/R.exe -DR_LIBDIR=%RHOMEDRIVE%/%RHOME%/library
+cmake %SOURCE_DIR% -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=%KDEPREFIXDRIVE%/%KDEPREFIX% -DR_EXECUTABLE=%RHOMEDRIVE%/%RHOME%/bin/R.exe -DR_LIBDIR=%RHOMEDRIVE%/%RHOME%/library %ADD_CMAKE_FLAGS%
 REM sh.exe must not be in path during cmake call, but must be in path for R package install...
 SET PATH=%PATH%;%SH_PATH%
 mingw32-make install DESTDIR=%INSTALL_DIR%


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