diff options
author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-01-10 17:50:33 +0100 |
---|---|---|
committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-01-11 13:10:38 +0100 |
commit | 517c4d1d2e09b585cc9de97d40adb2487f9e07e2 (patch) | |
tree | ecd0572195d0d254049e96e2d2737a4c07755c79 /tools | |
parent | 734bddba1cfa2a712a99a1bff784a617aec73c45 (diff) | |
download | msitools-517c4d1d2e09b585cc9de97d40adb2487f9e07e2.tar.gz msitools-517c4d1d2e09b585cc9de97d40adb2487f9e07e2.tar.xz msitools-517c4d1d2e09b585cc9de97d40adb2487f9e07e2.zip |
wixl: resolve DirectoryRef directory parents
Diffstat (limited to 'tools')
-rw-r--r-- | tools/wixl/builder.vala | 9 | ||||
-rw-r--r-- | tools/wixl/wix.vala | 6 |
2 files changed, 3 insertions, 12 deletions
diff --git a/tools/wixl/builder.vala b/tools/wixl/builder.vala index 20d6f29..5601371 100644 --- a/tools/wixl/builder.vala +++ b/tools/wixl/builder.vala @@ -282,12 +282,12 @@ namespace Wixl { public override void visit_directory (WixDirectory dir) throws GLib.Error { var defaultdir = dir.Name ?? "."; - if (dir.parent.get_type () == typeof (WixProduct)) { + if (dir.parent is WixProduct) { if (dir.Id != "TARGETDIR") throw new Wixl.Error.FAILED ("Invalid root directory"); db.table_directory.add (dir.Id, null, defaultdir); - } else if (dir.parent.get_type () == typeof (WixDirectory)) { - var parent = dir.parent as WixDirectory; + } else if (dir.parent is WixDirectory || dir.parent is WixDirectoryRef) { + var parent = resolve<WixDirectory> (dir.parent); db.table_directory.add (dir.Id, parent.Id, defaultdir); } else warning ("unhandled parent type %s", dir.parent.name); @@ -582,9 +582,6 @@ namespace Wixl { public override void visit_fragment (WixFragment fragment) throws GLib.Error { } - public override void visit_directory_ref (WixDirectoryRef ref) throws GLib.Error { - } - public override void visit_text (WixText text) throws GLib.Error { } } diff --git a/tools/wixl/wix.vala b/tools/wixl/wix.vala index b3531d8..eb7f08a 100644 --- a/tools/wixl/wix.vala +++ b/tools/wixl/wix.vala @@ -22,7 +22,6 @@ namespace Wixl { public abstract void visit_shortcut (WixShortcut shortcut) throws GLib.Error; public abstract void visit_create_folder (WixCreateFolder folder) throws GLib.Error; public abstract void visit_fragment (WixFragment fragment) throws GLib.Error; - public abstract void visit_directory_ref (WixDirectoryRef ref) throws GLib.Error; public abstract void visit_sequence (WixSequence sequence) throws GLib.Error; public abstract void visit_condition (WixCondition condition) throws GLib.Error; public abstract void visit_upgrade (WixUpgrade upgrade) throws GLib.Error; @@ -755,11 +754,6 @@ namespace Wixl { typeof (WixComponent), }); } - - public override void accept (WixNodeVisitor visitor) throws GLib.Error { - base.accept (visitor); - visitor.visit_directory_ref (this); - } } class WixRoot: WixElement { |