From: Jean Privat Date: Wed, 16 Sep 2015 17:11:52 +0000 (-0400) Subject: Merge: Prepare FDroid deployment X-Git-Tag: v0.7.8~16 X-Git-Url: http://nitlanguage.org?hp=4526082a3c3e9629516375f655cc3ff700bd14b5 Merge: Prepare FDroid deployment Finish the job of #1710 by adding missing `make android-release`, F-Droid metadata and simplifying the check_contrib script. ping @xymus for review Pull-Request: #1722 Reviewed-by: Alexis Laferrière Reviewed-by: Romain Chanoir Reviewed-by: Lucas Bajolet --- diff --git a/contrib/crazy_moles/Makefile b/contrib/crazy_moles/Makefile index 049e851..113329d 100644 --- a/contrib/crazy_moles/Makefile +++ b/contrib/crazy_moles/Makefile @@ -1,3 +1,7 @@ + +SVG2ICONS=../inkscape_tools/bin/svg_to_icons +SVG2PNG=../inkscape_tools/bin/svg_to_png_and_nit + default: bin/moles bin/moles: $(shell ../../bin/nitls -M src/moles_linux.nit) assets/images/drawing.png @@ -13,19 +17,19 @@ android-release: android-icons $(shell ../../bin/nitls -M src/moles_android.nit) mkdir -p bin ../../bin/nitc -o bin/moles.apk src/moles_android.nit --release -../inkscape_tools/bin/svg_to_icons: +$(SVG2ICONS): $(MAKE) -C ../inkscape_tools -android-icons: ../../contrib/inkscape_tools/bin/svg_to_icons art/icon.svg +android-icons: $(SVG2ICONS) art/icon.svg mkdir -p res - ../inkscape_tools/bin/svg_to_icons art/icon.svg --android --out res/ + $(SVG2ICONS) art/icon.svg --android --out res/ android-install: bin/moles.apk adb install -rf bin/moles.apk -assets/images/drawing.png: art/drawing.svg ../../contrib/inkscape_tools/bin/svg_to_icons +assets/images/drawing.png: art/drawing.svg $(SVG2ICONS) mkdir -p assets/images - ../inkscape_tools/bin/svg_to_png_and_nit --src src/ --scale 2.0 art/drawing.svg + $(SVG2PNG) --src src/ --scale 2.0 art/drawing.svg check-android: bin/moles.apk ../../misc/jenkins/check_android.sh bin/moles.apk diff --git a/contrib/mnit_test/org.nitlanguage.test_minimal.txt b/contrib/mnit_test/org.nitlanguage.test_minimal.txt new file mode 100644 index 0000000..9f3bb3c --- /dev/null +++ b/contrib/mnit_test/org.nitlanguage.test_minimal.txt @@ -0,0 +1,10 @@ +Categories:Nit +License:Apache2 +Web Site:http://nitlanguage.org +Source Code:http://nitlanguage.org/nit.git/tree/HEAD:/contrib/mnit_test +Issue Tracker:https://github.com/nitlang/nit/issues + +Summary:Minimal Demo for MNit +Description: +A useless application that test various basic API usage of the mnit framework on Android. +. diff --git a/contrib/tinks/net.xymus.tinks.txt b/contrib/tinks/net.xymus.tinks.txt new file mode 100644 index 0000000..ceed2bc --- /dev/null +++ b/contrib/tinks/net.xymus.tinks.txt @@ -0,0 +1,13 @@ +Categories:Nit,Games +License:Apache2 +Web Site:http://nitlanguage.org +Source Code:http://nitlanguage.org/nit.git/tree/HEAD:/contrib/tinks +Issue Tracker:https://github.com/nitlang/nit/issues + +Summary:Multiplayer crossplatform action game with destructible procedurally generated worlds +Description: +Each player controls a tank, opens fire from the turret and navigates between the terrain features. +Explosions from turret fire and tank destruction have different forces and destroy the terrain. +Each tank needs 4 hits to be destroyed. +Destroyed tanks drop health power-ups which can repair other tanks. +. diff --git a/examples/calculator/Makefile b/examples/calculator/Makefile index edcfc14..24b10ab 100644 --- a/examples/calculator/Makefile +++ b/examples/calculator/Makefile @@ -1,17 +1,26 @@ NITC=../../bin/nitc NITLS=../../bin/nitls -all: bin/calculator bin/calculator.apk bin/test +all: bin/calculator bin/test bin/calculator: $(shell ${NITLS} -M src/calculator.nit -m linux) ${NITC} mkdir -p bin ${NITC} -o $@ src/calculator.nit -m linux -bin/calculator.apk: $(shell ${NITLS} -M src/calculator.nit -m android) ${NITC} ../../contrib/inkscape_tools/bin/svg_to_icons - mkdir -p bin res - ../../contrib/inkscape_tools/bin/svg_to_icons art/icon.svg --android --out res/ +android: bin/calculator.apk + +bin/calculator.apk: $(shell ${NITLS} -M src/calculator.nit -m android) ${NITC} res/drawable-ldpi/icon.png + mkdir -p bin ${NITC} -o $@ src/calculator.nit -m ../../lib/android/ui/ -D debug +android-release: $(shell ${NITLS} -M src/calculator.nit -m android) ${NITC} res/drawable-ldpi/icon.png + mkdir -p bin + ${NITC} -o bin/calculator.apk src/calculator.nit -m ../../lib/android/ui/ --release + +res/drawable-ldpi/icon.png: art/icon.svg ../../contrib/inkscape_tools/bin/svg_to_icons + mkdir -p res + ../../contrib/inkscape_tools/bin/svg_to_icons art/icon.svg --android --out res/ + ../../contrib/inkscape_tools/bin/svg_to_icons: make -C ../../contrib/inkscape_tools/ diff --git a/examples/calculator/org.nitlanguage.calculator.txt b/examples/calculator/org.nitlanguage.calculator.txt new file mode 100644 index 0000000..264d18b --- /dev/null +++ b/examples/calculator/org.nitlanguage.calculator.txt @@ -0,0 +1,12 @@ +Categories:Nit +License:Apache2 +Web Site:http://nitlanguage.org +Source Code:http://nitlanguage.org/nit.git/tree/HEAD:/examples/calculator +Issue Tracker:https://github.com/nitlang/nit/issues + +Summary:A Basic Calculator +Description: +10 digits, 4 operations, hours of fun. + +This is the official example of a portable GUI application built using app.nit. +. diff --git a/misc/jenkins/check_contrib.sh b/misc/jenkins/check_contrib.sh index fafeb92..df81660 100755 --- a/misc/jenkins/check_contrib.sh +++ b/misc/jenkins/check_contrib.sh @@ -29,19 +29,22 @@ failed= for p in $projects; do dir=`dirname "$p"` name=`basename "$dir"` - echo "*** make $dir ***" - if misc/jenkins/unitrun.sh "cmd-$name-make" make -C "$dir"; then - # Make OK. Check additional rules if they exists - for rule in $rules; do - make -C "$dir" $rule -n 2>/dev/null || - continue - echo "*** make$rule $dir ***" - misc/jenkins/unitrun.sh "cmd-$name-make$rule" make -C "$dir" $rule || - failed="$failed $name-$rule" - done - else - failed="$failed $name" - fi + echo "### in $dir ###" + # Check each rules, if they exists + for rule in $rules; do + make -C "$dir" $rule -n >/dev/null 2>/dev/null || { + # Special case for `all` that falls back as the default target + if [ "$rule" = "all" ]; then + echo "*** make -C $dir ***" + misc/jenkins/unitrun.sh "cmd-$name-make" make -C "$dir" || + failed="$failed $name" + fi + continue + } + echo "*** make $rule -C $dir ***" + misc/jenkins/unitrun.sh "cmd-$name-make$rule" make -C "$dir" $rule || + failed="$failed $name-$rule" + done done grep '