===================================================================
RCS file: /home/cvs/OpenXM_contrib2/windows/asir.wxs,v
retrieving revision 1.5
retrieving revision 1.9
diff -u -p -r1.5 -r1.9
--- OpenXM_contrib2/windows/asir.wxs	2014/03/30 22:29:46	1.5
+++ OpenXM_contrib2/windows/asir.wxs	2014/05/28 14:04:45	1.9
@@ -5,12 +5,11 @@
         <Media Id="1" Cabinet="simple.cab" EmbedCab="yes" />
         <Directory Id="TARGETDIR" Name="SourceDir">
             <Directory Id="$(var.programfilesDir)" Name="PFiles">
-                <Directory Name="asir" Id="ASIR">
-                    <Directory Name="bin" Id="BIN">
+                <Directory Id="ASIR" Name="asir">
+                    <Directory Id="BIN" Name="bin">
                         <Component Id="asirgui.exe" Guid="AEB0BF56-E0E8-4BD3-B768-D0E9DC87C503">
                             <File Id="ASIRGUI.EXE" Name="asirgui.exe" Source="asir\bin\asirgui.exe" KeyPath="yes">
-                                <Shortcut Id="desktop_ASIRGUI" Name="asirgui" Description="Asir for Windows" Directory="DesktopFolder" Advertise="yes" Icon="asirgui.exe">
-                                </Shortcut>
+                                <Shortcut Id="desktop_ASIRGUI" Name="asirgui" Description="Asir for Windows" Directory="DesktopFolder" Advertise="yes" Icon="asirgui.exe" />
                                 <Shortcut Id="menu_ASIRGUI" Name="asirgui" Description="Asir for Windows" Directory="ProgramMenuDir" Advertise="yes" Icon="asirgui.exe" />
                             </File>
                             <RemoveFile Id="asirgui.hnd" Name="asirgui.hnd" On="uninstall" />
@@ -42,14 +41,13 @@
                             <File Id="UNZIP.EXE" Name="unzip.exe" Source="asir\bin\unzip.exe" />
                         </Component>
                     </Directory>
-                    <Directory Name="help" Id="HELP">
-                        <Directory Id="HELP_JA" Name="ja" />
+                    <Directory Id="HELP" Name="help" />
+                    <Directory Name="lib" Id="LIB">
+                        <Directory Id="LIB_ASIR" Name="asir" />
+                        <Directory Id="LIB_ASIR_CONTRIB" Name="asir-contrib" />
                     </Directory>
-                    <Directory Name="lib" Id="LIB" />
-                    <Directory Name="lib-asir-contrib" Id="LIB_ASIR_CONTRIB" />
-                    <Directory Name="share" Id="SHARE">
-                        <Directory Id="EDITOR" Name="editor" />
-                    </Directory>
+                    <Directory Id="SHARE" Name="share" />
+                    <Directory Id="DOC" Name="doc" />
                     <Component Id="LICENSE" Guid="02A83B99-8E61-499B-BCDB-C25B931EEC36">
                         <File Id="LICENSE" Name="LICENSE" Source="asir\LICENSE" />
                     </Component>
@@ -70,6 +68,7 @@
             <ComponentGroupRef Id="HelpGrp" />
             <ComponentGroupRef Id="ContribGrp" />
             <ComponentGroupRef Id="ShareGrp" />
+            <ComponentGroupRef Id="DocGrp" />
             <ComponentRef Id="asirgui.exe" />
             <ComponentRef Id="engine.exe" />
             <ComponentRef Id="asir.exe" />
@@ -98,4 +97,4 @@
             <RemoveExistingProducts After="InstallInitialize">PREVIOUSFOUND</RemoveExistingProducts>
         </InstallExecuteSequence>
     </Product>
-</Wix>
\ No newline at end of file
+</Wix>