From 7224d6c1769ce2e23dd140582f335245a3efde8a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Sun, 7 May 2017 12:23:03 -0400 Subject: [PATCH] gamnit: shorten template_flat to template and update namespace MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexis Laferrière --- lib/gamnit/examples/template/Makefile | 14 ++++++++++++++ .../examples/{template_flat => template}/README.md | 0 .../{template_flat => template}/assets/fighter.png | Bin 992 -> 992 bytes .../{template_flat => template}/assets/laser.mp3 | Bin 28665 -> 28665 bytes .../{template_flat => template}/package.ini | 6 +++--- .../src/template.nit} | 8 ++++---- lib/gamnit/examples/template_flat/Makefile | 14 -------------- lib/gamnit/flat.nit | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) create mode 100644 lib/gamnit/examples/template/Makefile rename lib/gamnit/examples/{template_flat => template}/README.md (100%) rename lib/gamnit/examples/{template_flat => template}/assets/fighter.png (100%) rename lib/gamnit/examples/{template_flat => template}/assets/laser.mp3 (100%) rename lib/gamnit/examples/{template_flat => template}/package.ini (76%) rename lib/gamnit/examples/{template_flat/src/template_flat.nit => template/src/template.nit} (96%) delete mode 100644 lib/gamnit/examples/template_flat/Makefile diff --git a/lib/gamnit/examples/template/Makefile b/lib/gamnit/examples/template/Makefile new file mode 100644 index 0000000..270312e --- /dev/null +++ b/lib/gamnit/examples/template/Makefile @@ -0,0 +1,14 @@ +bin/template: $(shell nitls -M src/template.nit -m linux) + mkdir -p bin/ + nitc src/template.nit -m linux -o $@ + +android: bin/template.apk +bin/template.apk: $(shell nitls -M src/template.nit -m android) + mkdir -p bin/ + nitc src/template.nit -m android -o $@ + +check: + nitunit . + +clean: + rm -rf bin/ diff --git a/lib/gamnit/examples/template_flat/README.md b/lib/gamnit/examples/template/README.md similarity index 100% rename from lib/gamnit/examples/template_flat/README.md rename to lib/gamnit/examples/template/README.md diff --git a/lib/gamnit/examples/template_flat/assets/fighter.png b/lib/gamnit/examples/template/assets/fighter.png similarity index 100% rename from lib/gamnit/examples/template_flat/assets/fighter.png rename to lib/gamnit/examples/template/assets/fighter.png diff --git a/lib/gamnit/examples/template_flat/assets/laser.mp3 b/lib/gamnit/examples/template/assets/laser.mp3 similarity index 100% rename from lib/gamnit/examples/template_flat/assets/laser.mp3 rename to lib/gamnit/examples/template/assets/laser.mp3 diff --git a/lib/gamnit/examples/template_flat/package.ini b/lib/gamnit/examples/template/package.ini similarity index 76% rename from lib/gamnit/examples/template_flat/package.ini rename to lib/gamnit/examples/template/package.ini index 103ccd7..854e1ce 100644 --- a/lib/gamnit/examples/template_flat/package.ini +++ b/lib/gamnit/examples/template/package.ini @@ -1,11 +1,11 @@ [package] -name=template_flat +name=template tags=game,example maintainer=Alexis Laferrière license=WTFPL [upstream] -browse=https://github.com/nitlang/nit/tree/master/lib/gamnit/examples/template_flat/ +browse=https://github.com/nitlang/nit/tree/master/lib/gamnit/examples/template/ git=https://github.com/nitlang/nit.git -git.directory=lib/gamnit/examples/template_flat/ +git.directory=lib/gamnit/examples/template/ homepage=http://nitlanguage.org issues=https://github.com/nitlang/nit/issues diff --git a/lib/gamnit/examples/template_flat/src/template_flat.nit b/lib/gamnit/examples/template/src/template.nit similarity index 96% rename from lib/gamnit/examples/template_flat/src/template_flat.nit rename to lib/gamnit/examples/template/src/template.nit index e73900d..8439b29 100644 --- a/lib/gamnit/examples/template_flat/src/template_flat.nit +++ b/lib/gamnit/examples/template/src/template.nit @@ -6,10 +6,10 @@ # http://sam.zoy.org/projects/COPYING.WTFPL for more details. # Template for a 2D gamnit game -module template_flat is - app_name "gamnit 2D Template" - app_namespace "net.xymus.template_flat" - app_version(1, 0, git_revision) +module template is + app_name "gamnit template" + app_namespace "org.gamnit.template" + app_version(0, 1, git_revision) android_api_target 10 end diff --git a/lib/gamnit/examples/template_flat/Makefile b/lib/gamnit/examples/template_flat/Makefile deleted file mode 100644 index 12cb2ed..0000000 --- a/lib/gamnit/examples/template_flat/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -bin/template_flat: $(shell nitls -M src/template_flat.nit -m linux) - mkdir -p bin/ - nitc src/template_flat.nit -m linux -o $@ - -android: bin/template_flat.apk -bin/template_flat.apk: $(shell nitls -M src/template_flat.nit -m android) - mkdir -p bin/ - nitc src/template_flat.nit -m android -o $@ - -check: - nitunit . - -clean: - rm -rf bin/ diff --git a/lib/gamnit/flat.nit b/lib/gamnit/flat.nit index cfd8150..b0319aa 100644 --- a/lib/gamnit/flat.nit +++ b/lib/gamnit/flat.nit @@ -30,7 +30,7 @@ # devices. It is used to position the sprites in `App::ui_sprites`. # # See the sample game at `contrib/asteronits/` and the basic project template -# at `lib/gamnit/examples/template_flat/`. +# at `lib/gamnit/examples/template/`. module flat import glesv2 -- 1.7.9.5