Claenup stuff, add metrics, and rename references from Waterfall to Travertine

This commit is contained in:
Techcable 2016-06-06 13:50:15 -06:00 committed by Marc Baloup
parent 45fce075ad
commit 9fdca54f66
4 changed files with 8 additions and 17 deletions

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "Waterfall"]
path = Waterfall
url = https://github.com/WaterfallMC/Waterfall.git

View File

@ -60,8 +60,14 @@ if [[ "$gpgsign" == "true" ]]; then
git config --global commit.gpgsign false git config --global commit.gpgsign false
fi fi
# Apply waterfall patches
basedir=$basedir/Waterfall
pushd Waterfall
applyPatch BungeeCord Waterfall-Proxy HEAD
popd
basedir=$(dirname $basedir)
# Apply patches # Apply travertine patches
applyPatch Waterfall/Waterfall-Proxy Travertine-Proxy HEAD applyPatch Waterfall/Waterfall-Proxy Travertine-Proxy HEAD
enableCommitSigningIfNeeded enableCommitSigningIfNeeded

View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env bash
./prepareBuild.sh && pushd Travertine-Proxy && mvn clean package && popd ./applyPatches.sh && pushd Travertine-Proxy && mvn clean package && popd

View File

@ -1,12 +0,0 @@
#!/usr/bin/env bash
git submodule update --recursive --init
pushd Waterfall
./applyPatches.sh
popd
./applyPatches.sh