contrib & examples: update Android apps

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/contrib/asteronits/Makefile b/contrib/asteronits/Makefile
index 08b689c..f110c83 100644 (file)
--- a/contrib/asteronits/Makefile
+++ b/contrib/asteronits/Makefile
@@ -25,12 +25,12 @@ check: bin/asteronits
 # Android
 
 android: bin/asteronits.apk
-bin/asteronits.apk: $(shell ${NITLS} -M src/asteronits.nit android) ${NITC} res/drawable-hdpi/icon.png pre-build
+bin/asteronits.apk: $(shell ${NITLS} -M src/asteronits.nit android) ${NITC} android/res/ pre-build
        ${NITC} src/android.nit -m android -o $@
 
-android-release: $(shell ${NITLS} -M src/asteronits.nit android) ${NITC} res/drawable-hdpi/icon.png pre-build
+android-release: $(shell ${NITLS} -M src/asteronits.nit android) ${NITC} android/res/ pre-build
        ${NITC} src/android.nit -m android -o bin/asteronits.apk --release
 
-res/drawable-hdpi/icon.png: art/icon.svg
+android/res/: art/icon.svg
        make -C ../inkscape_tools/
-       ../inkscape_tools/bin/svg_to_icons --out res --android art/icon.svg
+       ../inkscape_tools/bin/svg_to_icons --out android/res --android art/icon.svg

diff --git a/contrib/asteronits/res/.gitignore b/contrib/asteronits/android/.gitignore
similarity index 100%
rename from contrib/asteronits/res/.gitignore
rename to contrib/asteronits/android/.gitignore

diff --git a/contrib/crazy_moles/.gitignore b/contrib/crazy_moles/.gitignore
index f4dac05..daa854d 100644 (file)
--- a/contrib/crazy_moles/.gitignore
+++ b/contrib/crazy_moles/.gitignore
@@ -1,3 +1,3 @@
-icon.png
 src/drawing.nit
 assets/images/
+android/

diff --git a/contrib/crazy_moles/Makefile b/contrib/crazy_moles/Makefile
index 232ec08..3495918 100644 (file)
--- a/contrib/crazy_moles/Makefile
+++ b/contrib/crazy_moles/Makefile
@@ -11,20 +11,20 @@ bin/moles: $(shell ../../bin/nitls -M src/moles_linux.nit) assets/images/drawing
        ../../bin/nitc -o bin/moles src/moles_linux.nit
 
 android: bin/moles.apk
-bin/moles.apk: android-icons $(shell ../../bin/nitls -M src/moles_android.nit) assets/images/drawing.png
+bin/moles.apk: android/res/ $(shell ../../bin/nitls -M src/moles_android.nit) assets/images/drawing.png
        mkdir -p bin
        ../../bin/nitc -o bin/moles.apk src/moles_android.nit
 
-android-release: android-icons $(shell ../../bin/nitls -M src/moles_android.nit) assets/images/drawing.png
+android-release: android/res/ $(shell ../../bin/nitls -M src/moles_android.nit) assets/images/drawing.png
        mkdir -p bin
        ../../bin/nitc -o bin/moles.apk src/moles_android.nit --release
 
 $(SVG2ICONS):
        $(MAKE) -C ../inkscape_tools
 
-android-icons: $(SVG2ICONS) art/icon.svg
-       mkdir -p res
-       $(SVG2ICONS) art/icon.svg --android --out res/
+android/res/: $(SVG2ICONS) art/icon.svg
+       mkdir -p android/res
+       $(SVG2ICONS) art/icon.svg --android --out android/res/
 
 android-install: bin/moles.apk
        adb install -rf bin/moles.apk
@@ -37,4 +37,4 @@ check-android: bin/moles.apk
        ../../misc/jenkins/check_android.sh bin/moles.apk
 
 clean:
-       rm -rf bin res
+       rm -rf bin android

diff --git a/contrib/friendz/.gitignore b/contrib/friendz/.gitignore
index 700b511..1e1503b 100644 (file)
--- a/contrib/friendz/.gitignore
+++ b/contrib/friendz/.gitignore
@@ -1 +1 @@
-res/
+android/

diff --git a/contrib/friendz/Makefile b/contrib/friendz/Makefile
index 0cedb4c..1654a48 100644 (file)
--- a/contrib/friendz/Makefile
+++ b/contrib/friendz/Makefile
@@ -4,21 +4,21 @@ linux:
        mkdir -p bin
        ../../bin/nitc -o bin/friendz src/friendz_linux.nit
 
-android: res/drawable-hdpi/icon.png
+android: android/res/drawable-hdpi/icon.png
        mkdir -p bin
        ../../bin/nitc -o bin/friendz.apk src/friendz_android.nit
 
-android-release: res/drawable-hdpi/icon.png
+android-release: android/res/drawable-hdpi/icon.png
        mkdir -p bin
        ../../bin/nitc -o bin/friendz.apk src/friendz_android.nit --release
 
-res/drawable-hdpi/icon.png: art/icon.svg
-       mkdir -p res
-       ../inkscape_tools/bin/svg_to_icons art/icon.svg --android --out res/
+android/res/drawable-hdpi/icon.png: art/icon.svg
+       mkdir -p android/res
+       ../inkscape_tools/bin/svg_to_icons art/icon.svg --android --out android/res/
 
 doc:
        mkdir -p doc
        ../../bin/nitdoc -d doc/ src/friendz.nit src/friendz_linux.nit
 
 clean:
-       rm -rf bin/ doc/ res/
+       rm -rf bin/ doc/ android/

diff --git a/contrib/memory/.gitignore b/contrib/memory/.gitignore
index c4781eb..248a1b2 100644 (file)
--- a/contrib/memory/.gitignore
+++ b/contrib/memory/.gitignore
@@ -1,3 +1,3 @@
 assets/images/
-res/
+android/
 src/drawing.nit

diff --git a/contrib/memory/Makefile b/contrib/memory/Makefile
index a5a8c6d..c8f6f13 100644 (file)
--- a/contrib/memory/Makefile
+++ b/contrib/memory/Makefile
@@ -24,15 +24,15 @@ assets/images/drawing.png: art/drawing.svg
        mkdir -p assets/images/
        ../inkscape_tools/bin/svg_to_png_and_nit art/drawing.svg -a assets/ -s src/ -x 4
 
-res/drawable-ldpi/icon.png: art/icon.svg
-       mkdir -p res/
-       ../inkscape_tools/bin/svg_to_icons art/icon.svg --android --out res/
+android/res/: art/icon.svg
+       mkdir -p android/res/
+       ../inkscape_tools/bin/svg_to_icons art/icon.svg --android --out android/res/
 
 android: bin/memory.apk
-bin/memory.apk: assets/images/drawing.png src/*.nit res/drawable-ldpi/icon.png
+bin/memory.apk: assets/images/drawing.png src/*.nit android/res/
        mkdir -p bin
        ../../bin/nitc -o bin/memory.apk src/memory.nit -m ../../lib/mnit/android/android.nit -m ../../lib/android/landscape.nit
 
-android-release: assets/images/drawing.png src/*.nit res/drawable-ldpi/icon.png
+android-release: assets/images/drawing.png src/*.nit android/res/
        mkdir -p bin
        ../../bin/nitc -o bin/memory.apk src/memory.nit -m ../../lib/mnit/android/android.nit -m ../../lib/android/landscape.nit  --release

diff --git a/contrib/mnit_test/res/drawable-hdpi/icon.png b/contrib/mnit_test/android/res/drawable-hdpi/icon.png
similarity index 100%
rename from contrib/mnit_test/res/drawable-hdpi/icon.png
rename to contrib/mnit_test/android/res/drawable-hdpi/icon.png

diff --git a/contrib/mnit_test/res/drawable-ldpi/icon.png b/contrib/mnit_test/android/res/drawable-ldpi/icon.png
similarity index 100%
rename from contrib/mnit_test/res/drawable-ldpi/icon.png
rename to contrib/mnit_test/android/res/drawable-ldpi/icon.png

diff --git a/contrib/mnit_test/res/drawable-mdpi/icon.png b/contrib/mnit_test/android/res/drawable-mdpi/icon.png
similarity index 100%
rename from contrib/mnit_test/res/drawable-mdpi/icon.png
rename to contrib/mnit_test/android/res/drawable-mdpi/icon.png

diff --git a/contrib/mnit_test/res/drawable-xhdpi/icon.png b/contrib/mnit_test/android/res/drawable-xhdpi/icon.png
similarity index 100%
rename from contrib/mnit_test/res/drawable-xhdpi/icon.png
rename to contrib/mnit_test/android/res/drawable-xhdpi/icon.png

diff --git a/contrib/mnit_test/res/drawable-xxhdpi/icon.png b/contrib/mnit_test/android/res/drawable-xxhdpi/icon.png
similarity index 100%
rename from contrib/mnit_test/res/drawable-xxhdpi/icon.png
rename to contrib/mnit_test/android/res/drawable-xxhdpi/icon.png

diff --git a/contrib/mnit_test/res/drawable-xxxhdpi/icon.png b/contrib/mnit_test/android/res/drawable-xxxhdpi/icon.png
similarity index 100%
rename from contrib/mnit_test/res/drawable-xxxhdpi/icon.png
rename to contrib/mnit_test/android/res/drawable-xxxhdpi/icon.png

diff --git a/contrib/mnit_test/res/drawable/fighter.png b/contrib/mnit_test/android/res/drawable/fighter.png
similarity index 100%
rename from contrib/mnit_test/res/drawable/fighter.png
rename to contrib/mnit_test/android/res/drawable/fighter.png

diff --git a/contrib/mnit_test/res/raw/testsound.ogg b/contrib/mnit_test/android/res/raw/testsound.ogg
similarity index 100%
rename from contrib/mnit_test/res/raw/testsound.ogg
rename to contrib/mnit_test/android/res/raw/testsound.ogg

diff --git a/contrib/mnit_test/res/raw/xylofon.ogg b/contrib/mnit_test/android/res/raw/xylofon.ogg
similarity index 100%
rename from contrib/mnit_test/res/raw/xylofon.ogg
rename to contrib/mnit_test/android/res/raw/xylofon.ogg

diff --git a/contrib/mnit_test/res/values/bools.xml b/contrib/mnit_test/android/res/values/bools.xml
similarity index 100%
rename from contrib/mnit_test/res/values/bools.xml
rename to contrib/mnit_test/android/res/values/bools.xml

diff --git a/contrib/mnit_test/res/values/dimens.xml b/contrib/mnit_test/android/res/values/dimens.xml
similarity index 100%
rename from contrib/mnit_test/res/values/dimens.xml
rename to contrib/mnit_test/android/res/values/dimens.xml

diff --git a/contrib/model_viewer/.gitignore b/contrib/model_viewer/.gitignore
new file mode 100644 (file)
index 0000000..1e1503b
--- /dev/null
+++ b/contrib/model_viewer/.gitignore
@@ -0,0 +1 @@
+android/

diff --git a/contrib/model_viewer/Makefile b/contrib/model_viewer/Makefile
index 4557a44..b2dc37a 100644 (file)
--- a/contrib/model_viewer/Makefile
+++ b/contrib/model_viewer/Makefile
@@ -13,26 +13,27 @@ check: bin/model_viewer
 # Android
 
 android: bin/model_viewer.apk
-bin/model_viewer.apk: $(shell ${NITLS} -M src/model_viewer.nit android) ${NITC} res/drawable-hdpi/icon.png
+bin/model_viewer.apk: $(shell ${NITLS} -M src/model_viewer.nit android) ${NITC} android/res/
        ${NITC} src/model_viewer.nit -m android -o $@
 
-android-release: $(shell ${NITLS} -M src/model_viewer.nit android) ${NITC} res/drawable-hdpi/icon.png
+android-release: $(shell ${NITLS} -M src/model_viewer.nit android) ${NITC} android/res/
        ${NITC} src/model_viewer.nit -m android -o bin/model_viewer.apk --release
 
-res/drawable-hdpi/icon.png: art/icon.png
+android/res/: art/icon.png
        make -C ../inkscape_tools/
-       mkdir -p res/drawable-ldpi/ res/drawable-mdpi/ res/drawable-hdpi/ \
-               res/drawable-xhdpi/ res/drawable-xxhdpi/ res/drawable-xxxhdpi/
-       convert -resize 36x36   art/icon.png res/drawable-ldpi/icon.png
-       convert -resize 48x48   art/icon.png res/drawable-mdpi/icon.png
-       convert -resize 72x72   art/icon.png res/drawable-hdpi/icon.png
-       convert -resize 96x96   art/icon.png res/drawable-xhdpi/icon.png
-       convert -resize 144x144 art/icon.png res/drawable-xxhdpi/icon.png
-       convert -resize 192x192 art/icon.png res/drawable-xxxhdpi/icon.png
-
-bin/model_viewer_vr.apk: $(shell ${NITLS} -M src/model_viewer.nit android) ${NITC} res/drawable-hdpi/icon.png libs/cardboard.jar
+       mkdir -p android/res/drawable-ldpi/ android/res/drawable-mdpi/ android/res/drawable-hdpi/ \
+               android/res/drawable-xhdpi/ android/res/drawable-xxhdpi/ android/res/drawable-xxxhdpi/
+       convert -resize 36x36   art/icon.png android/res/drawable-ldpi/icon.png
+       convert -resize 48x48   art/icon.png android/res/drawable-mdpi/icon.png
+       convert -resize 72x72   art/icon.png android/res/drawable-hdpi/icon.png
+       convert -resize 96x96   art/icon.png android/res/drawable-xhdpi/icon.png
+       convert -resize 144x144 art/icon.png android/res/drawable-xxhdpi/icon.png
+       convert -resize 192x192 art/icon.png android/res/drawable-xxxhdpi/icon.png
+
+bin/model_viewer_vr.apk: $(shell ${NITLS} -M src/model_viewer.nit android) ${NITC} android/res/ android/libs/cardboard.jar
        ${NITC} src/model_viewer.nit -m android -m ../../lib/gamnit/depth/vr.nit -o $@
 
-libs/cardboard.jar:
+android/libs/cardboard.jar:
+       mkdir -p android/libs
        curl --progress-bar -o libs/cardboard.jar \
        https://raw.githubusercontent.com/googlesamples/cardboard-java/master/CardboardSample/libs/cardboard.jar

diff --git a/contrib/tinks/Makefile b/contrib/tinks/Makefile
index e637d0c..f74ff97 100644 (file)
--- a/contrib/tinks/Makefile
+++ b/contrib/tinks/Makefile
@@ -38,15 +38,15 @@ src/server/server_serialize.nit: $(shell ../../bin/nitls -M src/server/dedicated
 
 # Android
 android: bin/tinks.apk
-bin/tinks.apk: assets/images/drawing.png res/drawable-ldpi/icon.png $(shell ../../bin/nitls -M src/client/android_client.nit)
+bin/tinks.apk: assets/images/drawing.png android/res/ $(shell ../../bin/nitls -M src/client/android_client.nit)
        ../../bin/nitserial -o src/client/client_serialize.nit src/client/client.nit
        ../../bin/nitc -o bin/tinks.apk src/client/android_client.nit -m src/client/client_serialize.nit
 
-android-release: assets/images/drawing.png res/drawable-ldpi/icon.png $(shell ../../bin/nitls -M src/client/android_client.nit)
+android-release: assets/images/drawing.png android/res/ $(shell ../../bin/nitls -M src/client/android_client.nit)
        ../../bin/nitserial -o src/client/client_serialize.nit src/client/client.nit
        ../../bin/nitc -o bin/tinks.apk src/client/android_client.nit -m src/client/client_serialize.nit --release
 
-res/drawable-ldpi/icon.png: art/icon.svg
-       ../inkscape_tools/bin/svg_to_icons art/icon.svg --android --out res/
+android/res/: art/icon.svg
+       ../inkscape_tools/bin/svg_to_icons art/icon.svg --android --out android/res/
 
 .PHONY: pub

diff --git a/contrib/tinks/res/.gitignore b/contrib/tinks/android/.gitignore
similarity index 100%
rename from contrib/tinks/res/.gitignore
rename to contrib/tinks/android/.gitignore

diff --git a/contrib/tnitter/Makefile b/contrib/tnitter/Makefile
index 0a4beb7..0fdb084 100644 (file)
--- a/contrib/tnitter/Makefile
+++ b/contrib/tnitter/Makefile
@@ -14,17 +14,17 @@ bin/tnitter: $(shell ../../bin/nitls -M src/tnitter_app.nit)
 # Android
 
 android: bin/tnitter.apk
-bin/tnitter.apk: $(shell ../../bin/nitls -M src/tnitter_app_android.nit) res/drawable-ldpi/icon.png
+bin/tnitter.apk: $(shell ../../bin/nitls -M src/tnitter_app_android.nit) android/res/
        mkdir -p bin/
        ../../bin/nitc -o bin/tnitter.apk src/tnitter_app_android.nit -D tnitter_server_uri=http://$(SERVER)
 
-android-release: $(shell ../../bin/nitls -M src/tnitter_app_android.nit) res/drawable-ldpi/icon.png
+android-release: $(shell ../../bin/nitls -M src/tnitter_app_android.nit) android/res/
        mkdir -p bin/
        ../../bin/nitc -o bin/tnitter.apk src/tnitter_app_android.nit --release -D tnitter_server_uri=http://tnitter.xymus.net
 
-res/drawable-ldpi/icon.png: art/icon.svg
-       mkdir -p res
-       ../inkscape_tools/bin/svg_to_icons art/icon.svg --android --out res/
+android/res/: art/icon.svg
+       mkdir -p android
+       ../inkscape_tools/bin/svg_to_icons art/icon.svg --android --out android/res/
 
 # ---
 # iOS

diff --git a/examples/mnit_ballz/.gitignore b/examples/mnit_ballz/.gitignore
deleted file mode 100644 (file)
index 18c4e15..0000000
--- a/examples/mnit_ballz/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-icon.png

diff --git a/examples/mnit_ballz/Makefile b/examples/mnit_ballz/Makefile
index b9a0dfc..f42e903 100644 (file)
--- a/examples/mnit_ballz/Makefile
+++ b/examples/mnit_ballz/Makefile
@@ -16,8 +16,8 @@ linux:
        ../../bin/nitc -o bin/ballz src/ballz_linux.nit
 
 icon: ../../contrib/inkscape_tools/bin/svg_to_icons
-       mkdir -p res
-       ../../contrib/inkscape_tools/bin/svg_to_icons art/ball.svg --android --out res/
+       mkdir -p android/res
+       ../../contrib/inkscape_tools/bin/svg_to_icons art/ball.svg --android --out android/res/
 
 clean:
-       rm -rf bin res
+       rm -rf bin android

diff --git a/examples/mnit_dino/.gitignore b/examples/mnit_dino/.gitignore
deleted file mode 100644 (file)
index 18c4e15..0000000
--- a/examples/mnit_dino/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-icon.png

diff --git a/examples/mnit_dino/Makefile b/examples/mnit_dino/Makefile
index 14faa98..dbc90b5 100644 (file)
--- a/examples/mnit_dino/Makefile
+++ b/examples/mnit_dino/Makefile
@@ -4,20 +4,20 @@ linux:
        mkdir -p bin
        ../../bin/nitc -o bin/dino src/dino_linux.nit
 
-android: android-icons
+android: android/res/
        mkdir -p bin
        ../../bin/nitc -o bin/dino.apk src/dino_android.nit
 
-android-release: android-icons
+android-release: android/res/
        mkdir -p bin
        ../../bin/nitc -o bin/dino.apk src/dino_android.nit --release
 
 ../../contrib/inkscape_tools/bin/svg_to_icons:
        $(MAKE) -C ../../contrib/inkscape_tools
 
-android-icons: ../../contrib/inkscape_tools/bin/svg_to_icons
-       mkdir -p res
-       ../../contrib/inkscape_tools/bin/svg_to_icons art/icon.svg --android --out res/
+android/res/: ../../contrib/inkscape_tools/bin/svg_to_icons
+       mkdir -p android/res/
+       ../../contrib/inkscape_tools/bin/svg_to_icons art/icon.svg --android --out android/res/
 
 doc:
        mkdir -p doc