summaryrefslogtreecommitdiff
path: root/templates/wix.mpd
diff options
context:
space:
mode:
authorJames H. Hill <hilljh82@gmail.com>2010-06-14 23:53:54 +0000
committerJames H. Hill <hilljh82@gmail.com>2010-06-14 23:53:54 +0000
commit2d68b33d83b344cf0835b6319a3fd47893b6bbf3 (patch)
tree09b594e55fa4cf33b2f2866e1a83f3f3a69c00a3 /templates/wix.mpd
parentab916e3b9bec21e4f138c2c6999d5325526cc59e (diff)
downloadMPC-2d68b33d83b344cf0835b6319a3fd47893b6bbf3.tar.gz
Mon Jun 14 23:52:33 UTC 2010 James H. Hill <hillj at cs dot iupui dot edu>
Diffstat (limited to 'templates/wix.mpd')
-rw-r--r--templates/wix.mpd13
1 files changed, 7 insertions, 6 deletions
diff --git a/templates/wix.mpd b/templates/wix.mpd
index c3a357f4..0438edb5 100644
--- a/templates/wix.mpd
+++ b/templates/wix.mpd
@@ -4,9 +4,9 @@
<Fragment Id="<%project_name%>">
<ComponentGroup Id="ComponentGroup.<%project_name%>">
<%if(!no_binary)%>
- <ComponentRef Id="<%project_name%><%foreach(name, install_location)%>.<%name%><%endfor%>.<%if(type_is_dynamic)%><%sharedname%>.dll<%else%><%exename%>.exe<%endif%>" />
+ <ComponentRef Id="<%project_name%><%foreach(name, install_location)%>.<%name%><%endfor%>.<%if(type_is_dynamic)%><%normalize(sharedname)%>.dll<%else%><%normalize(exename)%>.exe<%endif%>" />
<%endif%>
-<%if(gme_install)%>
+<%if(gme_install || gme_decorator)%>
<ComponentRef Id="gme.component.<%gme_progid%>" />
<%endif%>
<%if(gme_paradigm)%>
@@ -28,7 +28,7 @@
<%foreach(name, install_location)%>
<Directory Id="<%project_name%>.binary.<%forcount%>.<%name%>" Name="<%name%>">
<%endfor%>
- <Component Id="<%project_name%><%foreach(name, install_location)%>.<%name%><%endfor%>.<%if(type_is_dynamic)%><%sharedname%>.dll<%else%><%exename%>.exe<%endif%>" Guid="*">
+ <Component Id="<%project_name%><%foreach(name, install_location)%>.<%name%><%endfor%>.<%if(type_is_dynamic)%><%normalize(sharedname)%>.dll<%else%><%normalize(exename)%>.exe<%endif%>" Guid="*">
<File 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)%>" />
@@ -52,8 +52,9 @@
<%endfor%>
<%endfor%>
<%endif%>
-<%if(gme_install)%>
+<%if(gme_install || gme_decorator)%>
<Component Id="gme.component.<%gme_progid%>" Guid="<%gme_uuid%>">
+<%if(gme_install)%>
<RegistryKey Root="<%gme_register(HKLM)%>" Key="SOFTWARE\GME\Components\<%gme_progid%>" Action="createAndRemoveOnUninstall">
<RegistryValue Name="Description" Type="string" Value="<%gme_description%>" Action="write" />
<%if(gme_has_icon)%>
@@ -69,7 +70,7 @@
<RegistryValue Name="<%gme_paradigm%>" Type="string" Action="write" Value="" />
<%endfor%>
</RegistryKey>
-
+<%endif%>
<RegistryKey Root="<%gme_register(HKLM)%>" Key="SOFTWARE\Classes\<%gme_progid%>" Action="createAndRemoveOnUninstall">
<RegistryValue Type="string" Value="<%gme_description%>" />
</RegistryKey>
@@ -79,7 +80,7 @@
</RegistryKey>
<RegistryKey Root="<%gme_register(HKLM)%>" Key="SOFTWARE\Classes\CLSID\{<%gme_uuid%>}" Action="createAndRemoveOnUninstall">
- <RegistryValue Type="string" Value="<%gme_description%>" />
+ <RegistryValue Type="string" Value="<%if(gme_description)%><%gme_description%><%else%><%gme_progid%><%endif%>" />
</RegistryKey>
<RegistryKey Root="<%gme_register(HKLM)%>" Key="SOFTWARE\Classes\CLSID\{<%gme_uuid%>}\InProcServer32" Action="create">