diff options
author | James H. Hill <hilljh82@gmail.com> | 2010-06-28 05:43:33 +0000 |
---|---|---|
committer | James H. Hill <hilljh82@gmail.com> | 2010-06-28 05:43:33 +0000 |
commit | f1fb7adb62b4aa1fa7b465c7cd3593b5c4889138 (patch) | |
tree | 5c1159681ed713f55795f9248921311854deac98 | |
parent | 687bfe80430ceaf8def8d8e0cda0ec0054e71c8f (diff) | |
download | MPC-f1fb7adb62b4aa1fa7b465c7cd3593b5c4889138.tar.gz |
Mon Jun 28 05:42:48 UTC 2010 James H. Hill <hillj at cs dot iupui dot edu>
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | templates/wix.mpd | 2 |
2 files changed, 9 insertions, 2 deletions
@@ -1,7 +1,14 @@ +Mon Jun 28 05:42:48 UTC 2010 James H. Hill <hillj at cs dot iupui dot edu> + + * templates/wix.mpd: + + Bug fix where the generated Id for the File element contained + invalid characters. + Mon Jun 28 04:46:49 UTC 2010 James H. Hill <hillj at cs dot iupui dot edu> * templates/wix.mpd: - + Bug fix where the File element used the auto-generated Id attribute, which resulted in duplicate keys in the installer when different project had files with the same name. diff --git a/templates/wix.mpd b/templates/wix.mpd index 099f17ff..76d726b6 100644 --- a/templates/wix.mpd +++ b/templates/wix.mpd @@ -44,7 +44,7 @@ <Directory Id="<%project_name%>.<%normalize(resource_file)%>.<%forcount%>.<%name%>" Name="<%name%>"> <%endfor%> <Component Id="<%project_name%><%foreach(name, install_location)%>.<%name%><%endfor%>.<%normalize(resource_file)%>" Guid="*"> - <File Id="<%project_name%>_<%basename(resource_file)%>" + <File Id="<%project_name%>_<%normalize(resource_file)%>" Name="<%basename(resource_file)%>" Source="<%full_path(resource_file)%>" DiskId="<%diskid(1)%>" /> |