Поправлены объявления типов наперёд

[dsw-obn.git] / obn-compile.sh

diff --git a/obn-compile.sh b/obn-compile.sh
index c02d17844da1710aead79959c210e33962572e5c..0ab4b702958017eca1500c06056856ce6ec34d16 100755 (executable)
--- a/obn-compile.sh
+++ b/obn-compile.sh
@@ -5,12 +5,10 @@ set -e
 rm -rf classes tmp
 mkdir -p classes tmp
 
-./a.out -d tmp $1
+./a.out -d tmp -I rtl/java -I rtl $*
 
 jasmin -d classes tmp/*.j
 
-javac -d classes rtl/*.java
+javac -d classes rtl/java/*.java
 
-proguard -injars classes \
-       -libraryjars /usr/lib/jvm/java-8-openjdk/jre/lib/rt.jar \
-       -dontshrink -dontobfuscate -keep class $1 -keep class Launcher
+proguard -injars classes -libraryjars /usr/lib/jvm/java-8-openjdk/jre/lib/rt.jar @proguard.conf