core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add upstreamMerge script to paper tool

This commit is contained in:
Zach Brown 2016-08-19 16:00:59 -05:00
parent d9afd08cee
commit c1932e0290
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
paper
View File

@ -74,6 +74,9 @@ case "$1" in
"td" | "testdir") "td" | "testdir")
cd "${PAPER_TEST_DIR:-$basedir/work/test-server}" cd "${PAPER_TEST_DIR:-$basedir/work/test-server}"
;; ;;
"u" | "up" | "upstream")
scripts/upstreamMerge.sh "$basedir" "$2"
;;
"r" | "root") "r" | "root")
cd "$basedir" cd "$basedir"
;; ;;
@ -149,6 +152,7 @@ case "$1" in
echo " * p, patch | Apply all patches to the project without building it. Can be run from anywhere." echo " * p, patch | Apply all patches to the project without building it. Can be run from anywhere."
echo " * j, jar | Apply all patches and build the project, paperclip.jar will be output. Can be run from anywhere." echo " * j, jar | Apply all patches and build the project, paperclip.jar will be output. Can be run from anywhere."
echo " * m, mcdev | Setup decompiled sources for non-modified NMS files to be imported into an IDE. Can be run from anywhere." echo " * m, mcdev | Setup decompiled sources for non-modified NMS files to be imported into an IDE. Can be run from anywhere."
echo " * u, up, upstream | Updates the submodules used by Paper to their latest upstream versions."
echo " * t, testserver | Run the test server with the set of plugins Paper uses as a basis for server tests." echo " * t, testserver | Run the test server with the set of plugins Paper uses as a basis for server tests."
echo "" echo ""
echo " These commands require the setup command before use:" echo " These commands require the setup command before use:"

5
scripts/upstreamMerge.sh
View File

@ -16,4 +16,9 @@ function update {
update Bukkit update Bukkit
update CraftBukkit update CraftBukkit
update Spigot update Spigot
if [[ "$2" = "all" ]] ; then
update BuildData
update Paperclip
fi
) )