X-Git-Url: http://nitlanguage.org

diff --git a/src/platform/android_annotations.nit b/src/platform/android_annotations.nit
index ad34b9a..1f83e61 100644
--- a/src/platform/android_annotations.nit
+++ b/src/platform/android_annotations.nit
@@ -14,29 +14,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Annotations to gather metadata on Android projects. Get the metadata
-# by calling `ModelBuilder::android_project_for`.
+# Additionnal annotations to gather metadata on Android projects
 module android_annotations
 
-private import parser_util
-import modelize
-import literal
-import semantize
-private import annotation
+intrude import app_annotations
 
 # Metadata associated to an Android project
 class AndroidProject
-	# Name of the resulting application
-	var name: nullable String = null
-
-	# Java package used to identify the APK
-	var java_package: nullable String = null
-
-	# Version of the Android application and APK
-	var version: nullable String = null
-
-	# Numerical version code of the Android application and APK
-	var version_code: Int = 0
+	super AppProject
 
 	# Custom lines to add to the AndroidManifest.xml in the <manifest> node
 	var manifest_lines = new Array[String]
@@ -56,128 +41,51 @@ class AndroidProject
 	# Maximum API level on which the application will be allowed to run
 	var max_api: nullable Int = null
 
-	redef fun to_s do return """
-name: {{{name or else "null"}}}
-namespace: {{{java_package or else "null"}}}
-version: {{{version or else "null"}}}"""
-end
+	# Activities to declare in the manifest
+	var activities = new Array[String]
 
-redef class ModelBuilder
-	# Get the `AndroidProject` gathered from `mmodule` and its importations
-	fun android_project_for(mmodule: MModule): AndroidProject
+	init
 	do
-		var project = new AndroidProject
-
-		var annot = lookup_annotation_on_modules("app_name", mmodule)
-		if annot != null then project.name = annot.arg_as_string(self)
-
-		annot =  lookup_annotation_on_modules("app_version", mmodule)
-		if annot != null then project.version =  annot.as_version(self)
-
-		annot = lookup_annotation_on_modules("java_package", mmodule)
-		if annot != null then project.java_package = annot.arg_as_string(self)
-
-		var annots = collect_annotations_on_modules("min_api_version", mmodule)
+		var annots = modelbuilder.collect_annotations_on_modules("android_api_min", mainmodule)
 		if not annots.is_empty then
-			var i = annots.pop.arg_as_int(self)
+			var i = annots.pop.arg_as_int(modelbuilder)
 			if i == null then i = 0
-			project.min_api = i
+			min_api = i
 			for an in annots do
-				i = an.arg_as_int(self)
+				i = an.arg_as_int(modelbuilder)
 				if i == null then continue
-				project.min_api = project.min_api.max(i)
+				min_api = min_api.max(i)
 			end
 		end
 
-		annots = collect_annotations_on_modules("max_api_version", mmodule)
+		annots = modelbuilder.collect_annotations_on_modules("android_api_max", mainmodule)
 		if not annots.is_empty then
-			var i = annots.pop.arg_as_int(self)
+			var i = annots.pop.arg_as_int(modelbuilder)
 			if i == null then i = 0
-			project.max_api = i
+			max_api = i
 			for an in annots do
-				i = an.arg_as_int(self)
+				i = an.arg_as_int(modelbuilder)
 				if i == null then continue
-				project.max_api = project.max_api.min(i)
+				max_api = max_api.min(i)
 			end
 		end
 
-		annot = lookup_annotation_on_modules("target_api_version", mmodule)
-		if annot != null then project.target_api = annot.arg_as_int(self) or else 0
+		var annot = modelbuilder.lookup_annotation_on_modules("android_api_target", mainmodule)
+		if annot != null then target_api = annot.arg_as_int(modelbuilder) or else 0
 
-		annots = collect_annotations_on_modules("android_manifest", mmodule)
-		for an in annots do project.manifest_lines.add an.arg_as_string(self) or else ""
+		annots = modelbuilder.collect_annotations_on_modules("android_manifest", mainmodule)
+		for an in annots do manifest_lines.add an.arg_as_string(modelbuilder) or else ""
 
-		annots = collect_annotations_on_modules("android_manifest_application", mmodule)
-		for an in annots do project.manifest_application_lines.add an.arg_as_string(self) or else ""
+		annots = modelbuilder.collect_annotations_on_modules("android_manifest_application", mainmodule)
+		for an in annots do manifest_application_lines.add an.arg_as_string(modelbuilder) or else ""
 
-		annots = collect_annotations_on_modules("android_manifest_activity", mmodule)
-		for an in annots do project.manifest_activity_attributes.add an.arg_as_string(self) or else ""
+		annots = modelbuilder.collect_annotations_on_modules("android_manifest_activity", mainmodule)
+		for an in annots do manifest_activity_attributes.add an.arg_as_string(modelbuilder) or else ""
 
-		# Get the date and time (down to the minute) as string
-		var local_time = new Tm.localtime
-		var local_time_s = local_time.strftime("%y%m%d%H%M")
-		project.version_code = local_time_s.to_i
-
-		toolcontext.check_errors
-
-		return project
-	end
-end
-
-redef class AAnnotation
-	# Returns a version string (example: "1.5.6b42a7c") from an annotation `version(1, 5, git_revision)`.
-	#
-	# The user can enter as many fields as needed. The call to `git_revision` will be replaced by the short
-	# revision number. If the working tree is dirty, it will append another field with "d" for dirty.
-	private fun as_version(modelbuilder: ModelBuilder): String
-	do
-		var version_fields = new Array[Object]
-
-		var args = n_args
-		if args.length < 1 then
-			modelbuilder.error(self, "Annotation error: \"{name}\" expects at least a single argument.")
-			return ""
-		else
-			for arg in args do
-				var format_error = "Annotation error: \"{name}\" expects its arguments to be of type Int or a call to `git_revision`"
-
-				var value
-				value = arg.as_int
-				if value != null then
-					version_fields.add value
-					continue
-				end
-
-				value = arg.as_string
-				if value != null then
-					version_fields.add value
-				end
-
-				value = arg.as_id
-				if value == "git_revision" then
-					# Get Git short revision
-					var proc = new IProcess("git", "rev-parse", "--short", "HEAD")
-					proc.wait
-					assert proc.status == 0
-					var lines = proc.read_all
-					var revision = lines.split("\n").first
-
-					# Is it dirty?
-					# If not, the return of `git diff --shortstat` is an empty line
-					proc = new IProcess("git", "diff-index", "--quiet", "HEAD")
-					proc.wait
-					var dirty = proc.status != 0
-					if dirty then revision += ".d"
-
-					version_fields.add revision
-					continue
-				end
-
-				modelbuilder.error(self, format_error)
-				return ""
-			end
+		annots = modelbuilder.collect_annotations_on_modules("android_activity", mainmodule)
+		for an in annots do
+			var activity = an.arg_as_string(modelbuilder)
+			if activity != null then activities.add activity
 		end
-
-		return version_fields.join(".")
 	end
 end