summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2013-01-09 00:54:59 +0100
committerMarc-André Lureau <marcandre.lureau@gmail.com>2013-01-09 00:54:59 +0100
commite8f8f80f4ab2324563cf91211e458c218fc7ec5d (patch)
tree78e2699da14a26d31b88f88d1ebe0fb1ac369244
parent7abd051eb25f7eebcbcab7bc2b2511d1a1bf4852 (diff)
downloadmsitools-e8f8f80f4ab2324563cf91211e458c218fc7ec5d.tar.gz
msitools-e8f8f80f4ab2324563cf91211e458c218fc7ec5d.tar.xz
msitools-e8f8f80f4ab2324563cf91211e458c218fc7ec5d.zip
Use a base class for sequence action
-rw-r--r--src/builder.vala2
-rw-r--r--src/wix.vala20
2 files changed, 14 insertions, 8 deletions
diff --git a/src/builder.vala b/src/builder.vala
index f36635a..32011f0 100644
--- a/src/builder.vala
+++ b/src/builder.vala
@@ -542,7 +542,7 @@ namespace Wixl {
secureProperties += version.Property;
}
- public override void visit_remove_existing_products (WixRemoveExistingProducts remove) throws GLib.Error {
+ public override void visit_action (WixAction action) throws GLib.Error {
}
public override void visit_create_folder (WixCreateFolder folder) throws GLib.Error {
diff --git a/src/wix.vala b/src/wix.vala
index 4fe1df4..1ae6158 100644
--- a/src/wix.vala
+++ b/src/wix.vala
@@ -27,7 +27,7 @@ namespace Wixl {
public abstract void visit_condition (WixCondition condition) throws GLib.Error;
public abstract void visit_upgrade (WixUpgrade upgrade) throws GLib.Error;
public abstract void visit_upgrade_version (WixUpgradeVersion version) throws GLib.Error;
- public abstract void visit_remove_existing_products (WixRemoveExistingProducts remove) throws GLib.Error;
+ public abstract void visit_action (WixAction action) throws GLib.Error;
public abstract void visit_text (WixText text) throws GLib.Error;
}
@@ -401,15 +401,21 @@ namespace Wixl {
}
}
- public class WixRemoveExistingProducts: WixElement {
- static construct {
- name = "RemoveExistingProducts";
- }
-
+ public abstract class WixAction: WixElement {
public string After { get; set; }
+ public string Before { get; set; }
+ public string Overridable { get; set; }
+ public string Sequence { get; set; }
+ public string Suppress { get; set; }
public override void accept (WixNodeVisitor visitor) throws GLib.Error {
- visitor.visit_remove_existing_products (this);
+ visitor.visit_action (this);
+ }
+ }
+
+ public class WixRemoveExistingProducts: WixAction {
+ static construct {
+ name = "RemoveExistingProducts";
}
}