wixgem 0.44.0 → 0.45.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/wixgem.rb +7 -0
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 27f9579d36447c61b9a745fc12dc6469a2393a04
|
|
4
|
+
data.tar.gz: 8ce56124d055525cdd03ad47861a2bd3eb850465
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 39300ba528e86bf2ae372447f1f25cbf59f37d88801d6abe54683a4607d93c0afbbf810df115e727904fa8a6f1b7ee491a65a296de9a16bfaca4e7874ad5945a
|
|
7
|
+
data.tar.gz: 8c690dac8ad0c982b4e70ff35a1b5b9df035083952baf390cdc5b6efbf0c2273e7f99013a79bde863846c628c26a48b760616fd7c3b58b658dd01a9de830b1fd
|
data/lib/wixgem.rb
CHANGED
|
@@ -105,8 +105,15 @@ class Wix
|
|
|
105
105
|
}
|
|
106
106
|
}
|
|
107
107
|
}
|
|
108
|
+
return xml_doc if(merge_modules.length == 0)
|
|
108
109
|
|
|
109
110
|
directory_root = REXML::XPath.match(xml_doc, '//Wix/Product/Directory')
|
|
111
|
+
if(directory_root.length == 0)
|
|
112
|
+
module_root = REXML::XPath.match(xml_doc, '//Wix/Module')
|
|
113
|
+
raise 'Merge modules can not be added to a merge module' unless(module_root.nil?)
|
|
114
|
+
raise 'Wix element //Wix/Product/Directory does not exist'
|
|
115
|
+
end
|
|
116
|
+
|
|
110
117
|
default_feature = REXML::XPath.match(xml_doc, '//Wix/Product/Feature')
|
|
111
118
|
|
|
112
119
|
merge_modules.each { |component,file|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: wixgem
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.45.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Kevin Marshall
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-01-
|
|
11
|
+
date: 2015-01-28 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|