Author: ruschein
Date: 2011-06-09 10:07:27 -0700 (Thu, 09 Jun 2011)
New Revision: 25689
Removed:
cytoscape/trunk/distribution/src/main/bin/gen_vmoptions.bat
cytoscape/trunk/distribution/src/main/bin/gen_vmoptions.sh
Modified:
cytoscape/trunk/distribution/src/main/bin/cytoscape.bat
cytoscape/trunk/distribution/src/main/bin/cytoscape.sh
Log:
Removed gen_vmoptions.{bat,sh} and adjusted cytoscape.{bat,sh} for that as well
as having picked defaults for Cytoscape.vmoptions that should be save on a
32-bit 1GiB RAM Windows system.
Modified: cytoscape/trunk/distribution/src/main/bin/cytoscape.bat
===================================================================
--- cytoscape/trunk/distribution/src/main/bin/cytoscape.bat 2011-06-09
16:54:41 UTC (rev 25688)
+++ cytoscape/trunk/distribution/src/main/bin/cytoscape.bat 2011-06-09
17:07:27 UTC (rev 25689)
@@ -5,19 +5,6 @@
@echo off
-:: Create the Cytoscape.vmoptions file, if it doesn't exist.
-IF EXIST "Cytoscape.vmoptions" GOTO vmoptionsFileExists
-CALL gen_vmoptions.bat
-:vmoptionsFileExists
-
-IF EXIST "Cytoscape.vmoptions" GOTO itIsThere
-; Run with defaults:
-echo "*** Missing Cytoscape.vmoptions, falling back to using defaults!"
-java -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd -Xss10M -Xmx768M
-jar cytoscape.jar -p plugins %*
-GOTO end
-
-:: We end up here if we have a Cytoscape.vmoptions file:
-:itIsThere
:: Read vmoptions, one per line.
setLocal EnableDelayedExpansion
for /f "tokens=* delims= " %%a in (Cytoscape.vmoptions) do (
Modified: cytoscape/trunk/distribution/src/main/bin/cytoscape.sh
===================================================================
--- cytoscape/trunk/distribution/src/main/bin/cytoscape.sh 2011-06-09
16:54:41 UTC (rev 25688)
+++ cytoscape/trunk/distribution/src/main/bin/cytoscape.sh 2011-06-09
17:07:27 UTC (rev 25689)
@@ -9,11 +9,6 @@
#vm_options_path=$HOME/.cytoscape
vm_options_path=$script_path
-# Attempt to generate Cytoscape.vmoptions if it doesn't exist!
-if [ ! -e "$vm_options_path/Cytoscape.vmoptions" -a -x
"$script_path/gen_vmoptions.sh" ]; then
- "$script_path/gen_vmoptions.sh"
-fi
-
if [ -r $vm_options_path/Cytoscape.vmoptions ]; then
java `cat "$vm_options_path/Cytoscape.vmoptions"` -jar
"$script_path/cytoscape.jar" -p "$script_path/plugins" "$@"
else # Just use sensible defaults.
Deleted: cytoscape/trunk/distribution/src/main/bin/gen_vmoptions.bat
===================================================================
--- cytoscape/trunk/distribution/src/main/bin/gen_vmoptions.bat 2011-06-09
16:54:41 UTC (rev 25688)
+++ cytoscape/trunk/distribution/src/main/bin/gen_vmoptions.bat 2011-06-09
17:07:27 UTC (rev 25689)
@@ -1,30 +0,0 @@
-@echo off
-
-:: Generates the Cytoscape.vmoptions file based on whether
-:: we're dealing with a 32 bit or 64 bit JVM.
-
-:: Create the .cytoscape directory if it doesn't already exist
-;if exist %HOMEPATH%\.cytoscape goto dot_cytoscape_exists
-;mkdir %HOMEPATH%\.cytoscape
-;:dot_cytoscape_exists
-
-if exist findstr.out del findstr.out
-java -version 2>&1 | findstr /I 64-Bit > findstr.out
-for /f %%i in ('dir /b findstr.out') do if %%~zi equ 0 goto 32bit
-
-:64bit
- echo -Xms20m > Cytoscape.vmoptions
- echo -Xmx768m >>Cytoscape.vmoptions
- echo -Xss10m >>Cytoscape.vmoptions
- goto shared
-
-:32bit
- echo -Xms10m > Cytoscape.vmoptions
- echo -Xmx768m >>Cytoscape.vmoptions
- echo -Xss10m >>Cytoscape.vmoptions
-
-:shared
- echo -Dswing.aatext=true >>Cytoscape.vmoptions
- echo -Dawt.useSystemAAFontSettings=lcd >>Cytoscape.vmoptions
-
- del findstr.out
Deleted: cytoscape/trunk/distribution/src/main/bin/gen_vmoptions.sh
===================================================================
--- cytoscape/trunk/distribution/src/main/bin/gen_vmoptions.sh 2011-06-09
16:54:41 UTC (rev 25688)
+++ cytoscape/trunk/distribution/src/main/bin/gen_vmoptions.sh 2011-06-09
17:07:27 UTC (rev 25689)
@@ -1,42 +0,0 @@
-#!/bin/sh
-# Generates the Cytoscape.vmoptions file
-
-script_path="$(dirname -- $0)"
-
-#vm_options_path="$HOME/.cytoscape"
-vm_options_path=$script_path
-
-if [ ! -e $vm_options_path ]; then
- /bin/mkdir $vm_options_path
-fi
-
-# Determine amount of physical memory present:
-if [ `uname` = "Darwin" ]; then
- phys_mem=`sysctl -a | grep 'hw.memsize =' | sed 's/[ ][ ][ ]*/ /g' | cut
-f 3 -d ' '`
- phys_mem=$((phys_mem / 1024 / 1024)) # Convert from B to MiB
-else # We assume Linux
- phys_mem=`cat /proc/meminfo | grep 'MemTotal:' | sed 's/[ ][ ][ ]*/ /g' |
cut -f 2 -d ' '`
- phys_mem=$((phys_mem / 1024)) # Convert from KiB to MiB
-fi
-
-if `java -version 2>&1 | grep -- 64-Bit > /dev/null`; then # We have a 64 bit
JVM.
- echo -Xms20m > "$vm_options_path/Cytoscape.vmoptions"
- echo -Xmx${phys_mem}m >> "$vm_options_path/Cytoscape.vmoptions"
- echo -Xss10m >> "$vm_options_path/Cytoscape.vmoptions"
- echo -d64 >> "$vm_options_path/Cytoscape.vmoptions"
-else # Assume a 32 bit JVM.
- # Truncate memory setting at 1550 MiB:
- if [ $phys_mem -gt 1550 ]; then
- phys_mem=1550
- fi
-
- echo -Xms10m > "$vm_options_path/Cytoscape.vmoptions"
- echo -Xmx${phys_mem}m >> "$vm_options_path/Cytoscape.vmoptions"
- echo -Xss10m >> "$vm_options_path/Cytoscape.vmoptions"
-fi
-
-# Shared JVM options
-echo -Dswing.aatext=true >>
"$vm_options_path/Cytoscape.vmoptions"
-echo -Dawt.useSystemAAFontSettings=lcd >>
"$vm_options_path/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.
