From 182393b4a2a5d54674fa5e4a5a28ff7050e58374 Mon Sep 17 00:00:00 2001
From: pleroy <phl+personal@google.com>
Date: Mon, 1 Jan 2018 18:16:29 +0100
Subject: [PATCH] Make sure that JS embedding works in a path that has spaces
 in its name.

---
 vsprojects/libprotoc.vcxproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vsprojects/libprotoc.vcxproj b/vsprojects/libprotoc.vcxproj
index 49400cca3ba9d..d1c09776b6d9e 100644
--- a/vsprojects/libprotoc.vcxproj
+++ b/vsprojects/libprotoc.vcxproj
@@ -310,16 +310,16 @@
     <ClCompile Include="..\src\google\protobuf\compiler\java\java_string_field.cc" />
     <ClCompile Include="..\src\google\protobuf\compiler\java\java_string_field_lite.cc" />
     <CustomBuild Include="..\src\google\protobuf\compiler\js\embed.cc">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\js_embed.exe $(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types\any.js $(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types\struct.js $(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types\timestamp.js &gt;$(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types_embed.cc</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(SolutionDir)$(Configuration)\js_embed.exe" "$(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types\any.js" "$(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types\struct.js" "$(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types\timestamp.js" &gt;"$(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types_embed.cc"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Buiding JS embedded well-known types</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types_embed.cc</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\js_embed.exe $(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types\any.js $(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types\struct.js $(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types\timestamp.js &gt;$(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types_embed.cc</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(SolutionDir)$(Configuration)\js_embed.exe" "$(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types\any.js" "$(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types\struct.js" "$(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types\timestamp.js" &gt;"$(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types_embed.cc"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Buiding JS embedded well-known types</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types_embed.cc</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)\js_embed.exe $(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types\any.js $(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types\struct.js $(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types\timestamp.js &gt;$(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types_embed.cc</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(SolutionDir)$(Configuration)\js_embed.exe" "$(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types\any.js" "$(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types\struct.js" "$(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types\timestamp.js" &gt;"$(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types_embed.cc"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Buiding JS embedded well-known types</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types_embed.cc</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)\js_embed.exe $(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types\any.js $(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types\struct.js $(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types\timestamp.js &gt;$(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types_embed.cc</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(SolutionDir)$(Configuration)\js_embed.exe" "$(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types\any.js" "$(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types\struct.js" "$(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types\timestamp.js" &gt;"$(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types_embed.cc"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Buiding JS embedded well-known types</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\src\google\protobuf\compiler\js\well_known_types_embed.cc</Outputs>
     </CustomBuild>