diff options
| author | Lev Stipakov | 2015-10-22 10:51:22 +0300 |
|---|---|---|
| committer | Gert Doering | 2015-10-22 19:47:28 +0200 |
| commit | dd8d351dbc92ede6726b7090ed4eceb9b95318c6 (patch) | |
| tree | 8bb7973cb8dbc005a9fe654e85ebc98a5e519bf4 /build | |
| parent | e8a9e3203bf00605dae000d31095076ae038491c (diff) | |
| download | openvpn-dd8d351dbc92ede6726b7090ed4eceb9b95318c6.zip openvpn-dd8d351dbc92ede6726b7090ed4eceb9b95318c6.tar.gz | |
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 <lstipakov@gmail.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1445500282-23129-1-git-send-email-lstipakov@gmail.com>
URL: http://article.gmane.org/gmane.network.openvpn.devel/10360
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'build')
| -rw-r--r--[-rwxr-xr-x] | build/msvc/msvc-generate/Makefile.mak | 27 | ||||
| -rw-r--r-- | build/msvc/msvc-generate/version.m4.in | 3 |
2 files changed, 24 insertions, 6 deletions
diff --git a/build/msvc/msvc-generate/Makefile.mak b/build/msvc/msvc-generate/Makefile.mak index 72415f1..59fc9f0 100755..100644 --- a/build/msvc/msvc-generate/Makefile.mak +++ b/build/msvc/msvc-generate/Makefile.mak @@ -1,13 +1,28 @@ # Copyright (C) 2008-2012 Alon Bar-Lev <alon.barlev@gmail.com> 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)" diff --git a/build/msvc/msvc-generate/version.m4.in b/build/msvc/msvc-generate/version.m4.in new file mode 100644 index 0000000..cbb4fef --- /dev/null +++ b/build/msvc/msvc-generate/version.m4.in @@ -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@]) |