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

[tfry at users.sourceforge.net]

Revision: 3914
          http://rkward.svn.sourceforge.net/rkward/?rev=3914&view=rev
Author:   tfry
Date:     2011-10-09 17:36:20 +0000 (Sun, 09 Oct 2011)
Log Message:
-----------
Merge 3913 from the release branch

Modified Paths:
--------------
    trunk/rkward/rkward/rbackend/CMakeLists.txt
    trunk/rkward/rkward/rkward.bat.template
    trunk/rkward/windows_nsis/make_release.bat

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


Property changes on: trunk/rkward
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2010_10_18_backend_restructuring_branch:3130-3196
/branches/release_branch_0.5.4:3098-3102,3127
   + /branches/2010_10_18_backend_restructuring_branch:3130-3196
/branches/release_branch_0.5.4:3098-3102,3127
/branches/release_branch_0.5.7:3913


Property changes on: trunk/rkward/debian
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2010_10_18_backend_restructuring_branch/debian:3130-3196
/branches/release_branch_0.5.4:3098-3102
/branches/release_branch_0.5.4/debian:3098-3102
   + /branches/2010_10_18_backend_restructuring_branch/debian:3130-3196
/branches/release_branch_0.5.4:3098-3102
/branches/release_branch_0.5.4/debian:3098-3102
/branches/release_branch_0.5.7/debian:3913

Modified: trunk/rkward/rkward/rbackend/CMakeLists.txt
===================================================================
--- trunk/rkward/rkward/rbackend/CMakeLists.txt	2011-10-09 09:20:40 UTC (rev 3913)
+++ trunk/rkward/rkward/rbackend/CMakeLists.txt	2011-10-09 17:36:20 UTC (rev 3914)
@@ -61,7 +61,13 @@
 	ADD_EXECUTABLE(rkward.rbackend ${rbackend_BACKEND_SRCS})
 	FIND_PACKAGE(Gettext REQUIRED)
 	TARGET_LINK_LIBRARIES(rkward.rbackend ${R_USED_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${QT_QTNETWORK_LIBRARY} ${QT_QTCORE_LIBRARY} ${GETTEXT_LIBRARIES})
-	INSTALL(TARGETS rkward.rbackend DESTINATION ${LIBEXEC_INSTALL_DIR})
+	IF(WIN32)
+		# on Widows, we install to the rbackend subdirectory, because 1) LIBEXEC_INSTALL_DIR == BIN_INSTALL_DIR and 2) we don't want the backend to pick up
+		# all the KDE library versions, first, when loading DLLs
+		INSTALL(TARGETS rkward.rbackend DESTINATION ${BIN_INSTALL_DIR}/rbackend)
+	ELSE(WIN32)
+		INSTALL(TARGETS rkward.rbackend DESTINATION ${LIBEXEC_INSTALL_DIR})
+	ENDIF(WIN32)
 ELSE(RBACKEND_SPLIT)
 	SET (
 		rbackend_ALL_SRCS

Modified: trunk/rkward/rkward/rkward.bat.template
===================================================================
--- trunk/rkward/rkward/rkward.bat.template	2011-10-09 09:20:40 UTC (rev 3913)
+++ trunk/rkward/rkward/rkward.bat.template	2011-10-09 17:36:20 UTC (rev 3914)
@@ -17,6 +17,7 @@
 ECHO Starting RKWard
 SET RKWARD.BIN=%~dsp0\rkward.frontend.exe
 SET RKWARD_ENSURE_PREFIX=%~dsp0\..
+SET PATH=%~dsp0;%PATH%
 SET DEBUGGER=
 
 IF NOT "%1" == "--debugger" GOTO run

Modified: trunk/rkward/windows_nsis/make_release.bat
===================================================================
--- trunk/rkward/windows_nsis/make_release.bat	2011-10-09 09:20:40 UTC (rev 3913)
+++ trunk/rkward/windows_nsis/make_release.bat	2011-10-09 17:36:20 UTC (rev 3914)
@@ -1,9 +1,10 @@
 SET KDEPREFIXDRIVE=c:
 SET KDEPREFIX=KDE
-SET RHOMEDRIVE=F:
-SET RHOME=KDE/lib/R
+SET RHOMEDRIVE=C:
+SET RHOME=Programme/R/R-2.12.0
 
 SET SH_PATH=C:\Rtools\bin
+SET MINGW_PATH=C:\Mingw\bin
 SET MAKENSIS=c:/programme/nsis/makensis.exe
 
 REM --------------------------------------------
@@ -26,9 +27,14 @@
 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%
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
 move %INSTALL_DIR%/%RHOME% %INSTALL_DIR%/_RHOME_
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 move %INSTALL_DIR%/%KDEPREFIX% %INSTALL_DIR%/_KDEPREFIX_
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+copy /Y %MINGW_PATH%\libgcc_s_dw2-1.dll %RELEASE_DIR%\install\_KDEPREFIX_\bin\
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
 REM Prepare Version info for use in NSIS
 echo !define RKWARD_VERSION \ > %RELEASE_DIR%/rkward_version.nsh
@@ -40,3 +46,10 @@
 
 cd %RELEASE_DIR%
 "%MAKENSIS%" installer.nsi
+
+GOTO END
+
+:ERROR
+echo "There has been an error. Aborting."
+
+:END

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