nitc: support iOS assets

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/src/platform/ios.nit b/src/platform/ios.nit
index 0cb1ce0..da9cfda 100644 (file)
--- a/src/platform/ios.nit
+++ b/src/platform/ios.nit
@@ -101,16 +101,10 @@ private class IOSToolchain
 
                var icons_found = false
 
-               for path in app_files do
-                       var icon_dir = path / "ios" / "AppIcon.appiconset"
-                       if icon_dir.file_exists then
-                               icons_found = true
-
-                               # Prepare the `Assets.xcassets` folder
-                               var target_assets_dir = compile_dir / "Assets.xcassets"
-                               if not target_assets_dir.file_exists then target_assets_dir.mkdir
-
-                               """
+               # Prepare the `Assets.xcassets` folder
+               var target_assets_dir = compile_dir / "Assets.xcassets"
+               if not target_assets_dir.file_exists then target_assets_dir.mkdir
+               """
 {
   "info" : {
        "version" : 1,
@@ -118,13 +112,28 @@ private class IOSToolchain
   }
 }""".write_to_file target_assets_dir / "Contents.json"
 
+               (compile_dir / "assets").mkdir
+
+               for path in app_files do
+
+                       # Icon
+                       var icon_dir = path / "ios" / "AppIcon.appiconset"
+                       if icon_dir.file_exists then
+                               icons_found = true
+
+
                                # copy the res folder to the compile dir
                                icon_dir = icon_dir.realpath
                                toolcontext.exec_and_check(["cp", "-R", icon_dir, target_assets_dir], "iOS project error")
                        end
-               end
 
-               # TODO Register asset files
+                       # Assets
+                       var assets_dir = path / "assets"
+                       if assets_dir.file_exists then
+                               assets_dir = assets_dir.realpath
+                               toolcontext.exec_and_check(["cp", "-r", assets_dir, compile_dir], "iOS project error")
+                       end
+               end
 
                # ---
                # project_folder.xcodeproj (projet meta data)

diff --git a/src/platform/xcode_templates.nit b/src/platform/xcode_templates.nit
index 776b656..19c04be 100644 (file)
--- a/src/platform/xcode_templates.nit
+++ b/src/platform/xcode_templates.nit
@@ -174,6 +174,7 @@ class PbxprojectTemplate
 """
 
                add """
+               0F4688411FDF8748004F34D4 /* assets in Resources */ = {isa = PBXBuildFile; fileRef = 0F4688401FDF8748004F34D4 /* assets */; };
                0FDD07A21C6F8E0E006FF70E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0FDD07A11C6F8E0E006FF70E /* LaunchScreen.storyboard */; };
 /* End PBXBuildFile section */
 
@@ -219,6 +220,7 @@ class PbxprojectTemplate
                for file in files do add file.description
 
                add """
+               0F4688401FDF8748004F34D4 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = assets; path = {{{name}}}/assets; sourceTree = SOURCE_ROOT; };
                0FDD07A11C6F8E0E006FF70E /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -253,6 +255,7 @@ class PbxprojectTemplate
                AF9F83CE1A5F0D21004B62C0 /* {{{name}}} */ = {
                        isa = PBXGroup;
                        children = (
+                               0F4688401FDF8748004F34D4 /* assets */,
 """
                        # Reference all known files
                        for file in files do add """
@@ -328,6 +331,7 @@ class PbxprojectTemplate
 
                add """
                                0FDD07A21C6F8E0E006FF70E /* LaunchScreen.storyboard in Resources */,
+                               0F4688411FDF8748004F34D4 /* assets in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };