summaryrefslogtreecommitdiffstats
path: root/win/build_all.py
diff options
context:
space:
mode:
authorSamuli Seppänen <samuli@openvpn.net>2011-03-08 16:07:49 +0200
committerDavid Sommerseth <davids@redhat.com>2011-03-21 15:15:12 +0100
commit0c03c731a80399998cc4b03a35ffad2961c7b369 (patch)
tree9bfd3ff8c63e0d8f63ba8102ea691402b075d6b8 /win/build_all.py
parent0265cf3a6b646cc02a78cc3501dce77f99e81a5f (diff)
downloadopenvpn-0c03c731a80399998cc4b03a35ffad2961c7b369.tar.gz
openvpn-0c03c731a80399998cc4b03a35ffad2961c7b369.tar.xz
openvpn-0c03c731a80399998cc4b03a35ffad2961c7b369.zip
Added support for prebuilt TAP-drivers. Automated embedding manifests.
Removed win/make_dist.py's dependency on TAP-driver and tapinstall.exe building. Also added manifest embedding commands to win/make_dist.py. To avoid duplicate code moved the "build_vc" method from win/build.py to win/wb.py and renamed it "run_in_vs_shell". Signed-off-by: Samuli Seppänen <samuli@openvpn.net> Acked-by: James Yonan <james@openvpn.net> Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'win/build_all.py')
-rw-r--r--win/build_all.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/win/build_all.py b/win/build_all.py
index 2c4d1aa..47716a1 100644
--- a/win/build_all.py
+++ b/win/build_all.py
@@ -54,13 +54,14 @@ def main(config):
if tap:
build_ddk(config, 'tap', 'all')
build_ddk(config, 'tapinstall', 'all')
- else:
- print "Not building the TAP driver"
-
- if signedBuild:
- sign(config, 'all')
+ if signedBuild:
+ sign(config, 'all')
+ make_dist(config,tap=True)
- make_dist(config)
+ else:
+ if 'TAP_PREBUILT' in config:
+ print "Using prebuilt TAP driver"
+ make_dist(config,tap=False)
# if we are run directly, and not loaded as a module
if __name__ == "__main__":