OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 23:38:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rebuild patches after we continue from a paper edit.

Browse source
This commit is contained in:
DemonWav 2016-04-02 18:34:27 -05:00
parent 526469fd23
commit aeea23a135
11 changed files with 44 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
paper
View file

@ -49,29 +49,37 @@ case "$1" in
cd "$basedir" cd "$basedir"
;; ;;
"e" | "edit") "e" | "edit")
if [[ "$2" = "server" ]] ; then case "$2" in
"server")
cd "$basedir/Paper-Server" cd "$basedir/Paper-Server"
export LAST_EDIT=$(pwd) export LAST_EDIT=$(pwd)
paperstash paperstash
git rebase -i upstream/upstream git rebase -i upstream/upstream
paperunstash paperunstash
elif [[ "$2" = "api" ]] ; then ;;
"api")
cd "$basedir/Paper-API" cd "$basedir/Paper-API"
export LAST_EDIT=$(pwd) export LAST_EDIT=$(pwd)
paperstash paperstash
git rebase -i upstream/upstream git rebase -i upstream/upstream
paperunstash paperunstash
elif [[ "$2" = "continue" ]] ; then ;;
"continue")
cd "$LAST_EDIT" cd "$LAST_EDIT"
git add . git add .
git rebase --continue git rebase --continue
unset LAST_EDIT unset LAST_EDIT
(
cd "$basedir"
scripts/rebuildPatches.sh "$basedir" scripts/rebuildPatches.sh "$basedir"
else )
;;
*)
echo "You must edit either the api or server." echo "You must edit either the api or server."
fi ;;
esac
;; ;;
"setup") "setup")
if [[ -f ~/.bashrc ]] ; then if [[ -f ~/.bashrc ]] ; then

2
scripts/applyPatches.sh
View file

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
PS1="$" PS1="$"
basedir="$1" basedir=$(realpath "$1")
workdir="$basedir/work" workdir="$basedir/work"
echo "Rebuilding Forked projects.... " echo "Rebuilding Forked projects.... "

2
scripts/build.sh
View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
basedir="$1" basedir=$(realpath "$1")
(git submodule update --init && ./scripts/remap.sh "$basedir" && ./scripts/decompile.sh "$basedir" && ./scripts/init.sh "$basedir" && ./scripts/applyPatches.sh "$basedir") || ( (git submodule update --init && ./scripts/remap.sh "$basedir" && ./scripts/decompile.sh "$basedir" && ./scripts/init.sh "$basedir" && ./scripts/applyPatches.sh "$basedir") || (
echo "Failed to build Paper" echo "Failed to build Paper"

2
scripts/decompile.sh
View file

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
PS1="$" PS1="$"
basedir="$1" basedir=$(realpath "$1")
workdir="$basedir/work" workdir="$basedir/work"
minecraftversion=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4) minecraftversion=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
decompiledir="$workdir/$minecraftversion" decompiledir="$workdir/$minecraftversion"

2
scripts/importmcdev.sh
View file

@ -3,7 +3,7 @@
nms="net/minecraft/server" nms="net/minecraft/server"
export MODLOG="" export MODLOG=""
PS1="$" PS1="$"
basedir="$1" basedir=$(realpath "$1")
workdir="$basedir/work" workdir="$basedir/work"
minecraftversion=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4) minecraftversion=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)

2
scripts/init.sh
View file

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
PS1="$" PS1="$"
basedir="$1" basedir=$(realpath "$1")
workdir="$basedir/work" workdir="$basedir/work"
minecraftversion=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4) minecraftversion=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
decompiledir="$workdir/$minecraftversion" decompiledir="$workdir/$minecraftversion"

2
scripts/makemcdevsrc.sh
View file

@ -2,7 +2,7 @@
PS1="$" PS1="$"
basedir="$1" basedir=$(realpath "$1")
workdir="$basedir/work" workdir="$basedir/work"
minecraftversion=$(cat "$basedir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4) minecraftversion=$(cat "$basedir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
decompiledir="$workdir/$minecraftversion" decompiledir="$workdir/$minecraftversion"

7
scripts/paperclip.sh
View file

@ -1,17 +1,18 @@
#!/usr/bin/env bash #!/usr/bin/env bash
basedir="$1" basedir=$(realpath "$1")
workdir="$basedir/work" workdir="$basedir/work"
mcver=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4) mcver=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
paperjar="../../Paper-Server/target/paper-$mcver.jar" paperjar="../../Paper-Server/target/paper-$mcver.jar"
vanillajar="../$mcver/$mcver.jar" vanillajar="../$mcver/$mcver.jar"
(
cd "$workdir/Paperclip" cd "$workdir/Paperclip"
mvn clean package "-Dmcver=$mcver" "-Dpaperjar=$paperjar" "-Dvanillajar=$vanillajar" || exit 1 mvn clean package "-Dmcver=$mcver" "-Dpaperjar=$paperjar" "-Dvanillajar=$vanillajar" || exit 1
cd .. )
cp "$workdir/Paperclip/target/paperclip-${mcver}.jar" "$basedir/paperclip.jar" cp "$workdir/Paperclip/target/paperclip-${mcver}.jar" "$basedir/paperclip.jar"
echo "" echo ""
echo "" echo ""
echo "" echo ""
echo "Build success!" echo "Build success!"
echo "Copied final jar to $basedir/paperclip.jar" echo "Copied final jar to "$(realpath "$basedir/paperclip.jar")

2
scripts/rebuildPatches.sh
View file

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
PS1="$" PS1="$"
basedir="$1" basedir=$(realpath "$1")
workdir="$basedir/work" workdir="$basedir/work"
echo "Rebuilding patch files from current fork state..." echo "Rebuilding patch files from current fork state..."
git config core.safecrlf false git config core.safecrlf false

2
scripts/remap.sh
View file

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
PS1="$" PS1="$"
basedir="$1" basedir=$(realpath "$1")
workdir="$basedir/work" workdir="$basedir/work"
minecraftversion=$(cat ${workdir}/BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4) minecraftversion=$(cat ${workdir}/BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4)
minecrafthash=$(cat ${workdir}/BuildData/info.json | grep minecraftHash | cut -d '"' -f 4) minecrafthash=$(cat ${workdir}/BuildData/info.json | grep minecraftHash | cut -d '"' -f 4)

2
scripts/upstreamMerge.sh
View file

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
PS1="$" PS1="$"
basedir="$1" basedir=$(realpath "$1")
workdir="$basedir/work" workdir="$basedir/work"
function update { function update {