X-Git-Url: http://nitlanguage.org
diff --git a/src/android_platform.nit b/src/android_platform.nit
index 48095c0..6f762e0 100644
--- a/src/android_platform.nit
+++ b/src/android_platform.nit
@@ -19,6 +19,8 @@ module android_platform
import platform
import abstract_compiler
+import common_ffi
+import android_annotations
redef class ToolContext
redef fun platform_from_name(name)
@@ -39,7 +41,7 @@ end
class AndroidToolchain
super MakefileToolchain
- var android_project_root: String
+ var android_project_root: nullable String = null
redef fun compile_dir
do
@@ -50,13 +52,27 @@ class AndroidToolchain
redef fun write_files(compiler, compile_dir, cfiles)
do
- var app_name = compiler.mainmodule.name
- var app_package = "org.nitlanguage.{app_name}"
- var app_version = "0.1"
-
- var args = ["android", "-s", "create", "project", "--name", app_name,
- "--target", "android-10", "--path", android_project_root,
- "--package", app_package, "--activity", app_name]
+ var android_project_root = android_project_root.as(not null)
+ var project = toolcontext.modelbuilder.android_project_for(compiler.mainmodule)
+ var short_project_name = compiler.mainmodule.name
+ var release = toolcontext.opt_release.value
+
+ var app_name = project.name
+ if app_name == null then app_name = compiler.mainmodule.name
+
+ var app_package = project.java_package
+ if app_package == null then app_package = "org.nitlanguage.{short_project_name}"
+
+ var app_version = project.version
+ if app_version == null then app_version = "1.0"
+
+ var args = ["android", "-s",
+ "create", "project",
+ "--name", short_project_name,
+ "--target", "android-10",
+ "--path", android_project_root,
+ "--package", app_package,
+ "--activity", short_project_name]
toolcontext.exec_and_check(args, "Android project error")
# create compile_dir
@@ -76,16 +92,13 @@ class AndroidToolchain
## Generate delagating makefile
dir = "{android_project_root}/jni/"
- var file = new OFStream.open("{dir}/Android.mk")
- file.write """
+ """
include $(call all-subdir-makefiles)
-"""
- file.close
+ """.write_to_file("{dir}/Android.mk")
### generate makefile into "{compile_dir}/Android.mk"
dir = compile_dir
- file = new OFStream.open("{dir}/Android.mk")
- file.write """
+ """
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
@@ -99,28 +112,24 @@ LOCAL_STATIC_LIBRARIES := android_native_app_glue png
include $(BUILD_SHARED_LIBRARY)
$(call import-module,android/native_app_glue)
-"""
- file.close
+ """.write_to_file("{dir}/Android.mk")
### generate AndroidManifest.xml
dir = android_project_root
- file = new OFStream.open("{dir}/AndroidManifest.xml")
- file.write """
+ """
+ android:versionCode="{{{project.version_code}}}"
+ android:versionName="{{{app_version}}}">
-
+ android:hasCode="true"
+ android:debuggable="{{{not release}}}">
@@ -137,24 +146,27 @@ $(call import-module,android/native_app_glue)
+
+{{{project.manifest_application_lines.join("\n")}}}
+
+{{{project.manifest_lines.join("\n")}}}
+
-"""
- file.close
+ """.write_to_file("{dir}/AndroidManifest.xml")
### generate res/values/strings.xml
dir = "{android_project_root}/res/"
if not dir.file_exists then dir.mkdir
dir = "{dir}/values/"
if not dir.file_exists then dir.mkdir
- file = new OFStream.open("{dir}/strings.xml")
- file.write """
+ """
{{{app_name}}}
-"""
- file.close
+
+ """.write_to_file("{dir}/strings.xml")
### Link to png sources
# libpng is not available on Android NDK
@@ -173,9 +185,14 @@ $(call import-module,android/native_app_glue)
### Link to assets (for mnit and others)
# This will be accessed from `android_project_root`
- var mainmodule_dir = compiler.mainmodule.location.file.filename.dirname
- var assets_dir = "{mainmodule_dir}/../assets"
- if not assets_dir.file_exists then assets_dir = "{mainmodule_dir}/assets"
+ var assets_dir
+ if compiler.mainmodule.location.file != null then
+ # it is a real file, use "{file}/../assets"
+ assets_dir = "{compiler.mainmodule.location.file.filename.dirname}/../assets"
+ else
+ # probably used -m, use "."
+ assets_dir = "assets"
+ end
if assets_dir.file_exists then
assets_dir = assets_dir.realpath
var target_assets_dir = "{android_project_root}/assets"
@@ -192,15 +209,39 @@ $(call import-module,android/native_app_glue)
redef fun compile_c_code(compiler, compile_dir)
do
+ var android_project_root = android_project_root.as(not null)
+ var release = toolcontext.opt_release.value
+
# Compile C code (and thus Nit)
toolcontext.exec_and_check(["ndk-build", "-s", "-j", "4", "-C", android_project_root], "Android project error")
# Generate the apk
- toolcontext.exec_and_check(["ant", "-q", "debug", "-f", android_project_root+"/build.xml"], "Android project error")
+ var args = ["ant", "-q", "-f", android_project_root+"/build.xml"]
+ if release then
+ args.add "release"
+ else args.add "debug"
+ toolcontext.exec_and_check(args, "Android project error")
# Move the apk to the target
var outname = toolcontext.opt_output.value
if outname == null then outname = "{compiler.mainmodule.name}.apk"
- toolcontext.exec_and_check(["mv", "{android_project_root}/bin/{compiler.mainmodule.name}-debug.apk", outname], "Android project error")
+
+ var src_apk_suffix
+ if release then
+ src_apk_suffix = "release-unsigned"
+ else src_apk_suffix = "debug"
+
+ toolcontext.exec_and_check(["mv", "{android_project_root}/bin/{compiler.mainmodule.name}-{src_apk_suffix}.apk", outname], "Android project error")
+ end
+end
+
+redef class JavaClassTemplate
+ redef fun write_to_files(compdir)
+ do
+ var jni_path = "jni/nit_compile/"
+ if compdir.has_suffix(jni_path) then
+ var path = "{compdir.substring(0, compdir.length-jni_path.length)}/src/"
+ return super(path)
+ else return super
end
end