Author: ruschein
Date: 2010-10-12 10:10:57 -0700 (Tue, 12 Oct 2010)
New Revision: 22211
Modified:
cytoscape/trunk/distribution/src/main/bin/cytoscape.bat
cytoscape/trunk/distribution/src/main/bin/cytoscape.sh
cytoscape/trunk/distribution/src/main/bin/gen_vmoptions.bat
cytoscape/trunk/distribution/src/main/bin/gen_vmoptions.sh
Log:
Temporary reversion from having Cytoscape.vmoptions in the .cytoscape directory.
Modified: cytoscape/trunk/distribution/src/main/bin/cytoscape.bat
===================================================================
--- cytoscape/trunk/distribution/src/main/bin/cytoscape.bat 2010-10-11
23:55:00 UTC (rev 22210)
+++ cytoscape/trunk/distribution/src/main/bin/cytoscape.bat 2010-10-12
17:10:57 UTC (rev 22211)
@@ -6,13 +6,20 @@
@echo off
:: Create the Cytoscape.vmoptions file, if it doesn't exist.
-IF EXIST "%HOMEPATH%\.cytoscape\Cytoscape.vmoptions" GOTO vmoptionsFileExists
+IF EXIST "Cytoscape.vmoptions" GOTO vmoptionsFileExists
CALL gen_vmoptions.bat
:vmoptionsFileExists
+IF EXIST "Cytoscape.vmoptions" GOTO itIsThere
+; Run with defaults:
+java -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd -Xss10M -Xmx1550M
-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 (%HOMEPATH%\.cytoscape\Cytoscape.vmoptions)
do (
+for /f "tokens=* delims= " %%a in (Cytoscape.vmoptions) do (
set /a N+=1
set opt!N!=%%a
)
@@ -20,3 +27,4 @@
java !opt1! !opt2! !opt3! !opt4! !opt5! !opt6! !opt7! !opt8! !opt9! -jar
cytoscape.jar -p plugins %*
+:end
\ No newline at end of file
Modified: cytoscape/trunk/distribution/src/main/bin/cytoscape.sh
===================================================================
--- cytoscape/trunk/distribution/src/main/bin/cytoscape.sh 2010-10-11
23:55:00 UTC (rev 22210)
+++ cytoscape/trunk/distribution/src/main/bin/cytoscape.sh 2010-10-12
17:10:57 UTC (rev 22211)
@@ -6,15 +6,18 @@
script_path="$(dirname -- $0)"
+#vm_options_path=$HOME/.cytoscape
+vm_options_path=$script_path
+
# Attempt to generate Cytoscape.vmoptions if it doesn't exist!
-if [ ! -e "$HOME/.cytoscape/Cytoscape.vmoptions" -a -x
"$script_path/gen_vmoptions.sh" ]; then
+if [ ! -e "$vm_options_path/Cytoscape.vmoptions" -a -x
"$script_path/gen_vmoptions.sh" ]; then
"$script_path/gen_vmoptions.sh"
fi
-if [ -r $HOME/.cytoscape/Cytoscape.vmoptions ]; then
- java `cat "$HOME/.cytoscape/Cytoscape.vmoptions"` -jar
"$script_path/cytoscape.jar" -p "$script_path/plugins" "$@"
+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.
- java -d64 -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd -Xss10M
-Xmx1550M \
+ java -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd -Xss10M
-Xmx1550M \
-jar "$script_path/cytoscape.jar" -p "$script_path/plugins" "$@"
fi
Modified: cytoscape/trunk/distribution/src/main/bin/gen_vmoptions.bat
===================================================================
--- cytoscape/trunk/distribution/src/main/bin/gen_vmoptions.bat 2010-10-11
23:55:00 UTC (rev 22210)
+++ cytoscape/trunk/distribution/src/main/bin/gen_vmoptions.bat 2010-10-12
17:10:57 UTC (rev 22211)
@@ -4,27 +4,27 @@
:: 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 %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 > %HOMEPATH%\.cytoscape\Cytoscape.vmoptions
- echo -Xmx20g >> %HOMEPATH%\.cytoscape\Cytoscape.vmoptions
+:64bit`
+ echo -Xms20m > Cytoscape.vmoptions
+ echo -Xmx20g >>Cytoscape.vmoptions
goto shared
:32bit
- echo -Xms10m > %HOMEPATH%\.cytoscape\Cytoscape.vmoptions
- echo -Xmx1550m >> %HOMEPATH%\.cytoscape\Cytoscape.vmoptions
+ echo -Xms10m > Cytoscape.vmoptions
+ echo -Xmx1550m >>Cytoscape.vmoptions
:shared
- echo -Dswing.aatext=true >>
%HOMEPATH%\.cytoscape\Cytoscape.vmoptions
- echo -Dawt.useSystemAAFontSettings=lcd >>
%HOMEPATH%\.cytoscape\Cytoscape.vmoptions
+ echo -Dswing.aatext=true >>Cytoscape.vmoptions
+ echo -Dawt.useSystemAAFontSettings=lcd >>Cytoscape.vmoptions
del findstr.out
Modified: cytoscape/trunk/distribution/src/main/bin/gen_vmoptions.sh
===================================================================
--- cytoscape/trunk/distribution/src/main/bin/gen_vmoptions.sh 2010-10-11
23:55:00 UTC (rev 22210)
+++ cytoscape/trunk/distribution/src/main/bin/gen_vmoptions.sh 2010-10-12
17:10:57 UTC (rev 22211)
@@ -1,23 +1,24 @@
#!/bin/sh
# Generates the Cytoscape.vmoptions file
-dot_cytoscape_path="$HOME/.cytoscape"
+#vm_options_path="$HOME/.cytoscape"
+vm_options_path=.
-if [ ! -e $dot_cytoscape_path ]; then
- /bin/mkdir $dot_cytoscape_path
+if [ ! -e $vm_options_path ]; then
+ /bin/mkdir $vm_options_path
fi
if `java -version 2>&1 | grep -- 64-Bit > /dev/null`; then # We have a 64 bit
JVM.
- echo -Xms20m > "$dot_cytoscape_path/Cytoscape.vmoptions"
- echo -Xmx20g >> "$dot_cytoscape_path/Cytoscape.vmoptions"
- echo -d64 >> "$dot_cytoscape_path/Cytoscape.vmoptions"
+ echo -Xms20m > "$vm_options_path/Cytoscape.vmoptions"
+ echo -Xmx20g >> "$vm_options_path/Cytoscape.vmoptions"
+ echo -d64 >> "$vm_options_path/Cytoscape.vmoptions"
else # Assume a 32 bit JVM.
- echo -Xms10m > "$dot_cytoscape_path/Cytoscape.vmoptions"
- echo -Xmx1550m >> "$dot_cytoscape_path/Cytoscape.vmoptions"
+ echo -Xms10m > "$vm_options_path/Cytoscape.vmoptions"
+ echo -Xmx1550m >> "$vm_options_path/Cytoscape.vmoptions"
fi
# Shared JVM options
-echo -Dswing.aatext=true >>
"$dot_cytoscape_path/Cytoscape.vmoptions"
-echo -Dawt.useSystemAAFontSettings=lcd >>
"$dot_cytoscape_path/Cytoscape.vmoptions"
+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.
