fetch jars from gradle instead of dropbox, fixes #189

This commit is contained in:
Leijurv 2018-09-26 10:06:52 -07:00
parent 5ec3971380
commit fb45d73406
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
3 changed files with 10 additions and 5 deletions

View File

@ -6,8 +6,6 @@ services:
- docker - docker
install: install:
- sudo apt-get update
- sudo apt-get install jshon
- docker build -t cabaletta/baritone . - docker build -t cabaletta/baritone .
script: script:

View File

@ -19,6 +19,7 @@ ADD . /code
RUN echo "\nrunClient {\nargs \"--width\",\"128\",\"--height\",\"128\"\n}" >> /code/build.gradle RUN echo "\nrunClient {\nargs \"--width\",\"128\",\"--height\",\"128\"\n}" >> /code/build.gradle
# this .deb is specially patched to support lwjgl
RUN dpkg -i /code/scripts/xvfb_1.16.4-1_amd64.deb RUN dpkg -i /code/scripts/xvfb_1.16.4-1_amd64.deb
WORKDIR /code WORKDIR /code

View File

@ -10,9 +10,15 @@ cat ../../scripts/proguard.pro | grep -v "this is the rt jar" | grep -v "\-injar
echo "-libraryjars '$(java -verbose 2>/dev/null | sed -ne '1 s/\[Opened \(.*\)\]/\1/p')'" >> api.pro # insert correct rt.jar location echo "-libraryjars '$(java -verbose 2>/dev/null | sed -ne '1 s/\[Opened \(.*\)\]/\1/p')'" >> api.pro # insert correct rt.jar location
tail api.pro # debug, print out what the previous two commands generated tail api.pro # debug, print out what the previous two commands generated
cat api.pro | grep -v "\-keep class baritone.api" > standalone.pro # standalone doesn't keep baritone api cat api.pro | grep -v "\-keep class baritone.api" > standalone.pro # standalone doesn't keep baritone api
wget -nv https://www.dropbox.com/s/zmc2l3jnwdvzvak/tempLibraries.zip?dl=1 # i'm sorry
mv tempLibraries.zip?dl=1 tempLibraries.zip #wget -nv https://www.dropbox.com/s/zmc2l3jnwdvzvak/tempLibraries.zip?dl=1 # i'm sorry
unzip tempLibraries.zip #mv tempLibraries.zip?dl=1 tempLibraries.zip
#unzip tempLibraries.zip
#instead of downloading these jars from my dropbox in a zip, just assume gradle's already got them for us
mkdir tempLibraries
cat proguard.pro | grep tempLibraries | grep .jar | cut -d "/" -f 2- | cut -d "'" -f -1 | xargs -n1 -I{} bash -c "find ~/.gradle -name {}" | tee /dev/stderr | xargs -n1 -I{} cp {} tempLibraries
mkdir ../../dist mkdir ../../dist
java -jar ../../proguard6.0.3/lib/proguard.jar @api.pro java -jar ../../proguard6.0.3/lib/proguard.jar @api.pro
mv Obfuscated/baritone-$VERSION.jar ../../dist/baritone-api-$VERSION.jar mv Obfuscated/baritone-$VERSION.jar ../../dist/baritone-api-$VERSION.jar