summaryrefslogtreecommitdiff
path: root/os/windows
diff options
context:
space:
mode:
authorBruce Cran <BCran@fusionio.com>2011-05-04 07:54:13 -0600
committerJens Axboe <jaxboe@fusionio.com>2011-05-04 07:54:13 -0600
commitea4500d8d709ed4aa9587f35b2edc55b5b2c7695 (patch)
tree71a9bc2768bbc8611b0452e9e666c35311bd287d /os/windows
parentac18ea38de2a23018f9f953c3028d519df3a1177 (diff)
downloadfio-ea4500d8d709ed4aa9587f35b2edc55b5b2c7695.tar.gz
fio-ea4500d8d709ed4aa9587f35b2edc55b5b2c7695.tar.bz2
Windows fixes
- Fix XP support: get pointer to CancelIoEx at runtime. - Fix overlapped IO. - Don't use overlapped IO if direct or synchronous options are set. - Check if write option is set before opening file in read-only mode: fixes 'rw=rw'. Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'os/windows')
-rwxr-xr-xos/windows/cygwin.wxs16
-rwxr-xr-xos/windows/dobuild.cmd8
2 files changed, 14 insertions, 10 deletions
diff --git a/os/windows/cygwin.wxs b/os/windows/cygwin.wxs
index f74b422d..c33c1335 100755
--- a/os/windows/cygwin.wxs
+++ b/os/windows/cygwin.wxs
@@ -24,11 +24,14 @@
<Component Id="cmp229D68D422FB0EB697971491C1475142" Guid="{027945EC-DA28-41C8-9AFF-7AE1BD0F7078}">
<File Id="fil7FD65A67872AB00D44EE1419EED402F3" KeyPath="yes" Source="fio\bin\cygintl-8.dll" />
</Component>
- <Component Id="cmpFCBAB68E4A226C62E32EF283AA1ABC5A" Guid="{2FE224F7-DF14-4D19-8154-77BF6A81B895}">
- <File Id="filF29BC713B2D6CF3C73FAC7EBD9E7DA59" KeyPath="yes" Source="fio\bin\cygncurses++-9.dll" />
+ <Component Id="cygncursespp_10" Guid="{02ecd011-d86c-4400-97b3-65dbcddbb5d9}">
+ <File Id="cygncursespp_10" KeyPath="yes" Source="fio\bin\cygncurses++-10.dll" />
</Component>
- <Component Id="cmp30425E1537382CBE87A8582C3712DA6D" Guid="{43895BDD-58DD-4EA9-96A2-A17EADD13C65}">
- <File Id="fil346312AAE49BBD0EDE977120B93991EE" KeyPath="yes" Source="fio\bin\cygncurses-9.dll" />
+ <Component Id="cygncurses_10" Guid="{2ce11a26-c1d8-46d3-86ef-8545685a44b2}">
+ <File Id="cygncurses_10" KeyPath="yes" Source="fio\bin\cygncurses-10.dll" />
+ </Component>
+ <Component Id="cygncursesw_10" Guid="44fe569a-375f-4103-93e9-0dc4195efb89">
+ <File Id="cygncursesw_10" KeyPath="yes" Source="fio\bin\cygncursesw-10.dll" />
</Component>
<Component Id="cmp9B2CF01422C767668980462815CBD1FC" Guid="{55DD475C-5E0B-4C46-93BF-6D9E44B44CDC}">
<File Id="filC2E6ED6705CC982EC3E7FE8F1089AD7A" KeyPath="yes" Source="fio\bin\cygreadline7.dll" />
@@ -6408,6 +6411,7 @@
</Fragment>
<Fragment>
<ComponentGroup Id="cygwin">
+ <ComponentRef Id="cygncursesw_10" />
<ComponentRef Id="cmpB647D75194B1BE4C7C89501B755FB631" />
<ComponentRef Id="cmp0632DB51E5BC3C2DABB6D68937C68C14" />
<ComponentRef Id="cmpB4B196A767932EB43E26C3FDB12F34A5" />
@@ -6415,8 +6419,8 @@
<ComponentRef Id="cmp426BE94F315430D90C59934ECCE4A484" />
<ComponentRef Id="cmpB233C0A559F9EB1AFE292982562F1ECC" />
<ComponentRef Id="cmp229D68D422FB0EB697971491C1475142" />
- <ComponentRef Id="cmpFCBAB68E4A226C62E32EF283AA1ABC5A" />
- <ComponentRef Id="cmp30425E1537382CBE87A8582C3712DA6D" />
+ <ComponentRef Id="cygncursespp_10" />
+ <ComponentRef Id="cygncurses_10" />
<ComponentRef Id="cmp9B2CF01422C767668980462815CBD1FC" />
<ComponentRef Id="cmpF04F051EF4B7C676F1989889D664CEBF" />
<ComponentRef Id="cmp6B8D3319D753D33FA084D14C712FFE56" />
diff --git a/os/windows/dobuild.cmd b/os/windows/dobuild.cmd
index fa855a2e..95543d75 100755
--- a/os/windows/dobuild.cmd
+++ b/os/windows/dobuild.cmd
@@ -1,4 +1,4 @@
-"%WIX%\bin\candle" cygwin.wxs
-"%WIX%\bin\candle" install.wxs
-"%WIX%\bin\candle" examples.wxs
-"%WIX%\bin\light" install.wixobj cygwin.wixobj examples.wixobj -ext WixUIExtension -out fio.msi \ No newline at end of file
+"%WIX%bin\candle" cygwin.wxs
+"%WIX%bin\candle" install.wxs
+"%WIX%bin\candle" examples.wxs
+"%WIX%bin\light" install.wixobj cygwin.wixobj examples.wixobj -ext WixUIExtension -out fio.msi \ No newline at end of file