* Remove JRE6 from start scripts. Reduced Xmx value of client to 512m (should be enough and reduces problems that client does not start because of not available memory).

This commit is contained in:
LevelX2 2014-02-15 09:30:01 +01:00
parent a0346109a2
commit d9f2f8a4a7
8 changed files with 14 additions and 24 deletions

View file

@ -1,12 +1,7 @@
@ECHO OFF @ECHO OFF
IF NOT EXIST "C:\Program Files\Java\jre6" GOTO JAVA7
set JAVA_HOME="C:\Program Files\Java\jre6"
set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
set PATH=%JAVA_HOME%/bin;%PATH%
:JAVA7
IF NOT EXIST "C:\Program Files\Java\jre7\bin\" GOTO NOJAVADIR IF NOT EXIST "C:\Program Files\Java\jre7\bin\" GOTO NOJAVADIR
set JAVA_HOME="C:\Program Files\Java\jre7\" set JAVA_HOME="C:\Program Files\Java\jre7\"
set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH% set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
set PATH=%JAVA_HOME%/bin;%PATH% set PATH=%JAVA_HOME%/bin;%PATH%
:NOJAVADIR :NOJAVADIR
start javaw -Xms256m -Xmx1024m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar .\lib\mage-client-${project.version}.jar start javaw -Xms256m -Xmx512m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar .\lib\mage-client-${project.version}.jar

View file

@ -2,4 +2,4 @@
cd "`dirname "$0"`" cd "`dirname "$0"`"
java -Xms256m -Xmx1024m -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar ./lib/mage-client-${project.version}.jar & java -Xms256m -Xmx512m -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar ./lib/mage-client-${project.version}.jar &

View file

@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
java -Xms256m -Xmx1024m -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar ./lib/mage-client-${project.version}.jar & java -Xms256m -Xmx512m -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar ./lib/mage-client-${project.version}.jar &

View file

@ -1,12 +1,7 @@
@ECHO OFF @ECHO OFF
IF NOT EXIST "C:\Program Files (x86)\Java\jre6\bin\" GOTO JAVA7
set JAVA_HOME="C:\Program Files (x86)\Java\jre6\"
set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
set PATH=%JAVA_HOME%/bin;%PATH%
:JAVA7
IF NOT EXIST "C:\Program Files (x86)\Java\jre7\bin\" GOTO NOJAVADIR IF NOT EXIST "C:\Program Files (x86)\Java\jre7\bin\" GOTO NOJAVADIR
set JAVA_HOME="C:\Program Files (x86)\Java\jre7\" set JAVA_HOME="C:\Program Files (x86)\Java\jre7\"
set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH% set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
set PATH=%JAVA_HOME%/bin;%PATH% set PATH=%JAVA_HOME%/bin;%PATH%
:NOJAVADIR :NOJAVADIR
start javaw -Xms256m -Xmx1024m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar .\lib\mage-client-${project.version}.jar start javaw -Xms256m -Xmx512m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar .\lib\mage-client-${project.version}.jar

View file

@ -1,9 +1,4 @@
@ECHO OFF @ECHO OFF
IF NOT EXIST "C:\Program Files\Java\jre6" GOTO JAVA7
set JAVA_HOME="C:\Program Files\Java\jre6"
set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
set PATH=%JAVA_HOME%/bin;%PATH%
:JAVA7
IF NOT EXIST "C:\Program Files\Java\jre7\bin\" GOTO NOJAVADIR IF NOT EXIST "C:\Program Files\Java\jre7\bin\" GOTO NOJAVADIR
set JAVA_HOME="C:\Program Files\Java\jre7\" set JAVA_HOME="C:\Program Files\Java\jre7\"
set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH% set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%

View file

@ -1,9 +1,4 @@
@ECHO OFF @ECHO OFF
IF NOT EXIST "C:\Program Files (x86)\Java\jre6\bin\" GOTO JAVA7
set JAVA_HOME="C:\Program Files (x86)\Java\jre6\"
set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
set PATH=%JAVA_HOME%/bin;%PATH%
:JAVA7
IF NOT EXIST "C:\Program Files (x86)\Java\jre7\bin\" GOTO NOJAVADIR IF NOT EXIST "C:\Program Files (x86)\Java\jre7\bin\" GOTO NOJAVADIR
set JAVA_HOME="C:\Program Files (x86)\Java\jre7\" set JAVA_HOME="C:\Program Files (x86)\Java\jre7\"
set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH% set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%

5
temp/startMage.bat Normal file
View file

@ -0,0 +1,5 @@
@ECHO OFF
cd ./mage-client
call startClient
cd ../mage-server
call startServer

5
temp/startMageWin7.bat Normal file
View file

@ -0,0 +1,5 @@
@ECHO OFF
cd ./mage-client
call startClientWin7
cd ../mage-server
call startServerWin7