[Openvpn-devel] Reference msvc-generate from compat to assure correct build order

Message ID 20181008100323.11308-1-simon@rozman.si
State Accepted
Headers show
Series
  • [Openvpn-devel] Reference msvc-generate from compat to assure correct build order
Related show

Commit Message

Simon Rozman Oct. 8, 2018, 10:03 a.m.
Single-process builds start building compat project first and they fail,
since the referenced config-msvc-version.h is not available yet. Multi-
process rebuilds also tends to fail if the compat project is built
faster than msvc-generate is able to produce the required output files.

Adding a reference to msvc-generate project assures correct build order.
---
 src/compat/compat.vcxproj | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Lev Stipakov Oct. 8, 2018, 11:33 a.m. | #1
Acked-by: Lev Stipakov <lev@openvpn.net>

ma 8. lokak. 2018 klo 13.05 Simon Rozman (simon@rozman.si) kirjoitti:

> Single-process builds start building compat project first and they fail,
> since the referenced config-msvc-version.h is not available yet. Multi-
> process rebuilds also tends to fail if the compat project is built
> faster than msvc-generate is able to produce the required output files.
>
> Adding a reference to msvc-generate project assures correct build order.
> ---
>  src/compat/compat.vcxproj | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/src/compat/compat.vcxproj b/src/compat/compat.vcxproj
> index 07d6baf1..d6473581 100644
> --- a/src/compat/compat.vcxproj
> +++ b/src/compat/compat.vcxproj
> @@ -143,6 +143,12 @@
>    <ItemGroup>
>      <ClInclude Include="compat.h" />
>    </ItemGroup>
> +  <ItemGroup>
> +    <ProjectReference
> Include="..\..\build\msvc\msvc-generate\msvc-generate.vcxproj">
> +      <Project>{8598c2c8-34c4-47a1-99b0-7c295a890615}</Project>
> +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
> +    </ProjectReference>
> +  </ItemGroup>
>    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
>    <ImportGroup Label="ExtensionTargets">
>    </ImportGroup>
> --
> 2.19.0.windows.1
>
>
>
> _______________________________________________
> Openvpn-devel mailing list
> Openvpn-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/openvpn-devel
>
Gert Doering Oct. 8, 2018, 2:15 p.m. | #2
"The XML looks reasonable and it does not affect anything else" :-)

Your patch has been applied to the master branch.

commit 354dd0e04228b813a1753da0f38836198c09f68b
Author: Simon Rozman
Date:   Mon Oct 8 12:03:23 2018 +0200

     Reference msvc-generate from compat to assure correct build order

     Acked-by: Lev Stipakov <lstipakov@gmail.com>
     Message-Id: <20181008100323.11308-1-simon@rozman.si>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg17635.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/src/compat/compat.vcxproj b/src/compat/compat.vcxproj
index 07d6baf1..d6473581 100644
--- a/src/compat/compat.vcxproj
+++ b/src/compat/compat.vcxproj
@@ -143,6 +143,12 @@ 
   <ItemGroup>
     <ClInclude Include="compat.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\build\msvc\msvc-generate\msvc-generate.vcxproj">
+      <Project>{8598c2c8-34c4-47a1-99b0-7c295a890615}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>