aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorCalvin Rose <calsrose@gmail.com>2026-02-14 21:11:28 -0600
committerCalvin Rose <calsrose@gmail.com>2026-02-14 21:11:28 -0600
commit0aa7dfeb9a19d1892473c07d8099b1790a84e622 (patch)
treeb4a11c9381d005907f83bdf4f6a012fbd6906e5b /tools
parentUpdate for msvc build. (diff)
Work on windows for WSAConnect not working.
For remote connections, if you did not manually wait for the connection to settle, the programmer would see unspecified network errors. This is is because the underlying TCP Connection had not been established yet. The correct way to deal with this is to use ConnectEx if available instead of WSAConnect.
Diffstat (limited to 'tools')
-rw-r--r--tools/msi/janet.wxs6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/msi/janet.wxs b/tools/msi/janet.wxs
index d14cfa5a..5269806f 100644
--- a/tools/msi/janet.wxs
+++ b/tools/msi/janet.wxs
@@ -87,7 +87,9 @@
<Directory Id="BinDir" Name="bin"/>
<Directory Id="CDir" Name="C"/>
<Directory Id="DocsDir" Name="docs"/>
- <Directory Id="LibraryDir" Name="Library"/>
+ <Directory Id="LibraryDir" Name="Library">
+ <Directory Id="LibBinDir" Name="bin"/>
+ </Directory>
</Directory>
</Directory>
<Directory Id="ProgramMenuFolder">
@@ -169,6 +171,7 @@
<Component Id="SetEnvVarsPerMachine" Directory="ApplicationProgramsFolder" Guid="57b1e1ef-89c8-4ce4-9f0f-37618677c5a4" KeyPath="yes">
<Condition>ALLUSERS=1</Condition>
<Environment Id="PATH_PERMACHINE" Name="PATH" Value="[BinDir]" Action="set" Permanent="no" System="yes" Part="last"/>
+ <Environment Id="PATH2_PERMACHINE" Name="PATH" Value="[LibBinDir]" Action="set" Permanent="no" System="yes" Part="last"/>
<Environment Id="JANET_BINPATH_PERMACHINE" Name="JANET_BINPATH" Value="[BinDir]" Action="set" Permanent="no" System="yes"/>
<Environment Id="JANET_MANPATH_PERMACHINE" Name="JANET_MANPATH" Value="[DocsDir]" Action="set" Permanent="no" System="yes"/>
<Environment Id="JANET_PATH_PERMACHINE" Name="JANET_PATH" Value="[LibraryDir]" Action="set" Permanent="no" System="yes" />
@@ -178,6 +181,7 @@
<Component Id="SetEnvVarsPerUser" Directory="ApplicationProgramsFolder" Guid="128be307-488b-49aa-971a-d2ae00a1a584" KeyPath="yes">
<Condition>NOT ALLUSERS=1</Condition>
<Environment Id="PATH_PERUSER" Name="PATH" Value="[BinDir]" Action="set" Permanent="no" System="no" Part="last"/>
+ <Environment Id="PATH2_PERUSER" Name="PATH" Value="[LibBinDir]" Action="set" Permanent="no" System="no" Part="last"/>
<Environment Id="JANET_BINPATH_PERUSER" Name="JANET_BINPATH" Value="[BinDir]" Action="set" Permanent="no" System="no"/>
<Environment Id="JANET_MANPATH_PERUSER" Name="JANET_MANPATH" Value="[DocsDir]" Action="set" Permanent="no" System="no"/>
<Environment Id="JANET_PATH_PERUSER" Name="JANET_PATH" Value="[LibraryDir]" Action="set" Permanent="no" System="no" />