summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames H. Hill <hilljh82@gmail.com>2010-06-28 05:56:39 +0000
committerJames H. Hill <hilljh82@gmail.com>2010-06-28 05:56:39 +0000
commit6db03c25bc32882d5b3bbaa588f180d4774029ea (patch)
tree90dd5dd4477e0d594be40742ae647914b9eb3704
parentf1fb7adb62b4aa1fa7b465c7cd3593b5c4889138 (diff)
downloadMPC-6db03c25bc32882d5b3bbaa588f180d4774029ea.tar.gz
Mon Jun 28 05:55:54 UTC 2010 James H. Hill <hillj at cs dot iupui dot edu>
-rw-r--r--ChangeLog8
-rw-r--r--templates/wix.mpd2
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 717f6b32..c264d96c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
-Mon Jun 28 05:42:48 UTC 2010 James H. Hill <hillj at cs dot iupui dot edu>
+Mon Jun 28 05:55:54 UTC 2010 James H. Hill <hillj at cs dot iupui dot edu>
* templates/wix.mpd:
+ The Id attribute for the exename/sharedname was not normalized.
+
+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.
diff --git a/templates/wix.mpd b/templates/wix.mpd
index 76d726b6..b76178f6 100644
--- a/templates/wix.mpd
+++ b/templates/wix.mpd
@@ -29,7 +29,7 @@
<Directory Id="<%project_name%>.binary.<%forcount%>.<%name%>" Name="<%name%>">
<%endfor%>
<Component Id="<%project_name%><%foreach(name, install_location)%>.<%name%><%endfor%>.<%if(type_is_dynamic)%><%normalize(sharedname)%>.dll<%else%><%normalize(exename)%>.exe<%endif%>" Guid="*">
- <File Id="<%project_name%>_<%if(type_is_dynamic)%><%sharedname%>_dll<%else%><%exename%>_exe<%endif%>"
+ <File Id="<%project_name%>_<%if(type_is_dynamic)%><%normalize(sharedname)%>_dll<%else%><%normalize(exename)%>_exe<%endif%>"
Name="<%if(type_is_dynamic)%><%sharedname%>.dll<%else%><%exename%>.exe<%endif%>"
Source="<%source_directory%>/<%if(type_is_dynamic)%><%sharedname%>.dll<%else%><%exename%>.exe<%endif%>"
DiskId="<%diskid(1)%>" />