From d9f2f8a4a77c4f9ba9d711c7e4c536167e754feb Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 15 Feb 2014 09:30:01 +0100 Subject: [PATCH] * 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). --- Mage.Client/release/startClient.bat | 7 +------ Mage.Client/release/startClient.command | 2 +- Mage.Client/release/startClient.sh | 2 +- Mage.Client/release/startClientWin7.bat | 7 +------ Mage.Server/release/startServer.bat | 5 ----- Mage.Server/release/startServerWin7.bat | 5 ----- temp/startMage.bat | 5 +++++ temp/startMageWin7.bat | 5 +++++ 8 files changed, 14 insertions(+), 24 deletions(-) create mode 100644 temp/startMage.bat create mode 100644 temp/startMageWin7.bat diff --git a/Mage.Client/release/startClient.bat b/Mage.Client/release/startClient.bat index 790ca47bb7..3468041f2e 100644 --- a/Mage.Client/release/startClient.bat +++ b/Mage.Client/release/startClient.bat @@ -1,12 +1,7 @@ @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 set JAVA_HOME="C:\Program Files\Java\jre7\" set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH% set PATH=%JAVA_HOME%/bin;%PATH% :NOJAVADIR -start javaw -Xms256m -Xmx1024m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar .\lib\mage-client-${project.version}.jar \ No newline at end of file +start javaw -Xms256m -Xmx512m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar .\lib\mage-client-${project.version}.jar \ No newline at end of file diff --git a/Mage.Client/release/startClient.command b/Mage.Client/release/startClient.command index 06863c3a7d..47fe9c1be5 100644 --- a/Mage.Client/release/startClient.command +++ b/Mage.Client/release/startClient.command @@ -2,4 +2,4 @@ cd "`dirname "$0"`" -java -Xms256m -Xmx1024m -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar ./lib/mage-client-${project.version}.jar & \ No newline at end of file +java -Xms256m -Xmx512m -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar ./lib/mage-client-${project.version}.jar & \ No newline at end of file diff --git a/Mage.Client/release/startClient.sh b/Mage.Client/release/startClient.sh index f293570f12..501ef2a66f 100644 --- a/Mage.Client/release/startClient.sh +++ b/Mage.Client/release/startClient.sh @@ -1,3 +1,3 @@ #!/bin/sh -java -Xms256m -Xmx1024m -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar ./lib/mage-client-${project.version}.jar & \ No newline at end of file +java -Xms256m -Xmx512m -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar ./lib/mage-client-${project.version}.jar & \ No newline at end of file diff --git a/Mage.Client/release/startClientWin7.bat b/Mage.Client/release/startClientWin7.bat index 1124357b7d..1ef71045b7 100644 --- a/Mage.Client/release/startClientWin7.bat +++ b/Mage.Client/release/startClientWin7.bat @@ -1,12 +1,7 @@ @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 set JAVA_HOME="C:\Program Files (x86)\Java\jre7\" set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH% set PATH=%JAVA_HOME%/bin;%PATH% :NOJAVADIR -start javaw -Xms256m -Xmx1024m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar .\lib\mage-client-${project.version}.jar \ No newline at end of file +start javaw -Xms256m -Xmx512m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar .\lib\mage-client-${project.version}.jar \ No newline at end of file diff --git a/Mage.Server/release/startServer.bat b/Mage.Server/release/startServer.bat index c23f661e73..8da532969c 100644 --- a/Mage.Server/release/startServer.bat +++ b/Mage.Server/release/startServer.bat @@ -1,9 +1,4 @@ @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 set JAVA_HOME="C:\Program Files\Java\jre7\" set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH% diff --git a/Mage.Server/release/startServerWin7.bat b/Mage.Server/release/startServerWin7.bat index f291b447cc..8bf4bfa0a8 100644 --- a/Mage.Server/release/startServerWin7.bat +++ b/Mage.Server/release/startServerWin7.bat @@ -1,9 +1,4 @@ @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 set JAVA_HOME="C:\Program Files (x86)\Java\jre7\" set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH% diff --git a/temp/startMage.bat b/temp/startMage.bat new file mode 100644 index 0000000000..35ca530858 --- /dev/null +++ b/temp/startMage.bat @@ -0,0 +1,5 @@ +@ECHO OFF +cd ./mage-client +call startClient +cd ../mage-server +call startServer \ No newline at end of file diff --git a/temp/startMageWin7.bat b/temp/startMageWin7.bat new file mode 100644 index 0000000000..c353ad6888 --- /dev/null +++ b/temp/startMageWin7.bat @@ -0,0 +1,5 @@ +@ECHO OFF +cd ./mage-client +call startClientWin7 +cd ../mage-server +call startServerWin7 \ No newline at end of file