Merge lp:~shkn/bake/multiline-for-template-variables into lp:bake

[shuerhaaken]

multiline for template variables, too

[Robert Ancell (robert-ancell)]

Thanks! For future reference these are easier to review if each change is based off trunk.

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'src/bake.vala'
--- src/bake.vala	2013-04-03 09:48:55 +0000
+++ src/bake.vala	2013-04-05 14:14:29 +0000
@@ -90,6 +90,11 @@
 
     public bool install { owned get { return get_boolean_variable ("install", true); } }
 
+    public string? get_flags (string name, string? fallback = null)
+    {
+        return get_variable (name, fallback).replace("\n", " ");
+    }
+
     public List<string> sources
     {
         owned get
 
=== modified file 'src/module-template.vala'
--- src/module-template.vala	2013-01-19 17:09:08 +0000
+++ src/module-template.vala	2013-04-05 14:14:29 +0000
@@ -9,7 +9,8 @@
             if (file_list == null)
                 continue;
 
-            var variables = recipe.get_variable ("templates.%s.variables".printf (template_name));
+            var variables = 
+                recipe.get_variable ("templates.%s.variables".printf (template_name)).replace("\n", " ");
             /* FIXME: Validate and expand the variables and escape suitable for command line */
 
             var files = split_variable (file_list);
 
=== modified file 'src/module-vala.vala'
--- src/module-vala.vala	2013-04-02 00:06:04 +0000
+++ src/module-vala.vala	2013-04-05 14:14:29 +0000
@@ -66,12 +66,18 @@
         if (library.install)
             recipe.add_install_rule (filename, Path.build_filename (library.install_directory, "pkgconfig"));
 
-        var h_filename = "%s.h".printf (name);
+        var user_header_name = library.get_variable ("vala-header-name", "");
+        var h_filename    = user_header_name != "" ? 
+                                user_header_name :
+                                "%s.h".printf (name);
         recipe.build_rule.add_input (h_filename);
         if (library.install)
             recipe.add_install_rule (h_filename, include_directory);
 
-        var vapi_filename = "%s-%s.vapi".printf (name, major_version);
+        var user_vapi_name   = library.get_variable ("vala-vapi-name", "");
+        var vapi_filename = user_vapi_name != "" ? 
+                                user_vapi_name :
+                                "%s-%s.vapi".printf (name, major_version);
         recipe.build_rule.add_input (vapi_filename);
         var vapi_directory = Path.build_filename (recipe.data_directory, "vala", "vapi");
         if (library.install)
@@ -116,7 +122,7 @@
             binary_name = "lib%s.so.%s".printf (binary_name, (compilable as Library).version);
 
         var valac_command = "@valac";
-        var valac_flags = compilable.get_variable ("vala-compile-flags", "");
+        var valac_flags = compilable.get_flags ("vala-compile-flags", "");
         if (valac_flags != "")
             valac_command += " " + valac_flags;
         var valac_inputs = new List<string> ();
@@ -233,10 +239,16 @@
             var index = version.index_of (".");
             if (index > 0)
                 major_version = version.substring (0, index);
-
-            var h_filename = "%s.h".printf (compilable.id);
-            var vapi_filename = "%s-%s.vapi".printf (compilable.id, major_version);
-
+            
+            var user_header_name = compilable.get_variable ("vala-header-name", "");
+            var h_filename    = user_header_name != "" ? 
+                                    user_header_name :
+                                    "%s.h".printf (compilable.id);
+            
+            var user_vapi_name   = compilable.get_variable ("vala-vapi-name", "");
+            var vapi_filename = user_vapi_name != "" ? 
+                                    user_vapi_name :
+                                    "%s-%s.vapi".printf (compilable.id, major_version);
             interface_rule = recipe.add_rule ();
             foreach (var input in valac_inputs)
                 interface_rule.add_input (input);
@@ -333,7 +345,6 @@
             link_rule.add_input (o_filename);
             link_command += " %s".printf (o_filename);
         }
-
         /* Generate library interfaces */
         if (compilable is Library)
             interface_rule.add_command (interface_command);