a_star: don't crash on deserialization errors and limit static types

[nit.git] / contrib / benitlux / Makefile

diff --git a/contrib/benitlux/Makefile b/contrib/benitlux/Makefile
index 2142041..af250c1 100644 (file)
--- a/contrib/benitlux/Makefile
+++ b/contrib/benitlux/Makefile
@@ -3,23 +3,23 @@ SERVER ?= localhost:8080
 all: server bin/report bin/benitlux
 
 server: bin/benitlux_daily bin/benitlux_web
-bin/benitlux_daily: $(shell ../../bin/nitls -M src/server/benitlux_daily.nit)
+bin/benitlux_daily: $(shell nitls -M src/server/benitlux_daily.nit)
        mkdir -p bin/
-       ../../bin/nitc -o $@ src/server/benitlux_daily.nit
+       nitc -o $@ src/server/benitlux_daily.nit
 
-bin/benitlux_web: $(shell ../../bin/nitls -M src/server/server.nit) src/server/benitlux_restful.nit
+bin/benitlux_web: $(shell nitls -M src/server/server.nit) src/server/benitlux_restful.nit
        mkdir -p bin/
-       ../../bin/nitc -o $@ src/server/server.nit -D iface=$(SERVER)
+       nitc -o $@ src/server/server.nit -D iface=$(SERVER)
 
 pre-build: src/server/benitlux_restful.nit
-src/server/benitlux_restful.nit: $(shell ../../bin/nitls -M src/server/benitlux_controller.nit)
-       ../../bin/nitrestful -o $@ src/server/benitlux_controller.nit
+src/server/benitlux_restful.nit: $(shell nitls -M src/server/benitlux_controller.nit)
+       nitrestful -o $@ src/server/benitlux_controller.nit
 
 # ---
 # Report
 
-bin/report: $(shell ../../bin/nitls -M src/report.nit)
-       ../../bin/nitc -o bin/report src/report.nit
+bin/report: $(shell nitls -M src/report.nit)
+       nitc -o bin/report src/report.nit
 
 report: bin/report
        bin/report
@@ -27,9 +27,9 @@ report: bin/report
 # ---
 # GTK+ client
 
-bin/benitlux: $(shell ../../bin/nitls -M src/client/client.nit)
+bin/benitlux: $(shell nitls -M src/client/client.nit)
        mkdir -p bin/
-       ../../bin/nitc -o bin/benitlux src/client/client.nit -m linux -D benitlux_rest_server_uri=http://$(SERVER)/
+       nitc -o bin/benitlux src/client/client.nit -m linux -D benitlux_rest_server_uri=http://$(SERVER)/
 
 # ---
 # Android
@@ -46,40 +46,42 @@ android-res: android/res/drawable-hdpi/icon.png android/res/drawable-hdpi/notif.
 
 # Dev / debug app
 android: bin/benitlux.apk
-bin/benitlux.apk: $(shell ../../bin/nitls -M src/client/android.nit) android-res
+bin/benitlux.apk: $(shell nitls -M src/client/android.nit) android-res
        mkdir -p bin/ res/
-       ../../bin/nitc -o $@ src/client/android.nit -m src/client/features/debug.nit \
+       nitc -o $@ src/client/android.nit -m src/client/features/debug.nit \
                -D benitlux_rest_server_uri=http://$(SERVER)/
 
 # Pure portable prototype, for comparison
-bin/proto.apk: $(shell ../../bin/nitls -M src/client/android_proto.nit) android-res
+bin/proto.apk: $(shell nitls -M src/client/android_proto.nit) android-res
        mkdir -p bin/ res/
-       ../../bin/nitc -o $@ src/client/android_proto.nit \
+       nitc -o $@ src/client/android_proto.nit \
                -D benitlux_rest_server_uri=http://$(SERVER)/
 
 # Release version
-android-release: $(shell ../../bin/nitls -M src/client/android.nit) android-res
+android-release: $(shell nitls -M src/client/android.nit) android-res
        mkdir -p bin/ res/
-       ../../bin/nitc -o bin/benitlux.apk src/client/android.nit \
+       nitc -o bin/benitlux.apk src/client/android.nit \
                -D benitlux_rest_server_uri=http://xymus.net/benitlux/ --release
 
 # ---
 # iOS
 
 ios: bin/benitlux.app
-bin/benitlux.app: $(shell ../../bin/nitls -M src/client/ios.nit) ios/AppIcon.appiconset/Contents.json
+bin/benitlux.app: $(shell nitls -M src/client/ios.nit) ios/AppIcon.appiconset/Contents.json
        mkdir -p bin/
        rm -rf bin/benitlux.app/
-       ../../bin/nitc -o bin/benitlux.app src/client/ios.nit -D benitlux_rest_server_uri=http://$(SERVER)/
+       nitc -o bin/benitlux.app src/client/ios.nit -D benitlux_rest_server_uri=http://$(SERVER)/
 
-bin/proto.app: $(shell ../../bin/nitls -M src/client/ios_proto.nit) ios/AppIcon.appiconset/Contents.json
+bin/proto.app: $(shell nitls -M src/client/ios_proto.nit) ios/AppIcon.appiconset/Contents.json
        mkdir -p bin/ res/
-       ../../bin/nitc -o $@ src/client/ios_proto.nit \
+       nitc -o $@ src/client/ios_proto.nit \
                -D benitlux_rest_server_uri=http://$(SERVER)/
 
-ios-release: $(shell ../../bin/nitls -M src/client/ios.nit) ios/AppIcon.appiconset/Contents.json
+ios-release: $(shell nitls -M src/client/ios.nit) ios/AppIcon.appiconset/Contents.json
        mkdir -p bin/
-       ../../bin/nitc -o bin/benitlux.app src/client/ios.nit -D benitlux_rest_server_uri=http://$(SERVER)/
+       nitc -o bin/benitlux.app src/client/ios.nit \
+               -D benitlux_rest_server_uri=http://xymus.net/benitlux/ --release \
+               --compile-dir nit_compile
 
 ios/AppIcon.appiconset/Contents.json: art/icon.svg
        mkdir -p ios