Author: ruschein
Date: 2010-02-03 13:50:39 -0800 (Wed, 03 Feb 2010)
New Revision: 19165
Modified:
cytoscape/trunk/resources/bin/cytoscape.bat
cytoscape/trunk/resources/bin/cytoscape.sh
cytoscape/trunk/resources/bin/gen_vmoptions.bat
cytoscape/trunk/resources/bin/gen_vmoptions.sh
Log:
Moved all JVM options into cytoscape.vmoptions.
Modified: cytoscape/trunk/resources/bin/cytoscape.bat
===================================================================
--- cytoscape/trunk/resources/bin/cytoscape.bat 2010-02-03 21:31:22 UTC (rev
19164)
+++ cytoscape/trunk/resources/bin/cytoscape.bat 2010-02-03 21:50:39 UTC (rev
19165)
@@ -17,6 +17,6 @@
set opt!N!=%%a
)
-java -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd !opt1! !opt2!
!opt3! !opt4! !opt5! -cp cytoscape.jar cytoscape.CyMain -p plugins %*
+java !opt1! !opt2! !opt3! !opt4! !opt5! !opt6! !opt7! !opt8! !opt9! -jar
cytoscape.jar -p plugins %*
Modified: cytoscape/trunk/resources/bin/cytoscape.sh
===================================================================
--- cytoscape/trunk/resources/bin/cytoscape.sh 2010-02-03 21:31:22 UTC (rev
19164)
+++ cytoscape/trunk/resources/bin/cytoscape.sh 2010-02-03 21:50:39 UTC (rev
19165)
@@ -12,11 +12,9 @@
fi
if [ -r cytoscape.vmoptions ]; then
- java -d64 -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd \
- `cat cytoscape.vmoptions` -cp $script_path/cytoscape.jar
cytoscape.CyMain \
- -p $script_path/plugins "$@"
+ java `cat cytoscape.vmoptions` -jar $script_path/cytoscape.jar -p
$script_path/plugins "$@"
else # Just use sensible defaults.
java -d64 -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd -Xss10M
-Xmx1550M \
- -cp $script_path/cytoscape.jar cytoscape.CyMain -p $script_path/plugins
"$@"
+ -jar $script_path/cytoscape.jar -p $script_path/plugins "$@"
fi
Modified: cytoscape/trunk/resources/bin/gen_vmoptions.bat
===================================================================
--- cytoscape/trunk/resources/bin/gen_vmoptions.bat 2010-02-03 21:31:22 UTC
(rev 19164)
+++ cytoscape/trunk/resources/bin/gen_vmoptions.bat 2010-02-03 21:50:39 UTC
(rev 19165)
@@ -8,15 +8,18 @@
:64bit
- echo -Xms20m > cytoscape.vmoptions
+ echo -Xms20m > cytoscape.vmoptions
echo -Xmx2000000m >> cytoscape.vmoptions
GOTO end:
:32bit
- echo -Xms10m > cytoscape.vmoptions
+ echo -Xms10m > cytoscape.vmoptions
echo -Xmx1550m >> cytoscape.vmoptions
+:: Shared JVM options.
+echo -Dswing.aatext=true >> cytoscape.vmoptions
+echo -Dawt.useSystemAAFontSettings=lcd >> cytoscape.vmoptions
:end
set errorlevel=0
Modified: cytoscape/trunk/resources/bin/gen_vmoptions.sh
===================================================================
--- cytoscape/trunk/resources/bin/gen_vmoptions.sh 2010-02-03 21:31:22 UTC
(rev 19164)
+++ cytoscape/trunk/resources/bin/gen_vmoptions.sh 2010-02-03 21:50:39 UTC
(rev 19165)
@@ -1,11 +1,16 @@
#!/bin/sh
# Generates the cytoscape.vmoptions file
-if `java -version 2>&1 | grep -- 64-Bit > /dev/null`; then
- echo -Xms20m > cytoscape.vmoptions
+if `java -version 2>&1 | grep -- 64-Bit > /dev/null`; then # We have a 64 bit
JVM.
+ echo -Xms20m > cytoscape.vmoptions
echo -Xmx20000m >> cytoscape.vmoptions
else # Assume a 32 bit JVM.
- echo -Xms10m > cytoscape.vmoptions
+ echo -Xms10m > cytoscape.vmoptions
echo -Xmx1550m >> cytoscape.vmoptions
fi
+# Shared JVM options
+echo -d64 >> cytoscape.vmoptions
+echo -Dswing.aatext=true >> cytoscape.vmoptions
+echo -Dawt.useSystemAAFontSettings=lcd >> cytoscape.vmoptions
+
exit 0
--
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.
