diff --git a/boundle.sh b/boundle.sh deleted file mode 100644 index f68ea50..0000000 --- a/boundle.sh +++ /dev/null @@ -1,13 +0,0 @@ -cd third_party/wjtx/trunk/ -mvn clean package install -Dmaven.test.skip=true -cd game-standalone/target -unzip game-standlone.zip - -cd ../../../../../ -pwd - -tag_name=`git status |grep '# On branch '|sed 's/# On branch //g'` -dir_name=`basename $PWD` -package_name=${dir_name}.tar.gz - -tar --exclude=*.git -chzf target/${package_name} bin common.sh manage.py reload.sh restart.sh start_instance.sh config lib conf spring diff --git a/boundle.sh b/boundle.sh new file mode 120000 index 0000000..46422df --- /dev/null +++ b/boundle.sh @@ -0,0 +1 @@ +third_party/tools/scripts/publish_java/boundle.sh \ No newline at end of file diff --git a/common.sh b/common.sh index 9219828..d8b2b9a 100644 --- a/common.sh +++ b/common.sh @@ -1,6 +1,15 @@ GAME_ID=1009 -JAR_NAME=lib/game-standalone-1.0.jar -JAVA_OPTS="-server -Xms512m -Xmx512m -Xmn128m -XX:SurvivorRatio=4 -XX:InitiatingHeapOccupancyPercent=75" +JAR_NAME="lib/game-standalone-1.0.jar" +if [ ! -f "bin/is_test_env" ]; then + JAVA_OPTS="-server -Xms512m -Xmx512m -Xmn128m -XX:SurvivorRatio=4 -XX:InitiatingHeapOccupancyPercent=75" +else + JAVA_OPTS="-server -Xms256m -Xmx256m -Xmn128m -XX:SurvivorRatio=4 -XX:InitiatingHeapOccupancyPercent=75" +fi JAVA_OPTS="$JAVA_OPTS -XX:+UseParNewGC -XX:+UseConcMarkSweepGC" JAVA_OPTS="$JAVA_OPTS -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime -XX:+HeapDumpOnOutOfMemoryError -Xloggc:logs/flash_gc_$(date +"%Y%m%d%H%M").log" LOG4J2_FILE="conf/log4j2.xml" + +SOURCE_PATH="third_party/wjtx/trunk/" +PRE_COMPILE_CMD="" +COMPILE_CMD="mvn clean package install -Dmaven.test.skip=true" +POST_COMPILE_CMD="cd game-standalone/target && unzip game-standlone.zip" diff --git a/third_party/tools b/third_party/tools index 3000749..1fc4776 160000 --- a/third_party/tools +++ b/third_party/tools @@ -1 +1 @@ -Subproject commit 3000749b53c3f4e0061f03ce8460cb56e956ad01 +Subproject commit 1fc4776dec7a59c6fb150c9f83a10ba28d48a0e5