From e6446fbf681199824a29293a7a8d6fd161cb72b2 Mon Sep 17 00:00:00 2001 From: songhao Date: Sat, 15 Feb 2020 13:55:21 +0800 Subject: [PATCH 1/3] 1 --- common.sh | 6 +++--- third_party/tools | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common.sh b/common.sh index a2f5ec3..ee5371b 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" -PRE_COMPILE_CMD="" -COMPILE_CMD="mvn clean package install -Dmaven.test.skip=true" +SOURCE_PATH="third_party/wjtx/trunk/" +PRE_COMPILE_CMD="mvn clean package install -Dmaven.test.skip=true" +COMPILE_CMD="cd ../legend-admin/guns/trunk && mvn clean package install -Dmaven.test.skip=true" POST_COMPILE_CMD="" EXT_PKG_FILES="upload WEB-INF static" diff --git a/third_party/tools b/third_party/tools index 1cc9d69..7a56029 160000 --- a/third_party/tools +++ b/third_party/tools @@ -1 +1 @@ -Subproject commit 1cc9d69831060f204798ab993c21ee9ed9b63d56 +Subproject commit 7a560291e310bb85a4aa72d33017219cc5e7356c From 730b2db9785e231a1a3861c3dbdd3135ff8dadef Mon Sep 17 00:00:00 2001 From: songhao Date: Sat, 15 Feb 2020 13:55:45 +0800 Subject: [PATCH 2/3] 1 --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index afcaf69..096c313 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ config -lib2 \ No newline at end of file +lib2 +target \ No newline at end of file From d32fe2387b9adb863ea8591a893645daf3350576 Mon Sep 17 00:00:00 2001 From: songhao Date: Sat, 15 Feb 2020 17:20:22 +0800 Subject: [PATCH 3/3] 1 --- .gitignore | 5 ++++- custom_init | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 custom_init diff --git a/.gitignore b/.gitignore index 096c313..1fd17a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ config lib2 -target \ No newline at end of file +target +lib_old +logs +custom_init.sh \ No newline at end of file diff --git a/custom_init b/custom_init new file mode 100644 index 0000000..81dce6e --- /dev/null +++ b/custom_init @@ -0,0 +1 @@ +IS_DEV_ENV=1