From b95579fdce3d1693d49977d68163e8b4ad4bb3d3 Mon Sep 17 00:00:00 2001
From: Marc-André Lureau <marcandre.lureau@gmail.com>
Date: Thu, 11 Jul 2013 18:24:59 +0200
Subject: wixl: a Component can be child of ComponentGroup

---
 tools/wixl/builder.vala | 2 +-
 tools/wixl/wix.vala     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/wixl/builder.vala b/tools/wixl/builder.vala
index 64d3ae7..9780ced 100644
--- a/tools/wixl/builder.vala
+++ b/tools/wixl/builder.vala
@@ -332,7 +332,7 @@ namespace Wixl {
         public override void visit_directory (WixDirectory dir) throws GLib.Error {
             var defaultdir = dir.Name ?? ".";
 
-            if (dir.parent is WixProduct) {
+            if (dir.parent is WixProduct || dir.parent is WixFragment) {
                 if (dir.Id != "TARGETDIR")
                     throw new Wixl.Error.FAILED ("Invalid root directory");
                 db.table_directory.add (dir.Id, null, defaultdir);
diff --git a/tools/wixl/wix.vala b/tools/wixl/wix.vala
index 7ac3172..41b83d8 100644
--- a/tools/wixl/wix.vala
+++ b/tools/wixl/wix.vala
@@ -260,6 +260,7 @@ namespace Wixl {
             name = "ComponentGroup";
 
             add_child_types (child_types, {
+                typeof (WixComponent),
                 typeof (WixComponentRef),
                 typeof (WixComponentGroupRef),
             });
-- 
cgit