Author: bdemchak
Date: 2012-12-06 14:34:26 -0800 (Thu, 06 Dec 2012)
New Revision: 30910
Modified:
core3/gui-distribution/trunk/assembly/src/main/bin/cytoscape.bat
core3/gui-distribution/trunk/assembly/src/main/bin/gen_vmoptions.bat
Log:
Fixed bugs in Java machine detection and startup
Modified: core3/gui-distribution/trunk/assembly/src/main/bin/cytoscape.bat
===================================================================
--- core3/gui-distribution/trunk/assembly/src/main/bin/cytoscape.bat
2012-12-06 22:15:14 UTC (rev 30909)
+++ core3/gui-distribution/trunk/assembly/src/main/bin/cytoscape.bat
2012-12-06 22:34:26 UTC (rev 30910)
@@ -30,7 +30,7 @@
set PWD=%~dp0
set KARAF_OPTS=-Xss10M -Dcytoscape.home="%PWD:\=\\%" -Duser.dir="%PWD:\=\\%"
-splash:CytoscapeSplashScreen.png
-set KARAF_DATA="%USERPROFILE%\CytoscapeConfiguration\3\karaf_data"
+set KARAF_DATA=%USERPROFILE%\CytoscapeConfiguration\3\karaf_data
if not exist "%KARAF_DATA%" (
mkdir "%KARAF_DATA%\tmp"
)
Modified: core3/gui-distribution/trunk/assembly/src/main/bin/gen_vmoptions.bat
===================================================================
--- core3/gui-distribution/trunk/assembly/src/main/bin/gen_vmoptions.bat
2012-12-06 22:15:14 UTC (rev 30909)
+++ core3/gui-distribution/trunk/assembly/src/main/bin/gen_vmoptions.bat
2012-12-06 22:34:26 UTC (rev 30910)
@@ -25,8 +25,10 @@
:Javatest
if exist findstr.out del findstr.out
java -version 2>&1 | findstr /I 64-Bit > findstr.out
- if %ERRORLEVEL% NEQ 0 GOTO Nojava
- for /f %%i in ('dir /b findstr.out') do if %%~zi equ 0 goto 32bit
+ if %ERRORLEVEL% EQU 0 GOTO 64bit
+ java -version 2>&1 | findstr /i Java > findstr.out
+ IF %ERRORLEVEL% EQU 0 GOTO 32bit
+ goto Nojava
:64bit
REM echo "64 bit %mem% MB"
@@ -35,9 +37,10 @@
:32bit
REM echo "32 bit %mem% MB"
- REM Some java versions can only support 1400MB
- if %mem% GTR 1400 set mem=1400
+ REM Some java versions can only support 1100MB
+ if %mem% GTR 1100 set mem=1100
echo %mem%M >Cytoscape.vmoptions
+ goto End
:Nojava
echo ERROR: Can't find java executable
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
