===================================================================
RCS file: /home/cvs/OpenXM_contrib2/windows/asir.wxs,v
retrieving revision 1.3
retrieving revision 1.9
diff -u -p -r1.3 -r1.9
--- OpenXM_contrib2/windows/asir.wxs	2013/11/16 16:47:02	1.3
+++ OpenXM_contrib2/windows/asir.wxs	2014/05/28 14:04:45	1.9
@@ -5,17 +5,16 @@
         <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" />
                             <RemoveFile Id="history" Name="history" On="uninstall" />
-                            <Environment Id="ASIR_ROOTDIR" Name="ASIR_ROOTDIR" Value="[ASIR]" Permanent="no" System="no" Action="set" />
+                            <Environment Id="ASIR_ROOTDIR" Name="ASIR_ROOTDIR" Value="[ASIR]" Permanent="no" System="yes" Action="set" />
                         </Component>
                         <Component Id="engine.exe" Guid="1B6281B2-4D9D-47D0-88AE-6977EFEDB6E7">
                             <File Id="ENGINE.EXE" Name="engine.exe" Source="asir\bin\engine.exe" />
@@ -32,15 +31,23 @@
                         <Component Id="ja.dll" Guid="AC9CAD69-E31C-47A3-AE8B-F11F5F18C327">
                             <File Id="JA.DLL" Name="ja.dll" Source="asir\bin\ja.dll" />
                         </Component>
+                        <Component Id="mpir.dll" Guid="69B254E7-E98A-465A-8D8A-22593C4820B8">
+                            <File Id="MPIR.DLL" Name="mpir.dll" Source="asir\bin\mpir.dll" />
+                        </Component>
+                        <Component Id="curl.exe" Guid="CC7085F4-0142-4CFD-90A5-AACB606BE2B1">
+                            <File Id="CURL.EXE" Name="curl.exe" Source="asir\bin\curl.exe" />
+                        </Component>
+                        <Component Id="unzip.exe" Guid="B08F4E49-9395-424D-B4C2-109538229540">
+                            <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>
@@ -61,19 +68,33 @@
             <ComponentGroupRef Id="HelpGrp" />
             <ComponentGroupRef Id="ContribGrp" />
             <ComponentGroupRef Id="ShareGrp" />
+            <ComponentGroupRef Id="DocGrp" />
             <ComponentRef Id="asirgui.exe" />
             <ComponentRef Id="engine.exe" />
             <ComponentRef Id="asir.exe" />
             <ComponentRef Id="cpp.exe" />
             <ComponentRef Id="cmdasir.exe" />
             <ComponentRef Id="ja.dll" />
+            <ComponentRef Id="mpir.dll" />
+            <ComponentRef Id="curl.exe" />
+            <ComponentRef Id="unzip.exe" />
             <ComponentRef Id="LICENSE" />
             <ComponentRef Id="ProgramMenuDir" />
         </Feature>
         <UI />
         <UIRef Id="WixUI_InstallDir" />
         <Property Id="WIXUI_INSTALLDIR" Value="ASIR" />
+        <Property Id="ALLUSERS" Value="1" />
         <WixVariable Id="WixUILicenseRtf" Value="LICENSE.rtf" />
         <Icon Id="asirgui.exe" SourceFile="asir\bin\asirgui.exe" />
+        <Upgrade Id="$(var.upgradeID)">
+            <UpgradeVersion Property="PREVIOUSFOUND" OnlyDetect="no" Minimum="1.0.0" IncludeMinimum="yes" Maximum="$(var.productVer)" IncludeMaximum="no" />
+            <UpgradeVersion Property="NEWERFOUND" IncludeMinimum="no" Minimum="$(var.productVer)" OnlyDetect="yes" />
+        </Upgrade>
+        <CustomAction Error="Newer version is already installed." Id="PreventDowngrading" />
+        <InstallExecuteSequence>
+            <Custom Action="PreventDowngrading" After="FindRelatedProducts">NEWERFOUND</Custom>
+            <RemoveExistingProducts After="InstallInitialize">PREVIOUSFOUND</RemoveExistingProducts>
+        </InstallExecuteSequence>
     </Product>
 </Wix>