Windows: Update the EULA year and add more examples to the installer

Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/os/windows/eula.rtf b/os/windows/eula.rtf
index cc7be7fb216a232bc50ad8f6daf65b0d9fe19be3..1c929321d6875dce3fe09084b2f659aea04151f2 100755 (executable)
Binary files a/os/windows/eula.rtf and b/os/windows/eula.rtf differ

diff --git a/os/windows/examples.wxs b/os/windows/examples.wxs
index a21182a9d84400053cb598c25fbc889a18fbb412..cc2ff5c8faa392463eddfab68e822a8396a4d669 100755 (executable)
--- a/os/windows/examples.wxs
+++ b/os/windows/examples.wxs
@@ -8,15 +8,63 @@
                 <Component>
                     <File Source="..\..\examples\aio-read.fio" />
                 </Component>
                 <Component>
                     <File Source="..\..\examples\aio-read.fio" />
                 </Component>

+                <Component>
+                    <File Source="..\..\examples\backwards-read.fio" />
+                </Component>
+                <Component>
+                    <File Source="..\..\examples\basic-verify.fio" />
+                </Component>
+                <Component>
+                  <File Source="..\..\examples\cpuio.fio" />
+                </Component>
+                <Component>
+                  <File Source="..\..\examples\dev-dax.fio" />
+                </Component>

                 <Component>
                     <File Source="..\..\examples\disk-zone-profile.fio" />
                 </Component>
                 <Component>
                     <File Source="..\..\examples\disk-zone-profile.fio" />
                 </Component>

+                <Component>
+                  <File Source="..\..\examples\e4defrag.fio" />
+                </Component>
+                <Component>
+                  <File Source="..\..\examples\e4defrag2.fio" />
+                </Component>
+                <Component>
+                  <File Source="..\..\examples\enospc-pressure.fio" />
+                </Component>
+                <Component>
+                  <File Source="..\..\examples\falloc.fio" />
+                </Component>
+                <Component>
+                  <File Source="..\..\examples\fixed-rate-submission.fio" />
+                </Component>
+                <Component>
+                  <File Source="..\..\examples\flow.fio" />
+                </Component>

                 <Component>
                     <File Source="..\..\examples\fsx.fio" />
                 </Component>
                 <Component>
                     <File Source="..\..\examples\fsx.fio" />
                 </Component>

+                <Component>
+                  <File Source="..\..\examples\fusion-aw-sync.fio" />
+                </Component>
+                <Component>
+                  <File Source="..\..\examples\gfapi.fio" />
+                </Component>

                 <Component>
                     <File Source="..\..\examples\iometer-file-access-server.fio" />
                 </Component>
                 <Component>
                     <File Source="..\..\examples\iometer-file-access-server.fio" />
                 </Component>

+                <Component>
+                  <File Source="..\..\examples\jesd219.fio" />
+                </Component>
+                <Component>
+                  <File Source="..\..\examples\latency-profile.fio" />
+                </Component>
+                <Component>
+                  <File Source="..\..\examples\libhdfs.fio" />
+                </Component>
+                <Component>
+                  <File Source="..\..\examples\mtd.fio" />
+                </Component>

                 <Component>
                     <File Source="..\..\examples\netio.fio" />
                 </Component>
                 <Component>
                     <File Source="..\..\examples\netio.fio" />
                 </Component>


@@ -24,32 +72,47 @@
                     <File Source="..\..\examples\netio_multicast.fio" />
                 </Component>
                 <Component>
                     <File Source="..\..\examples\netio_multicast.fio" />
                 </Component>
                 <Component>

-                    <File Source="..\..\examples\ssd-test.fio" />
+                  <File Source="..\..\examples\null.fio" />

                 </Component>
                 <Component>
                 </Component>
                 <Component>

-                    <File Source="..\..\examples\surface-scan.fio" />
+                  <File Source="..\..\examples\numa.fio" />

                 </Component>
                 <Component>
                 </Component>
                 <Component>

-                    <File Source="..\..\examples\tiobench-example.fio" />
+                  <File Source="..\..\examples\pmemblk.fio" />

                 </Component>
                 <Component>
                 </Component>
                 <Component>

-                  <File Source="..\..\examples\null.fio" />
+                  <File Source="..\..\examples\poisson-rate-submission.fio" />

                 </Component>
                 <Component>
                 </Component>
                 <Component>

-                  <File Source="..\..\examples\flow.fio" />
+                  <File Source="..\..\examples\rand-zones.fio" />

                 </Component>
                 <Component>
                 </Component>
                 <Component>

-                  <File Source="..\..\examples\cpuio.fio" />
+                  <File Source="..\..\examples\rbd.fio" />

                 </Component>
                 <Component>
                 </Component>
                 <Component>

-                  <File Source="..\..\examples\falloc.fio" />
+                  <File Source="..\..\examples\rdmaio-client.fio" />

                 </Component>
                 <Component>
                 </Component>
                 <Component>

-                  <File Source="..\..\examples\fusion-aw-sync.fio" />
+                  <File Source="..\..\examples\rdmaio-server.fio" />

                 </Component>
                 <Component>
                   <File Source="..\..\examples\ssd-steadystate.fio" />
                 </Component>
                 </Component>
                 <Component>
                   <File Source="..\..\examples\ssd-steadystate.fio" />
                 </Component>

+                <Component>
+                    <File Source="..\..\examples\ssd-test.fio" />
+                </Component>
+                <Component>
+                  <File Source="..\..\examples\steadystate.fio" />
+                </Component>
+                <Component>
+                    <File Source="..\..\examples\surface-scan.fio" />
+                </Component>
+                <Component>
+                    <File Source="..\..\examples\tiobench-example.fio" />
+                </Component>
+                <Component>
+                  <File Source="..\..\examples\waitfor.fio" />
+                </Component>

                 <Component>
                   <File Source="..\..\examples\zipf.fio" />
                 </Component>
                 <Component>
                   <File Source="..\..\examples\zipf.fio" />
                 </Component>


@@ -59,20 +122,41 @@
         <ComponentGroup Id="examples">
             <ComponentRef Id="_1mbs_clients.fio" />
             <ComponentRef Id="aio_read.fio" />
         <ComponentGroup Id="examples">
             <ComponentRef Id="_1mbs_clients.fio" />
             <ComponentRef Id="aio_read.fio" />

+            <ComponentRef Id="backwards_read.fio" />
+            <ComponentRef Id="basic_verify.fio" />
+            <ComponentRef Id="cpuio.fio" />
+            <ComponentRef Id="dev_dax.fio" />

             <ComponentRef Id="disk_zone_profile.fio" />
             <ComponentRef Id="disk_zone_profile.fio" />

+            <ComponentRef Id="e4defrag.fio" />
+            <ComponentRef Id="e4defrag2.fio" />
+            <ComponentRef Id="enospc_pressure.fio" />
+            <ComponentRef Id="falloc.fio" />
+            <ComponentRef Id="fixed_rate_submission.fio" />
+            <ComponentRef Id="flow.fio" />

             <ComponentRef Id="fsx.fio" />
             <ComponentRef Id="fsx.fio" />

+            <ComponentRef Id="fusion_aw_sync.fio" />
+            <ComponentRef Id="gfapi.fio" />

             <ComponentRef Id="iometer_file_access_server.fio" />
             <ComponentRef Id="iometer_file_access_server.fio" />

+            <ComponentRef Id="jesd219.fio" />
+            <ComponentRef Id="latency_profile.fio" />
+            <ComponentRef Id="libhdfs.fio" />
+            <ComponentRef Id="mtd.fio" />

             <ComponentRef Id="netio.fio" />
             <ComponentRef Id="netio_multicast.fio" />
             <ComponentRef Id="netio.fio" />
             <ComponentRef Id="netio_multicast.fio" />

+            <ComponentRef Id="null.fio" />
+            <ComponentRef Id="numa.fio" />
+            <ComponentRef Id="pmemblk.fio" />
+            <ComponentRef Id="poisson_rate_submission.fio" />
+            <ComponentRef Id="rand_zones.fio" />
+            <ComponentRef Id="rbd.fio" />
+            <ComponentRef Id="rdmaio_client.fio" />
+            <ComponentRef Id="rdmaio_server.fio" />
+            <ComponentRef Id="ssd_steadystate.fio" />

             <ComponentRef Id="ssd_test.fio" />
             <ComponentRef Id="ssd_test.fio" />

+            <ComponentRef Id="steadystate.fio" />

             <ComponentRef Id="surface_scan.fio" />
             <ComponentRef Id="tiobench_example.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="waitfor.fio" />

             <ComponentRef Id="zipf.fio" />
         </ComponentGroup>
     </Fragment>
             <ComponentRef Id="zipf.fio" />
         </ComponentGroup>
     </Fragment>

diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index 22b7f7e49342d36c99f1ffb9bec4c36983574434..9e776de847f375a5603ee1fffa2dfdd76a82cf87 100755 (executable)
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -58,7 +58,7 @@
                <ComponentGroupRef Id="examples"/>
        </Feature>
 
                <ComponentGroupRef Id="examples"/>
        </Feature>
 

-       <Property Id="ARPURLINFOABOUT" Value="http://git.kernel.dk/?p=fio.git" />
+       <Property Id="ARPURLINFOABOUT" Value="http://git.kernel.dk/cgit/fio/" />

        <Property Id='ARPCONTACT'>fio@vger.kernel.org</Property>
        <Property Id='ARPHELPLINK'>http://www.spinics.net/lists/fio/</Property>
        <Property Id='ARPURLUPDATEINFO'>http://bluestop.org/fio/</Property>
        <Property Id='ARPCONTACT'>fio@vger.kernel.org</Property>
        <Property Id='ARPHELPLINK'>http://www.spinics.net/lists/fio/</Property>
        <Property Id='ARPURLUPDATEINFO'>http://bluestop.org/fio/</Property>