Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

update maven flags

Browse Source
This commit is contained in:
ㄗㄠˋ ㄑㄧˊ
2020-05-02 10:59:20 +08:00
parent 6257ad1520
commit 2a2e9149ec
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
akarin
View File

@@ -6,7 +6,7 @@
# Multicore building # # Multicore building #
# By JosephWorks # # By JosephWorks #
# -------------------------------------------------------------------------# # -------------------------------------------------------------------------#
# To use multicore building, add "-T ${BUILD_CORES}" after all mvn commands# # To use multicore building, use "$mvncmd" instead of "maven" #
# 20-50% speed improvement is quite common. # # 20-50% speed improvement is quite common. #
############################################################################ ############################################################################
@@ -48,18 +48,18 @@ case "$1" in
set -e set -e
setupUpstreamAndPatch $2 || exit 1 setupUpstreamAndPatch $2 || exit 1
basedir basedir
mvn -T ${BUILD_CORES} -N install || exit 1 $mvncmd -N install || exit 1
cd ${FORK_NAME}-API cd ${FORK_NAME}-API
mvn -T ${BUILD_CORES} -e clean install && cd ../${FORK_NAME}-Server && mvn -T ${BUILD_CORES} -e clean install || exit 1 $mvncmd -e clean install && cd ../${FORK_NAME}-Server && $mvncmd -e clean install || exit 1
) || failed=1 ) || failed=1
;; ;;
"j" | "launcher" | "jar" | "paperclip") "j" | "launcher" | "jar" | "paperclip")
( (
setupUpstreamAndPatch $2 || exit 1 setupUpstreamAndPatch $2 || exit 1
basedir basedir
mvn -T ${BUILD_CORES} -N install $mvncmd -N install
cd ${FORK_NAME}-API cd ${FORK_NAME}-API
mvn -T ${BUILD_CORES} -e clean install && cd ../${FORK_NAME}-Server && mvn -T ${BUILD_CORES} -e clean install $mvncmd -e clean install && cd ../${FORK_NAME}-Server && $mvncmd -e clean install
basedir basedir
$scriptdir/installLauncher.sh "$basedir" $scriptdir/installLauncher.sh "$basedir"
) || failed=1 ) || failed=1
@@ -67,9 +67,9 @@ case "$1" in
"d" | "de" | "deploy") "d" | "de" | "deploy")
( (
basedir basedir
mvn -T ${BUILD_CORES} -N install $mvncmd -N install
cd ${FORK_NAME}-API cd ${FORK_NAME}-API
mvn -T ${BUILD_CORES} clean deploy && cd ../${FORK_NAME}-Server && mvn -T ${BUILD_CORES} clean install $mvncmd clean deploy && cd ../${FORK_NAME}-Server && $mvncmd clean install
) )
;; ;;
"u" | "up" | "upstream" | "update") "u" | "up" | "upstream" | "update")

2
scripts/functions.sh
View File

@@ -9,7 +9,7 @@ MCDEV_REPO=""
# Added Multithreading to builds # Added Multithreading to builds
# By JosephWorks # By JosephWorks
BUILD_CORES="$(nproc --all)" mvncmd="mvn -T 1.5C"
gitcmd="git -c commit.gpgsign=false -c core.quotepath=false -c core.safecrlf=false -c i18n.commit.encoding=UTF-8 -c i18n.logoutputencoding=UTF-8" gitcmd="git -c commit.gpgsign=false -c core.quotepath=false -c core.safecrlf=false -c i18n.commit.encoding=UTF-8 -c i18n.logoutputencoding=UTF-8"

2
scripts/updateUpstream.sh
View File

@@ -48,7 +48,7 @@ paperdir
./paper patch ./paper patch
#cd "Paper-Server" #cd "Paper-Server"
#mcVer=$(mvn -T ${BUILD_CORES} -o org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=minecraft_version | sed -n -e '/^\[.*\]/ !{ /^[0-9]/ { p; q } }') #mcVer=$($mvncmd -o org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=minecraft_version | sed -n -e '/^\[.*\]/ !{ /^[0-9]/ { p; q } }')
#echo " $(bashcolor 1 32)(1/$subtasks)$(bashcolorend) - Import necessary sources.." #echo " $(bashcolor 1 32)(1/$subtasks)$(bashcolorend) - Import necessary sources.."
#basedir #basedir