##// END OF EJS Templates
packaging: normalize - to _ in WiX Id values...
Gregory Szorc -
r46221:439ce34d default
parent child Browse files
Show More
@@ -165,7 +165,9 b' def make_files_xml(staging_dir: pathlib.'
165 if dir_name == '.':
165 if dir_name == '.':
166 parent_directory_id = 'INSTALLDIR'
166 parent_directory_id = 'INSTALLDIR'
167 else:
167 else:
168 parent_directory_id = 'hg.dir.%s' % dir_name.replace('/', '.')
168 parent_directory_id = 'hg.dir.%s' % dir_name.replace(
169 '/', '.'
170 ).replace('-', '_')
169
171
170 fragment = doc.createElement('Fragment')
172 fragment = doc.createElement('Fragment')
171 directory_ref = doc.createElement('DirectoryRef')
173 directory_ref = doc.createElement('DirectoryRef')
@@ -178,7 +180,9 b' def make_files_xml(staging_dir: pathlib.'
178 and '/' not in possible_child
180 and '/' not in possible_child
179 and possible_child != '.'
181 and possible_child != '.'
180 ):
182 ):
181 child_directory_id = 'hg.dir.%s' % possible_child
183 child_directory_id = ('hg.dir.%s' % possible_child).replace(
184 '-', '_'
185 )
182 name = possible_child
186 name = possible_child
183 else:
187 else:
184 if not possible_child.startswith('%s/' % dir_name):
188 if not possible_child.startswith('%s/' % dir_name):
@@ -189,7 +193,7 b' def make_files_xml(staging_dir: pathlib.'
189
193
190 child_directory_id = 'hg.dir.%s' % possible_child.replace(
194 child_directory_id = 'hg.dir.%s' % possible_child.replace(
191 '/', '.'
195 '/', '.'
192 )
196 ).replace('-', '_')
193
197
194 directory = doc.createElement('Directory')
198 directory = doc.createElement('Directory')
195 directory.setAttribute('Id', child_directory_id)
199 directory.setAttribute('Id', child_directory_id)
General Comments 0
You need to be logged in to leave comments. Login now