diff --git a/.gitignore b/.gitignore index e69de29..9252c3f 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,3 @@ +target +res +config \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index fcb78ac..98c7a39 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "third_party/tools"] path = third_party/tools url = git@git.kingsome.cn:server_common/tools.git +[submodule "third_party/wjtx"] + path = third_party/wjtx + url = git@git.kingsome.cn:/server/wjtx.git diff --git a/common.sh b/common.sh index a2f5ec3..31baedb 100644 --- a/common.sh +++ b/common.sh @@ -12,8 +12,8 @@ JAVA_OPTS="$JAVA_OPTS -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApp JAVA_OPTS="$JAVA_OPTS -Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector" JAVA_OPTS="$JAVA_OPTS -Dlog4j.configurationFile=${LOG4J2_FILE}" -SOURCE_PATH="third_party/wjtx/legend-admin/guns/trunk" +SOURCE_PATH="third_party/wjtx/game-web/trunk" PRE_COMPILE_CMD="" COMPILE_CMD="mvn clean package install -Dmaven.test.skip=true" POST_COMPILE_CMD="" -EXT_PKG_FILES="upload WEB-INF static" +EXT_PKG_FILES="" diff --git a/third_party/wjtx b/third_party/wjtx new file mode 160000 index 0000000..25278f8 --- /dev/null +++ b/third_party/wjtx @@ -0,0 +1 @@ +Subproject commit 25278f848037b87a648e1ec2f3fe2718af87d0d5