exec commands in MSBUILD *.proj files didn't handle spaces in directory names

diff --git a/win/win32/vs2017/NetHackProperties.props b/win/win32/vs2017/NetHackProperties.props
index 83ce4c99440405152e69e73fdd61cd75bb0315a7..a2102753ae0cedbf1e0064e0e1a16d059632584e 100644 (file)
--- a/win/win32/vs2017/NetHackProperties.props
+++ b/win/win32/vs2017/NetHackProperties.props
@@ -4,7 +4,7 @@
   <PropertyGroup Label="UserMacros">
     <VERSION_MAJOR>3</VERSION_MAJOR>
     <VERSION_MINOR>6</VERSION_MINOR>
-    <PATCHLEVEL>3</PATCHLEVEL>
+    <PATCHLEVEL>5</PATCHLEVEL>
   </PropertyGroup>
   <PropertyGroup />
   <ItemDefinitionGroup />

diff --git a/win/win32/vs2017/afterdgncomp.proj b/win/win32/vs2017/afterdgncomp.proj
index 38aee32470f7d8e1fa49943ebf3141db65c91d54..90a8aea1c28598457a3886bdf3562d66e3e0796f 100644 (file)
--- a/win/win32/vs2017/afterdgncomp.proj
+++ b/win/win32/vs2017/afterdgncomp.proj
@@ -4,7 +4,7 @@
   <Target Name="Build"
      Inputs="$(ToolsDir)dgncomp.exe;$(DatDir)dungeon.pdf"
         Outputs="$(DatDir)dungeon">
-       <Exec Command="$(ToolsDir)dgncomp.exe dungeon.pdf" WorkingDirectory="$(DatDir)"/>
+       <Exec Command="&quot;$(ToolsDir)dgncomp.exe&quot; dungeon.pdf" WorkingDirectory="$(DatDir)"/>
   </Target>
   <Target Name="Clean">
        <Delete Files="$(DatDir)dungeon"/>

diff --git a/win/win32/vs2017/afterdlb.proj b/win/win32/vs2017/afterdlb.proj
index fd78ff29f4ff17e9ce95f0cfb8525d33e88e8a6d..807fdf7c76607944ab87d97904ae8927a19100d3 100644 (file)
--- a/win/win32/vs2017/afterdlb.proj
+++ b/win/win32/vs2017/afterdlb.proj
@@ -7,7 +7,7 @@
 
        <Copy SourceFiles="$(SysWinntDir)porthelp" DestinationFolder="$(DatDir)"/>
        <WriteLinesToFile File="$(DatDir)dlb.lst" Lines="@(DlbList->'%(filename)%(extension)')" Overwrite="true"/>
-       <Exec Command="$(ToolsDir)dlb.exe cIf $(DatDir)dlb.lst $(BinDir)nhdat" WorkingDirectory="$(DatDir)"/>
+       <Exec Command="&quot;$(ToolsDir)dlb.exe&quot; cIf dlb.lst &quot;$(BinDir)nhdat&quot;" WorkingDirectory="$(DatDir)"/>
        <Delete Files="$(DatDir)porthelp"/>
 
        </Target>

diff --git a/win/win32/vs2017/afterlevcomp.proj b/win/win32/vs2017/afterlevcomp.proj
index c0d8dd4642ad9c14cada998796505d0668d4fdd2..a167c006152740ee87236b57235fc180d12dff92 100644 (file)
--- a/win/win32/vs2017/afterlevcomp.proj
+++ b/win/win32/vs2017/afterlevcomp.proj
@@ -4,7 +4,7 @@
   <Target Name="Build"
      Inputs="@(Desfiles->'$(DatDir)%(filename)%(extension)');$(BinDir)levcomp.exe"
         Outputs="@(Levfiles->'$(DatDir)%(filename)%(extension)')">
-       <Exec Command="$(ToolsDir)levcomp.exe @(Desfiles, ' ')" WorkingDirectory="$(DatDir)"/>
+       <Exec Command="&quot;$(ToolsDir)levcomp.exe&quot; @(Desfiles, ' ')" WorkingDirectory="$(DatDir)"/>
   </Target>
   <Target Name="Clean">
        <Delete Files="@(Levfiles->'$(DatDir)%(filename)%(extension)')"/>

diff --git a/win/win32/vs2017/aftermakedefs.proj b/win/win32/vs2017/aftermakedefs.proj
index 4ebea25a4e0634e3ae14f49435c52fb8b21bd1ae..845817c46355893189e5be71cfb2cd96c94b0310 100644 (file)
--- a/win/win32/vs2017/aftermakedefs.proj
+++ b/win/win32/vs2017/aftermakedefs.proj
@@ -4,16 +4,16 @@
   <Target Name="Build"
      Inputs="$(ToolsDir)makedefs.exe"
         Outputs="@(Defs)">
-       <Exec Command="$(ToolsDir)makedefs.exe -v" WorkingDirectory="$(UtilDir)"/>
-       <Exec Command="$(ToolsDir)makedefs.exe -o" WorkingDirectory="$(UtilDir)"/>
-       <Exec Command="$(ToolsDir)makedefs.exe -p" WorkingDirectory="$(UtilDir)"/>
-       <Exec Command="$(ToolsDir)makedefs.exe -z" WorkingDirectory="$(UtilDir)"/>
-       <Exec Command="$(ToolsDir)makedefs.exe -d" WorkingDirectory="$(DatDir)"/>
-       <Exec Command="$(ToolsDir)makedefs.exe -r" WorkingDirectory="$(DatDir)"/>
-       <Exec Command="$(ToolsDir)makedefs.exe -s" WorkingDirectory="$(DatDir)"/>
-       <Exec Command="$(ToolsDir)makedefs.exe -q" WorkingDirectory="$(DatDir)"/>
-       <Exec Command="$(ToolsDir)makedefs.exe -h" WorkingDirectory="$(DatDir)"/>
-       <Exec Command="$(ToolsDir)makedefs.exe -e" WorkingDirectory="$(DatDir)"/>
+       <Exec Command="&quot;$(ToolsDir)makedefs.exe&quot; -v" WorkingDirectory="$(UtilDir)"/>
+       <Exec Command="&quot;$(ToolsDir)makedefs.exe&quot; -o" WorkingDirectory="$(UtilDir)"/>
+       <Exec Command="&quot;$(ToolsDir)makedefs.exe&quot; -p" WorkingDirectory="$(UtilDir)"/>
+       <Exec Command="&quot;$(ToolsDir)makedefs.exe&quot; -z" WorkingDirectory="$(UtilDir)"/>
+       <Exec Command="&quot;$(ToolsDir)makedefs.exe&quot; -d" WorkingDirectory="$(DatDir)"/>
+       <Exec Command="&quot;$(ToolsDir)makedefs.exe&quot; -r" WorkingDirectory="$(DatDir)"/>
+       <Exec Command="&quot;$(ToolsDir)makedefs.exe&quot; -s" WorkingDirectory="$(DatDir)"/>
+       <Exec Command="&quot;$(ToolsDir)makedefs.exe&quot; -q" WorkingDirectory="$(DatDir)"/>
+       <Exec Command="&quot;$(ToolsDir)makedefs.exe&quot; -h" WorkingDirectory="$(DatDir)"/>
+       <Exec Command="&quot;$(ToolsDir)makedefs.exe&quot; -e" WorkingDirectory="$(DatDir)"/>
   </Target>
   <Target Name="Clean">
        <Delete Files="@(Defs)"/>

diff --git a/win/win32/vs2017/aftertile2bmp.proj b/win/win32/vs2017/aftertile2bmp.proj
index 44e03122320d97bb81927b52a253890ac794e2cc..5fd6d13b0dc14094d881cfecca2cf4dbdbae9116 100644 (file)
--- a/win/win32/vs2017/aftertile2bmp.proj
+++ b/win/win32/vs2017/aftertile2bmp.proj
@@ -4,7 +4,7 @@
   <Target Name="Build"
      Inputs="$(ToolsDir)tile2bmp.exe;$(WinShareDir)monsters.txt;$(WinShareDir)objects.txt"
         Outputs="$(WinWin32Dir)tiles.bmp">
-       <Exec Command="$(ToolsDir)tile2bmp.exe tiles.bmp" WorkingDirectory="$(SrcDir)"/>
+       <Exec Command="&quot;$(ToolsDir)tile2bmp.exe&quot; tiles.bmp" WorkingDirectory="$(SrcDir)"/>
        <Move SourceFiles="$(SrcDir)tiles.bmp" DestinationFolder="$(WinWin32Dir)"/>
   </Target>
   <Target Name="Clean">

diff --git a/win/win32/vs2017/aftertilemap.proj b/win/win32/vs2017/aftertilemap.proj
index d68eabab95368f7a40df5e66c9b6deea1a19ca5f..e576f8b8909c9224a538a60e678783a01442d056 100644 (file)
--- a/win/win32/vs2017/aftertilemap.proj
+++ b/win/win32/vs2017/aftertilemap.proj
@@ -4,7 +4,7 @@
   <Target Name="Build"
      Inputs="$(ToolsDir)tilemap.exe"
         Outputs="$(SrcDir)tile.c">
-       <Exec Command="$(ToolsDir)tilemap.exe" WorkingDirectory="$(SrcDir)"/>
+       <Exec Command="&quot;$(ToolsDir)tilemap.exe&quot;" WorkingDirectory="$(SrcDir)"/>
   </Target>
   <Target Name="Clean">
        <Delete Files="$(SrcDir)tile.c"/>

diff --git a/win/win32/vs2017/afteruudecode.proj b/win/win32/vs2017/afteruudecode.proj
index fd0370be4a199b3c4be56cde7d7118ca24711740..7f81188ae3c36d5b8b2d0044a30b669e0652517a 100644 (file)
--- a/win/win32/vs2017/afteruudecode.proj
+++ b/win/win32/vs2017/afteruudecode.proj
@@ -4,15 +4,15 @@
   <Target Name="Build"
      Inputs="$(ToolsDir)uudecode.exe;@(UUFiles)"
         Outputs="@(IconFiles);@(BmpFiles);@(RecordFiles)">
-       <Exec Command="$(ToolsDir)uudecode.exe $(SysWinntDir)nhico.uu" WorkingDirectory="$(WinWin32Dir)"/>
-       <Exec Command="$(ToolsDir)uudecode.exe $(WinWin32Dir)mnsel.uu" WorkingDirectory="$(WinWin32Dir)"/>
-       <Exec Command="$(ToolsDir)uudecode.exe $(WinWin32Dir)mnselcnt.uu" WorkingDirectory="$(WinWin32Dir)"/>
-       <Exec Command="$(ToolsDir)uudecode.exe $(WinWin32Dir)mnunsel.uu" WorkingDirectory="$(WinWin32Dir)"/>
-       <Exec Command="$(ToolsDir)uudecode.exe $(WinWin32Dir)petmark.uu" WorkingDirectory="$(WinWin32Dir)"/>
-       <Exec Command="$(ToolsDir)uudecode.exe $(WinWin32Dir)pilemark.uu" WorkingDirectory="$(WinWin32Dir)"/>
-       <Exec Command="$(ToolsDir)uudecode.exe $(WinWin32Dir)splash.uu" WorkingDirectory="$(WinWin32Dir)"/>
-       <Exec Command="$(ToolsDir)uudecode.exe $(WinWin32Dir)rip.uu" WorkingDirectory="$(WinWin32Dir)"/>
-       <Exec Command="$(ToolsDir)uudecode.exe $(WinWin32Dir)record.uu" WorkingDirectory="$(WinWin32Dir)"/>
+       <Exec Command="&quot;$(ToolsDir)uudecode.exe&quot; &quot;$(SysWinntDir)nhico.uu&quot;" WorkingDirectory="$(WinWin32Dir)"/>
+       <Exec Command="&quot;$(ToolsDir)uudecode.exe&quot; &quot;$(WinWin32Dir)mnsel.uu&quot;" WorkingDirectory="$(WinWin32Dir)"/>
+       <Exec Command="&quot;$(ToolsDir)uudecode.exe&quot; &quot;$(WinWin32Dir)mnselcnt.uu&quot;" WorkingDirectory="$(WinWin32Dir)"/>
+       <Exec Command="&quot;$(ToolsDir)uudecode.exe&quot; &quot;$(WinWin32Dir)mnunsel.uu&quot;" WorkingDirectory="$(WinWin32Dir)"/>
+       <Exec Command="&quot;$(ToolsDir)uudecode.exe&quot; &quot;$(WinWin32Dir)petmark.uu&quot;" WorkingDirectory="$(WinWin32Dir)"/>
+       <Exec Command="&quot;$(ToolsDir)uudecode.exe&quot; &quot;$(WinWin32Dir)pilemark.uu&quot;" WorkingDirectory="$(WinWin32Dir)"/>
+       <Exec Command="&quot;$(ToolsDir)uudecode.exe&quot; &quot;$(WinWin32Dir)splash.uu&quot;" WorkingDirectory="$(WinWin32Dir)"/>
+       <Exec Command="&quot;$(ToolsDir)uudecode.exe&quot; &quot;$(WinWin32Dir)rip.uu&quot;" WorkingDirectory="$(WinWin32Dir)"/>
+       <Exec Command="&quot;$(ToolsDir)uudecode.exe&quot; &quot;$(WinWin32Dir)record.uu&quot;" WorkingDirectory="$(WinWin32Dir)"/>
   </Target>
   <Target Name="Clean">
        <Delete Files="@(IconFiles);@(BmpFiles);@(RecordFiles)"/>