##// END OF EJS Templates
test-install: embed wix namespace for Python 2.6 compatibility...
Yuya Nishihara -
r27519:f4517c88 default
parent child Browse files
Show More
@@ -53,13 +53,13 b' path variables are expanded (~ is the sa'
53 >
53 >
54 > def directory(node, relpath):
54 > def directory(node, relpath):
55 > '''generator of files in the xml node, rooted at relpath'''
55 > '''generator of files in the xml node, rooted at relpath'''
56 > dirs = node.findall('./wix:Directory', ns)
56 > dirs = node.findall('./{%(wix)s}Directory' % ns)
57 >
57 >
58 > for d in dirs:
58 > for d in dirs:
59 > for subfile in directory(d, relpath + d.attrib['Name'] + '/'):
59 > for subfile in directory(d, relpath + d.attrib['Name'] + '/'):
60 > yield subfile
60 > yield subfile
61 >
61 >
62 > files = node.findall('./wix:Component/wix:File', ns)
62 > files = node.findall('./{%(wix)s}Component/{%(wix)s}File' % ns)
63 >
63 >
64 > for f in files:
64 > for f in files:
65 > yield relpath + f.attrib['Name']
65 > yield relpath + f.attrib['Name']
@@ -83,7 +83,7 b' path variables are expanded (~ is the sa'
83 >
83 >
84 > xml = ET.parse("%s/../contrib/wix/%s.wxs" % (testdir, sys.argv[1]))
84 > xml = ET.parse("%s/../contrib/wix/%s.wxs" % (testdir, sys.argv[1]))
85 > root = xml.getroot()
85 > root = xml.getroot()
86 > dir = root.find('.//wix:DirectoryRef', ns)
86 > dir = root.find('.//{%(wix)s}DirectoryRef' % ns)
87 >
87 >
88 > installed = [f for f in directory(dir, '')]
88 > installed = [f for f in directory(dir, '')]
89 >
89 >
General Comments 0
You need to be logged in to leave comments. Login now