src: mass rename project->package
[nit.git] / src / platform / android.nit
index ffd90bc..72c219f 100644 (file)
@@ -34,13 +34,15 @@ end
 class AndroidPlatform
        super Platform
 
+       redef fun name do return "android"
+
        redef fun supports_libgc do return true
 
        redef fun supports_libunwind do return false
 
        redef fun supports_linker_script do return false
 
-       redef fun toolchain(toolcontext) do return new AndroidToolchain(toolcontext)
+       redef fun toolchain(toolcontext, compiler) do return new AndroidToolchain(toolcontext, compiler)
 end
 
 class AndroidToolchain
@@ -50,30 +52,28 @@ class AndroidToolchain
 
        redef fun compile_dir
        do
-               var android_project_root = "{super}/android/"
+               var android_project_root = "{root_compile_dir}/android/"
                self.android_project_root = android_project_root
                return "{android_project_root}/jni/nit_compile/"
        end
 
-       redef fun default_outname(mainmodule) do return "{mainmodule.name}.apk"
+       redef fun default_outname do return "{super}.apk"
 
-       redef fun write_files(compiler, compile_dir, cfiles)
+       redef fun write_files(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.replace("-", "_")
+               var project = new AndroidProject(toolcontext.modelbuilder, compiler.mainmodule)
                var release = toolcontext.opt_release.value
 
                var app_name = project.name
-               if app_name == null then app_name = compiler.mainmodule.name
                if not release then app_name += " Debug"
 
-               var app_package = project.java_package
-               if app_package == null then app_package = "org.nitlanguage.{short_project_name}"
+               var short_project_name = project.short_name
+
+               var app_package = project.namespace
                if not release then app_package += "_debug"
 
                var app_version = project.version
-               if app_version == null then app_version = "1.0"
 
                var app_min_api = project.min_api
                if app_min_api == null then app_min_api = 10
@@ -105,11 +105,11 @@ class AndroidToolchain
                if not dir.file_exists then dir.mkdir
 
                # compile normal C files
-               super(compiler, compile_dir, cfiles)
+               super
 
                # Gather extra C files generated elsewhere than in super
                for f in compiler.extern_bodies do
-                       if f isa ExternCFile then cfiles.add(f.filename.basename(""))
+                       if f isa ExternCFile then cfiles.add(f.filename.basename)
                end
 
                # Is there an icon?
@@ -134,15 +134,30 @@ class AndroidToolchain
                        var extra_java_files = mmodule.extra_java_files
                        if extra_java_files != null then for file in extra_java_files do
                                var path = file.filename
-                               path.file_copy_to(dir/path.basename(""))
+                               path.file_copy_to(dir/path.basename)
                        end
                end
 
-               ## Generate delagating makefile
+               ## Generate Application.mk
                dir = "{android_project_root}/jni/"
                """
+APP_ABI := armeabi armeabi-v7a x86 mips
+APP_PLATFORM := android-{{{app_target_api}}}
+""".write_to_file "{dir}/Application.mk"
+
+               ## Generate delegating makefile
+               """
 include $(call all-subdir-makefiles)
-               """.write_to_file("{dir}/Android.mk")
+""".write_to_file "{dir}/Android.mk"
+
+               # Gather ldflags for Android
+               var ldflags = new Array[String]
+               var platform_name = "android"
+               for mmodule in compiler.mainmodule.in_importation.greaters do
+                       if mmodule.ldflags.keys.has(platform_name) then
+                               ldflags.add_all mmodule.ldflags[platform_name]
+                       end
+               end
 
                ### generate makefile into "{compile_dir}/Android.mk"
                dir = compile_dir
@@ -154,7 +169,7 @@ LOCAL_CFLAGS        := -D ANDROID -D WITH_LIBGC
 LOCAL_MODULE    := main
 LOCAL_SRC_FILES := \\
 {{{cfiles.join(" \\\n")}}}
-LOCAL_LDLIBS    := -llog -landroid -lEGL -lGLESv1_CM -lz libgc.a
+LOCAL_LDLIBS    := {{{ldflags.join(" ")}}} $(TARGET_ARCH)/libgc.a
 LOCAL_STATIC_LIBRARIES := android_native_app_glue png
 
 include $(BUILD_SHARED_LIBRARY)
@@ -164,14 +179,15 @@ $(call import-module,android/native_app_glue)
 
                ### generate AndroidManifest.xml
                dir = android_project_root
-               """<?xml version="1.0" encoding="utf-8"?>
+               var manifest_file = new FileWriter.open("{dir}/AndroidManifest.xml")
+               manifest_file.write """
+<?xml version="1.0" encoding="utf-8"?>
 <!-- BEGIN_INCLUDE(manifest) -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="{{{app_package}}}"
         android:versionCode="{{{project.version_code}}}"
         android:versionName="{{{app_version}}}">
 
-    <!-- This is the platform API where NativeActivity was introduced. -->
     <uses-sdk
         android:minSdkVersion="{{{app_min_api}}}"
         android:targetSdkVersion="{{{app_target_api}}}"
@@ -181,24 +197,24 @@ $(call import-module,android/native_app_glue)
                android:label="@string/app_name"
                android:hasCode="true"
                android:debuggable="{{{not release}}}"
-               {{{icon_declaration}}}
-               android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation">
+               {{{icon_declaration}}}>
+"""
 
-        <!-- Our activity is the built-in NativeActivity framework class.
-             This will take care of integrating with our NDK code. -->
-        <activity android:name="android.app.NativeActivity"
+               for activity in project.activities do
+                       manifest_file.write """
+        <activity android:name="{{{activity}}}"
                 android:label="@string/app_name"
                 {{{project.manifest_activity_attributes.join("\n")}}}
                 {{{icon_declaration}}}>
-            <!-- Tell NativeActivity the name of our .so -->
-            <meta-data android:name=\"android.app.lib_name\"
-                    android:value=\"main\" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+"""
+               end
 
+               manifest_file.write """
 {{{project.manifest_application_lines.join("\n")}}}
 
     </application>
@@ -207,7 +223,8 @@ $(call import-module,android/native_app_glue)
 
 </manifest>
 <!-- END_INCLUDE(manifest) -->
-               """.write_to_file("{dir}/AndroidManifest.xml")
+"""
+               manifest_file.close
 
                ### Link to png sources
                # libpng is not available on Android NDK
@@ -225,24 +242,37 @@ $(call import-module,android/native_app_glue)
                end
 
                # Ensure that android-setup-libgc.sh has been executed
-               if not "{share_dir}/libgc/lib".file_exists then
+               if not "{share_dir}/libgc/arm/lib".file_exists then
                        toolcontext.exec_and_check(["{share_dir}/libgc/android-setup-libgc.sh"], "Android project error")
                end
 
                # Copy GC files
-               toolcontext.exec_and_check(["cp", "{share_dir}/libgc/lib/libgc.a", "{android_project_root}/libgc.a"], "Android project error")
-               toolcontext.exec_and_check(["ln", "-s", "{share_dir}/libgc/include/gc/", "{android_project_root}/jni/nit_compile/gc"], "Android project error")
-
-               ### Link to assets (for mnit and others)
-               # This will be accessed from `android_project_root`
-               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"
+               for arch in ["arm", "x86", "mips"] do
+                       dir = android_project_root/arch
+                       dir.mkdir
+                       toolcontext.exec_and_check(["cp", "{share_dir}/libgc/{arch}/lib/libgc.a",
+                               dir/"libgc.a"], "Android project error")
+               end
+
+               toolcontext.exec_and_check(["ln", "-s", "{share_dir}/libgc/arm/include/gc/",
+                       "{compile_dir}/gc"], "Android project error")
+
+               # Copy assets, resources and libs where expected by the SDK
+
+               var project_root = "."
+               var mpackage = compiler.mainmodule.first_real_mmodule.mpackage
+               if mpackage != null then
+                       var root = mpackage.root
+                       if root != null then
+                               var filepath = root.filepath
+                               if filepath != null then
+                                       project_root = filepath
+                               end
+                       end
                end
+
+               # Link to assets (for mnit and others)
+               var assets_dir = project_root / "assets"
                if assets_dir.file_exists then
                        assets_dir = assets_dir.realpath
                        var target_assets_dir = "{android_project_root}/assets"
@@ -251,20 +281,10 @@ $(call import-module,android/native_app_glue)
                        end
                end
 
-               ### Copy resources and libs where expected by the SDK
-               var project_root
-               if compiler.mainmodule.location.file != null then
-                       # it is a real file, use "{file}/../res"
-                       project_root = "{compiler.mainmodule.location.file.filename.dirname}/.."
-               else
-                       # probably used -m, use "."
-                       project_root = "."
-               end
-
-               # Android resources folder
+               # Copy the res folder
                var res_dir = project_root / "res"
                if res_dir.file_exists then
-                       # copy the res folder to .nit_compile
+                       # copy the res folder to the compile dir
                        res_dir = res_dir.realpath
                        toolcontext.exec_and_check(["cp", "-R", res_dir, android_project_root], "Android project error")
                end
@@ -274,22 +294,22 @@ $(call import-module,android/native_app_glue)
 """<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">{{{app_name}}}</string>
-</resources>""".write_to_file "{dir}/res/values/strings.xml"
+</resources>""".write_to_file "{android_project_root}/res/values/strings.xml"
                end
 
-               # Android libs folder
+               # Copy the libs folder
                var libs_dir = project_root / "libs"
                if libs_dir.file_exists then
                        toolcontext.exec_and_check(["cp", "-r", libs_dir, android_project_root], "Android project error")
                end
        end
 
-       redef fun write_makefile(compiler, compile_dir, cfiles)
+       redef fun write_makefile(compile_dir, cfiles)
        do
                # Do nothing, already done in `write_files`
        end
 
-       redef fun compile_c_code(compiler, compile_dir)
+       redef fun compile_c_code(compile_dir)
        do
                var android_project_root = android_project_root.as(not null)
                var short_project_name = compiler.mainmodule.name.replace("-", "_")
@@ -317,8 +337,9 @@ $(call import-module,android/native_app_glue)
                        var tsa_server= "TSA_SERVER".environ
 
                        if key_alias.is_empty then
-                               toolcontext.fatal_error(null,
-                                       "Fatal Error: the environment variable `KEY_ALIAS` must be set to use the `--release` option on Android projects.")
+                               toolcontext.error(null,
+                                       "Error: the environment variable `KEY_ALIAS` must be set to use the `--release` option on Android projects.")
+                               return
                        end
 
                        args = ["jarsigner", "-sigalg", "MD5withRSA", "-digestalg", "SHA1", apk_path, key_alias]