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

[tfry at users.sourceforge.net]

Revision: 2535
          http://rkward.svn.sourceforge.net/rkward/?rev=2535&view=rev
Author:   tfry
Date:     2009-06-17 11:39:59 +0000 (Wed, 17 Jun 2009)

Log Message:
-----------
Some more windows fixes, mostly quoting paths, and create an .ico file.

Modified Paths:
--------------
    trunk/rkward/rkward/rkward.bat.template
    trunk/rkward/rkward/scriptbackends/phpbackend.cpp
    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-16 13:18:18 UTC (rev 2534)
+++ trunk/rkward/rkward/rkward.bat.template	2009-06-17 11:39:59 UTC (rev 2535)
@@ -1,6 +1,6 @@
 @ECHO off
 REM Wrapper script to start RKWard.
-REM It the *first* parameter is "--debugger", run through the specified debugger
+REM If 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.
@@ -20,4 +20,4 @@
 SHIFT
 
 :run
-CALL %R_BINARY% CMD %DEBUGGER% %RKWARD.BIN% %1 %2 %3 %4 %5 %6 %7 %8 %9
+CALL "%R_BINARY%" CMD %DEBUGGER% "%RKWARD.BIN%" %1 %2 %3 %4 %5 %6 %7 %8 %9

Modified: trunk/rkward/rkward/scriptbackends/phpbackend.cpp
===================================================================
--- trunk/rkward/rkward/scriptbackends/phpbackend.cpp	2009-06-16 13:18:18 UTC (rev 2534)
+++ trunk/rkward/rkward/scriptbackends/phpbackend.cpp	2009-06-17 11:39:59 UTC (rev 2535)
@@ -73,7 +73,7 @@
 	connect (php_process, SIGNAL (error(QProcess::ProcessError)), this, SLOT (processError(QProcess::ProcessError)));
 	connect (php_process, SIGNAL (finished(int,QProcess::ExitStatus)), this, SLOT (processDead(int,QProcess::ExitStatus)));
 
-	php_process->start (RKSettingsModulePHP::phpBin() + " -c " + php_ini + " " + common_php);
+	php_process->start ("\"" + RKSettingsModulePHP::phpBin() + "\"" + " -c \"" + php_ini + "\" \"" + common_php + "\"");
 
 	doing_command = startup_done = false;
 	busy = true;

Modified: trunk/rkward/windows_nsis/installer.nsi
===================================================================
--- trunk/rkward/windows_nsis/installer.nsi	2009-06-16 13:18:18 UTC (rev 2534)
+++ trunk/rkward/windows_nsis/installer.nsi	2009-06-17 11:39:59 UTC (rev 2535)
@@ -262,7 +262,9 @@
 	setOutPath $INST_RHOME
 	File /r install\_RHOME_\*.*
 
-	CreateShortCut "$DESKTOP\RKWard.lnk" "$INST_KDEPREFIX\bin\rkward.bat"
+	setOutPath $INST_KDEPREFIX\bin
+	File "rkward.ico"
+	CreateShortCut "$DESKTOP\RKWard.lnk" "$INST_KDEPREFIX\bin\rkward.bat" "" "$INST_KDEPREFIX\bin\rkward.ico"
 
 #	writeUninstaller $INST_KDEPREFIX\uninstaller.exe
 sectionEnd

Modified: trunk/rkward/windows_nsis/make_release.bat
===================================================================
--- trunk/rkward/windows_nsis/make_release.bat	2009-06-16 13:18:18 UTC (rev 2534)
+++ trunk/rkward/windows_nsis/make_release.bat	2009-06-17 11:39:59 UTC (rev 2535)
@@ -10,7 +10,7 @@
 REM everything below should not need customizing
 REM --------------------------------------------
 
-SET ADD_CMAKE_FLAGS=" -DCMAKE_BUILD_TYPE=Release "
+SET ADD_CMAKE_FLAGS=-DCMAKE_BUILD_TYPE=Release
 
 SET RELEASE_DIR=%~dp0
 SET SOURCE_DIR=%RELEASE_DIR%\..
@@ -35,5 +35,8 @@
 more %SOURCE_DIR%\rkward\resource.ver >> %RELEASE_DIR%/rkward_version.nsh
 copy /Y %SOURCE_DIR%\COPYING %RELEASE_DIR%
 
+REM icon needs to be set by the installer
+svg2ico "%SOURCE_DIR%\rkward\icons\app-icon\hisc-app-rkward.svgz" "%RELEASE_DIR%\rkward.ico"
+
 cd %RELEASE_DIR%
-%MAKENSIS% installer.nsi
+"%MAKENSIS%" installer.nsi


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