X-Git-Url: http://nitlanguage.org diff --git a/src/android_platform.nit b/src/android_platform.nit index 27e2888..6f762e0 100644 --- a/src/android_platform.nit +++ b/src/android_platform.nit @@ -1,4 +1,4 @@ -# This file is part of NIT ( http://www.nitlanguage.org )t +# This file is part of NIT ( http://www.nitlanguage.org ) # # Copyright 2014 Alexis Laferrière # @@ -28,30 +28,6 @@ redef class ToolContext if name == "android" then return new AndroidPlatform return super end - - fun exec_and_check(args: Array[String]) - do - var prog = args.first - args.remove_at 0 - - # Is the wanted program available? - var proc_which = new IProcess.from_a("which", [prog]) - proc_which.wait - var res = proc_which.status - if res != 0 then - print "Android project error: executable \"{prog}\" not found" - exit 1 - end - - # Execute the wanted program - var proc = new Process.from_a(prog, args) - proc.wait - res = proc.status - if res != 0 then - print "Android project error: execution of \"{prog} {args.join(" ")}\" failed" - exit 1 - end - end end class AndroidPlatform @@ -65,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 @@ -76,6 +52,7 @@ class AndroidToolchain redef fun write_files(compiler, compile_dir, cfiles) do + 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 @@ -96,7 +73,7 @@ class AndroidToolchain "--path", android_project_root, "--package", app_package, "--activity", short_project_name] - toolcontext.exec_and_check(args) + toolcontext.exec_and_check(args, "Android project error") # create compile_dir var dir = "{android_project_root}/jni/" @@ -115,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) @@ -138,13 +112,11 @@ 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 """ + """ -""" - 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 @@ -210,19 +180,24 @@ $(call import-module,android/native_app_glue) share_dir = share_dir.realpath var target_png_dir = "{android_project_root}/jni/png" if not target_png_dir.file_exists then - toolcontext.exec_and_check(["ln", "-s", "{share_dir}/png/", target_png_dir]) + toolcontext.exec_and_check(["ln", "-s", "{share_dir}/png/", target_png_dir], "Android project error") end ### 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" if not target_assets_dir.file_exists then - toolcontext.exec_and_check(["ln", "-s", assets_dir, target_assets_dir]) + toolcontext.exec_and_check(["ln", "-s", assets_dir, target_assets_dir], "Android project error") end end end @@ -234,17 +209,18 @@ $(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]) + toolcontext.exec_and_check(["ndk-build", "-s", "-j", "4", "-C", android_project_root], "Android project error") # Generate the apk 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) + toolcontext.exec_and_check(args, "Android project error") # Move the apk to the target var outname = toolcontext.opt_output.value @@ -255,7 +231,7 @@ $(call import-module,android/native_app_glue) 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]) + toolcontext.exec_and_check(["mv", "{android_project_root}/bin/{compiler.mainmodule.name}-{src_apk_suffix}.apk", outname], "Android project error") end end