diff --git a/Dockerfile b/Dockerfile index 39649e3a..ac36eea5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,6 +20,7 @@ ADD . /code RUN echo "\nrunClient {\nargs \"--width\",\"128\",\"--height\",\"128\"\n}" >> /code/build.gradle # this .deb is specially patched to support lwjgl +# source: https://github.com/tectonicus/tectonicus/issues/60#issuecomment-154239173 RUN dpkg -i /code/scripts/xvfb_1.16.4-1_amd64.deb WORKDIR /code diff --git a/scripts/build.sh b/scripts/build.sh index 96a4ce84..a224a884 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -17,7 +17,7 @@ cat api.pro | grep -v "\-keep class baritone.api" > standalone.pro # standalone #instead of downloading these jars from my dropbox in a zip, just assume gradle's already got them for us mkdir -p tempLibraries -cat ../../scripts/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 +cat ../../scripts/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 java -jar ../../proguard6.0.3/lib/proguard.jar @api.pro diff --git a/scripts/proguard.pro b/scripts/proguard.pro index 2a85ad70..92faa823 100644 --- a/scripts/proguard.pro +++ b/scripts/proguard.pro @@ -48,10 +48,8 @@ -libraryjars 'tempLibraries/httpclient-4.3.3.jar' -libraryjars 'tempLibraries/httpcore-4.3.2.jar' -libraryjars 'tempLibraries/icu4j-core-mojang-51.2.jar' --libraryjars 'tempLibraries/java-objc-bridge-1.0.0-natives-osx.jar' -libraryjars 'tempLibraries/java-objc-bridge-1.0.0.jar' -libraryjars 'tempLibraries/jinput-2.0.5.jar' --libraryjars 'tempLibraries/jinput-platform-2.0.5-natives-osx.jar' -libraryjars 'tempLibraries/jna-4.4.0.jar' -libraryjars 'tempLibraries/jopt-simple-5.0.3.jar' -libraryjars 'tempLibraries/jsr305-3.0.1-sources.jar' @@ -62,7 +60,6 @@ -libraryjars 'tempLibraries/log4j-api-2.8.1.jar' -libraryjars 'tempLibraries/log4j-core-2.8.1.jar' -libraryjars 'tempLibraries/lwjgl-2.9.2-nightly-20140822.jar' --libraryjars 'tempLibraries/lwjgl-platform-2.9.2-nightly-20140822-natives-osx.jar' -libraryjars 'tempLibraries/lwjgl_util-2.9.2-nightly-20140822.jar' -libraryjars 'tempLibraries/netty-all-4.1.9.Final.jar' -libraryjars 'tempLibraries/oshi-core-1.1.jar'