Skip to contentSkip to conversation

Generate openvpn-plugin.h for MSVC build

PATCH In review Lev Stipakov 2 participants 2 messages Oct 22, 2015

lore
Share & tools
lore

Lev Stipakov

author
#0 lore raw

PATCH 1/1 Generate openvpn-plugin.h for MSVC build

openvpn-plugin.h was not generated for MSVC build since it has been removed from sources and made generated by configure script.

This fix generates it for MSVC build and substitutes macroses like @OPENVPN_VERSION_MAJOR@ with actual values.

Signed-off-by Lev Stipakov <[email protected]...>
---
 build/msvc/msvc-generate/Makefile.mak  | 27 +++++++++++++++++++++------
 build/msvc/msvc-generate/version.m4.in |  3 +++
 2 files changed, 24 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 build/msvc/msvc-generate/Makefile.mak
 create mode 100644 build/msvc/msvc-generate/version.m4.in
build/msvc/msvc-generate/Makefile.mak +21 -6
old mode 100755
new mode 100644
index 72415f1..be72643
@@ -1,13 +1,28 @@
 # Copyright (C) 2008-2012 Alon Bar-Lev <[email protected]...>
 
 CONFIG=$(SOURCEBASE)/version.m4
-INPUT=$(SOURCEBASE)/config-msvc-version.h.in
-OUTPUT=$(SOURCEBASE)/config-msvc-version.h
 
-all:	$(OUTPUT)
+INPUT_MSVC_VER=$(SOURCEBASE)/config-msvc-version.h.in
+OUTPUT_MSVC_VER=$(SOURCEBASE)/config-msvc-version.h
 
-$(OUTPUT): $(INPUT) $(CONFIG)
-	cscript //nologo msvc-generate.js --config="$(CONFIG)" --input="$(INPUT)" --output="$(OUTPUT)"
+INPUT_PLUGIN=$(SOURCEBASE)/include/openvpn-plugin.h.in
+OUTPUT_PLUGIN=$(SOURCEBASE)/include/openvpn-plugin.h
+
+INPUT_PLUGIN_CONFIG=version.m4.in
+OUTPUT_PLUGIN_CONFIG=version.m4
+
+all:	$(OUTPUT_MSVC_VER) $(OUTPUT_PLUGIN)
+
+$(OUTPUT_MSVC_VER): $(INPUT_MSVC_VER) $(CONFIG) 
+	cscript //nologo msvc-generate.js --config="$(CONFIG)" --input="$(INPUT_MSVC_VER)" --output="$(OUTPUT_MSVC_VER)"
+
+$(OUTPUT_PLUGIN_CONFIG): $(INPUT_PLUGIN_CONFIG)
+	cscript //nologo msvc-generate.js --config="$(CONFIG)" --input="$(INPUT_PLUGIN_CONFIG)" --output="$(OUTPUT_PLUGIN_CONFIG)"	
+
+$(OUTPUT_PLUGIN): $(INPUT_PLUGIN) $(OUTPUT_PLUGIN_CONFIG)
+	cscript //nologo msvc-generate.js --config="$(OUTPUT_PLUGIN_CONFIG)" --input="$(INPUT_PLUGIN)" --output="$(OUTPUT_PLUGIN)"
 
 clean:
-	-del "$(OUTPUT)"
+	-del "$(OUTPUT_MSVC_VER)"
+	-del "$(OUTPUT_PLUGIN)"
+	-del "$(OUTPUT_PLUGIN_CONFIG)"
build/msvc/msvc-generate/version.m4.in new file +3 -0
new file mode 100644
index 0000000..cbb4fef
@@ -0,0 +1,3 @@
+define([OPENVPN_VERSION_MAJOR], [@PRODUCT_VERSION_MAJOR@])
+define([OPENVPN_VERSION_MINOR], [@PRODUCT_VERSION_MINOR@])
+define([OPENVPN_VERSION_PATCH], [@PRODUCT_VERSION_PATCH@])
Signature · 1 line
1.9.1
#1 lore raw

ACK. I have no idea what it does in particular, but as it does only touch files for MSVC build and this basically affects only you and (possibly) James, I just trust you :-)

Your patch has been applied to the master branch.

commit dd8d351dbc92ede6726b7090ed4eceb9b95318c6

Author: Lev Stipakov
Date:   Thu Oct 22 10:51:22 2015 +0300
     Generate openvpn-plugin.h for MSVC build

     Signed-off-by: Lev Stipakov <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: http://article.gmane.org/gmane.network.openvpn.devel/10360
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering