Update the examples filenames in the Windows installer.

The examples now have a ".fio" suffix - update the Windows installer.
Also, allow same version upgrades to avoid installing over the top of
an existing installation.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/os/windows/dobuild.cmd b/os/windows/dobuild.cmd
index cbbe2cbced20e1cad7464b328394d8388b2b0419..166578acdd0b3eb03c6bfa91a0d3483422dcb881 100644 (file)
--- a/os/windows/dobuild.cmd
+++ b/os/windows/dobuild.cmd
@@ -20,5 +20,5 @@ if not defined FIO_ARCH (
 @if ERRORLEVEL 1 goto end\r
 "%WIX%bin\candle" -nologo -arch %FIO_ARCH% examples.wxs\r
 @if ERRORLEVEL 1 goto end\r
-"%WIX%bin\light" -nologo install.wixobj examples.wixobj -ext WixUIExtension -out %FIO_VERSION%-%FIO_ARCH%.msi\r
+"%WIX%bin\light" -nologo -sice:61 install.wixobj examples.wixobj -ext WixUIExtension -out %FIO_VERSION%-%FIO_ARCH%.msi\r
 :end
\ No newline at end of file

diff --git a/os/windows/examples.wxs b/os/windows/examples.wxs
index 771730918f3332db35df1b0b90ef90669db78365..644799d87aff52d365938ecf6bc706b4944c0a10 100755 (executable)
--- a/os/windows/examples.wxs
+++ b/os/windows/examples.wxs
@@ -3,73 +3,73 @@
     <Fragment>
         <DirectoryRef Id="examples">
                 <Component>
-                    <File Source="..\..\examples\1mbs_clients" />
+                    <File Source="..\..\examples\1mbs_clients.fio" />
                 </Component>
                 <Component>
-                    <File Source="..\..\examples\aio-read" />
+                    <File Source="..\..\examples\aio-read.fio" />
                 </Component>
                 <Component>
-                    <File Source="..\..\examples\disk-zone-profile" />
+                    <File Source="..\..\examples\disk-zone-profile.fio" />
                 </Component>
                 <Component>
-                    <File Source="..\..\examples\fsx" />
+                    <File Source="..\..\examples\fsx.fio" />
                 </Component>
                 <Component>
-                    <File Source="..\..\examples\iometer-file-access-server" />
+                    <File Source="..\..\examples\iometer-file-access-server.fio" />
                 </Component>
                 <Component>
-                    <File Source="..\..\examples\netio" />
+                    <File Source="..\..\examples\netio.fio" />
                 </Component>
                 <Component>
-                    <File Source="..\..\examples\ssd-test" />
+                    <File Source="..\..\examples\ssd-test.fio" />
                 </Component>
                 <Component>
-                    <File Source="..\..\examples\surface-scan" />
+                    <File Source="..\..\examples\surface-scan.fio" />
                 </Component>
                 <Component>
-                    <File Source="..\..\examples\tiobench-example" />
+                    <File Source="..\..\examples\tiobench-example.fio" />
                 </Component>
                 <Component>
-                  <File Source="..\..\examples\null" />
+                  <File Source="..\..\examples\null.fio" />
                 </Component>
                 <Component>
-                  <File Source="..\..\examples\flow" />
+                  <File Source="..\..\examples\flow.fio" />
                 </Component>
                 <Component>
-                  <File Source="..\..\examples\cpuio" />
+                  <File Source="..\..\examples\cpuio.fio" />
                 </Component>
                 <Component>
-                  <File Source="..\..\examples\falloc" />
+                  <File Source="..\..\examples\falloc.fio" />
                 </Component>
                 <Component>
-                  <File Source="..\..\examples\fusion-aw-sync.ini" />
+                  <File Source="..\..\examples\fusion-aw-sync.fio" />
                 </Component>
                 <Component>
                   <File Source="..\..\examples\ssd-steadystate.fio" />
                 </Component>
                 <Component>
-                  <File Source="..\..\examples\zipf" />
+                  <File Source="..\..\examples\zipf.fio" />
                 </Component>
         </DirectoryRef>
     </Fragment>
     <Fragment>
         <ComponentGroup Id="examples">
-            <ComponentRef Id="_1mbs_clients" />
-            <ComponentRef Id="aio_read" />
-            <ComponentRef Id="disk_zone_profile" />
-            <ComponentRef Id="fsx" />
-            <ComponentRef Id="iometer_file_access_server" />
-            <ComponentRef Id="netio" />
-            <ComponentRef Id="ssd_test" />
-            <ComponentRef Id="surface_scan" />
-            <ComponentRef Id="tiobench_example" />
-            <ComponentRef Id="null" />
-            <ComponentRef Id="flow" />
-            <ComponentRef Id="cpuio" />
-            <ComponentRef Id="falloc" />
-            <ComponentRef Id="fusion_aw_sync.ini" />
+            <ComponentRef Id="_1mbs_clients.fio" />
+            <ComponentRef Id="aio_read.fio" />
+            <ComponentRef Id="disk_zone_profile.fio" />
+            <ComponentRef Id="fsx.fio" />
+            <ComponentRef Id="iometer_file_access_server.fio" />
+            <ComponentRef Id="netio.fio" />
+            <ComponentRef Id="ssd_test.fio" />
+            <ComponentRef Id="surface_scan.fio" />
+            <ComponentRef Id="tiobench_example.fio" />
+            <ComponentRef Id="null.fio" />
+            <ComponentRef Id="flow.fio" />
+            <ComponentRef Id="cpuio.fio" />
+            <ComponentRef Id="falloc.fio" />
+            <ComponentRef Id="fusion_aw_sync.fio" />
             <ComponentRef Id="ssd_steadystate.fio" />
-            <ComponentRef Id="zipf" />
+            <ComponentRef Id="zipf.fio" />
         </ComponentGroup>
     </Fragment>
 </Wix>

diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index 1494a64616b4c761a212c69d6b8cf75cbd1e2ad0..378fed62f79128679084eca5f343eb35ae3cadcc 100755 (executable)
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -70,6 +70,7 @@
 
        <UIRef Id="WixUI_Minimal"/>
 
-       <MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A newer version of the application is already installed."/>
+       <MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A newer version of the application is already installed."
+                  AllowSameVersionUpgrades="yes"/>
 </Product>
 </Wix>