From bbe51897e75c0faa42a4ded7ff258cf1efe908e4 Mon Sep 17 00:00:00 2001
From: Laurent Sansonetti <lrz@hipbyte.com>
Date: Tue, 20 May 2014 12:00:14 +0200
Subject: [PATCH] add app.version_name, app.version_code, and app.version(code,
 name) to specify app versioning when generating the manifest file

---
 lib/motion/project/template/android.rb        | 2 +-
 lib/motion/project/template/android/config.rb | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/motion/project/template/android.rb b/lib/motion/project/template/android.rb
index 81be6d59..12b84909 100644
--- a/lib/motion/project/template/android.rb
+++ b/lib/motion/project/template/android.rb
@@ -151,7 +151,7 @@ EOS
   android_manifest_txt = ''
   android_manifest_txt << <<EOS
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="#{App.config.package}" android:versionCode="1" android:versionName="1.0">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="#{App.config.package}" android:versionCode="#{App.config.version_code}" android:versionName="#{App.config.version_name}">
 	<uses-sdk android:minSdkVersion="#{App.config.api_version}"/>
 EOS
     App.config.manifest_xml_lines(nil).each { |line| android_manifest_txt << "\t" + line + "\n" }
diff --git a/lib/motion/project/template/android/config.rb b/lib/motion/project/template/android/config.rb
index 6436454c..394fc0d1 100644
--- a/lib/motion/project/template/android/config.rb
+++ b/lib/motion/project/template/android/config.rb
@@ -29,7 +29,7 @@ module Motion; module Project;
 
     variable :sdk_path, :ndk_path, :avd_config, :package, :main_activity,
       :sub_activities, :api_version, :arch, :assets_dirs, :icon,
-      :logs_components
+      :logs_components, :version_code, :version_name
 
     def initialize(project_dir, build_mode)
       super
@@ -42,6 +42,8 @@ module Motion; module Project;
       @manifest_entries = {}
       @release_keystore_path = nil
       @release_keystore_alias = nil
+      @version_code = '1'
+      @version_name = '1.0'
     end
 
     def validate
@@ -234,5 +236,10 @@ module Motion; module Project;
       @release_keystore_path = path
       @release_keystore_alias = alias_name
     end
+
+    def version(code, name)
+      @version_code = code
+      @version_name = name
+    end
   end
 end; end