Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Merge pull request #377 from jbonofre/master

Browse source 
Some improvements for Unix on Mage Server and Client
This commit is contained in:
LevelX2 2014-02-02 16:03:25 -08:00
commit efb04f2b9a
10 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/release/startClient.bat
View file

@ -9,4 +9,4 @@ set JAVA_HOME="C:\Program Files\Java\jre7\"
set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
set PATH=%JAVA_HOME%/bin;%PATH%
:NOJAVADIR
start javaw -jar .\lib\mage-client-${project.version}.jar -Xms256M -Xmx1024M -XX:MaxPermSize=384M -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled
start javaw -Xms1024m -Xmx1024m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar .\lib\mage-client-${project.version}.jar

2
Mage.Client/release/startClient.command
View file

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

2
Mage.Client/release/startClient.sh
View file

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

2
Mage.Client/release/startClientWin7.bat
View file

@ -9,4 +9,4 @@ set JAVA_HOME="C:\Program Files (x86)\Java\jre7\"
set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
set PATH=%JAVA_HOME%/bin;%PATH%
:NOJAVADIR
start javaw -jar .\lib\mage-client-${project.version}.jar -Xms256M -Xmx1024M -XX:MaxPermSize=384M -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled
start javaw -Xms1024m -Xmx1024m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar .\lib\mage-client-${project.version}.jar

12
Mage.Client/src/main/assembly/distribution.xml
View file

@ -13,6 +13,7 @@
<includes>
<include>org.mage:mage-client</include>
</includes>
<fileMode>0644</fileMode>
</dependencySet>
<dependencySet>
<outputDirectory>/lib/</outputDirectory>
@ -20,12 +21,14 @@
<exclude>org.mage:mage-client</exclude>
<exclude>org.mage:mage-counter-plugin</exclude>
</excludes>
<fileMode>0644</fileMode>
</dependencySet>
<dependencySet>
<outputDirectory>/plugins</outputDirectory>
<includes>
<include>org.mage:mage-counter-plugin</include>
</includes>
<fileMode>0644</fileMode>
</dependencySet>
</dependencySets>
<fileSets>
@ -45,9 +48,17 @@
<includes>
<include>*.bat</include>
<include>*.command</include>
</includes>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
<filtered>true</filtered>
<directory>release/</directory>
<includes>
<include>*.sh</include>
</includes>
<outputDirectory>/</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
<filtered>false</filtered>
@ -64,6 +75,7 @@
<include>*.wav</include>
</includes>
<outputDirectory>sounds/</outputDirectory>
<fileMode>0644</fileMode>
</fileSet>
</fileSets>

2
Mage.Server/release/startServer.bat
View file

@ -9,5 +9,5 @@ set JAVA_HOME="C:\Program Files\Java\jre7\"
set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
set PATH=%JAVA_HOME%/bin;%PATH%
:NOJAVADIR
java -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar -Xms256M -Xmx512M -XX:MaxPermSize=384m
java -Xms256m -Xmx512m -XX:MaxPermSize=384m -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar
pause

2
Mage.Server/release/startServer.command
View file

@ -2,4 +2,4 @@
cd "`dirname "$0"`"
java -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar -Xms256M -Xmx512M -XX:MaxPermSize=256m
java -Xms256M -Xmx512M -XX:MaxPermSize=256m -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar

2
Mage.Server/release/startServer.sh
View file

@ -1,3 +1,3 @@
#!/bin/sh
java -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar -Xms256M -Xmx512M -XX:MaxPermSize=256m
java -Xms256M -Xmx512M -XX:MaxPermSize=256m -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar

2
Mage.Server/release/startServerWin7.bat
View file

@ -9,4 +9,4 @@ set JAVA_HOME="C:\Program Files (x86)\Java\jre7\"
set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
set PATH=%JAVA_HOME%/bin;%PATH%
:NOJAVADIR
java -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar -Xms256M -Xmx512M -XX:MaxPermSize=384m
java -Xms256M -Xmx512M -XX:MaxPermSize=384m -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar

12
Mage.Server/src/main/assembly/distribution.xml
View file

@ -53,6 +53,18 @@
<filtered>true</filtered>
<directory>release/</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>*.sh</exclude>
</excludes>
</fileSet>
<fileSet>
<filtered>true</filtered>
<directory>release/</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>*.sh</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
<filtered>false</filtered>