| Message ID | 20230619132934.76085-2-frank@lichtenheld.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Various dist-related fixes | expand |
Acked-by: Gert Doering <gert@greenie.muc.de> There is not much meat to the patch, except "bundle a few extra files", so this is what I tested. Diffing "make dist" created tarballs with and without this patch confirms "it adds vcpkg.json + git-version.py". Your patch has been applied to the master and release/2.6 branch. commit 6801260dba38ae99f8726c2840ddf6bed57ee1d0 (master) commit af60fdc7d57462ed2509cb5247dc6e394451fa8d (release/2.6) Author: Frank Lichtenheld Date: Mon Jun 19 15:29:31 2023 +0200 dist: add more missing files only used in the MSVC build Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <20230619132934.76085-2-frank@lichtenheld.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26748.html Signed-off-by: Gert Doering <gert@greenie.muc.de> -- kind regards, Gert Doering
diff --git a/build/msvc/msvc-generate/Makefile.am b/build/msvc/msvc-generate/Makefile.am index 9d04326d..fe13b370 100644 --- a/build/msvc/msvc-generate/Makefile.am +++ b/build/msvc/msvc-generate/Makefile.am @@ -13,6 +13,7 @@ MAINTAINERCLEANFILES = \ $(srcdir)/Makefile.in dist_noinst_DATA = \ + git-version.py \ msvc-generate.vcxproj \ Makefile.mak \ msvc-generate.js \ diff --git a/src/openvpn/Makefile.am b/src/openvpn/Makefile.am index a8e44528..2f979914 100644 --- a/src/openvpn/Makefile.am +++ b/src/openvpn/Makefile.am @@ -16,7 +16,8 @@ MAINTAINERCLEANFILES = \ EXTRA_DIST = \ openvpn.vcxproj \ - openvpn.manifest + openvpn.manifest \ + vcpkg.json AM_CPPFLAGS = \ -I$(top_srcdir)/include \
So it is possible to build with MSVC from the release tarballs. Fixes #344. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com> --- build/msvc/msvc-generate/Makefile.am | 1 + src/openvpn/Makefile.am | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) Note: unchanged from previous submission