From: Samuli Seppänen <samuli@openvpn.net>
Date: Fri, 11 Feb 2011 14:20:43 +0000 (+0200)
Subject: Added openvpnserv.exe building to win/build.py
X-Git-Tag: v2.2-RC~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e0b636ba6cb26a69ce5e863526e44d0fbd33ffc;p=thirdparty%2Fopenvpn.git

Added openvpnserv.exe building to win/build.py

Made win/build.py call nmake in service-win32 directory to build openvpnserv.exe
after main build (openvpn.exe) has finished.

Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: James Yonan <james@openvpn.net>
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
---

diff --git a/win/build.py b/win/build.py
index 3a9fbc7ca..fdec7cf3f 100644
--- a/win/build.py
+++ b/win/build.py
@@ -1,18 +1,25 @@
 import os, sys
-from wb import system, config, home_fn, cd_home
+from wb import system, config, home_fn, cd_home, cd_service_win32
 
 os.environ['PATH'] += ";%s\\VC" % (os.path.normpath(config['MSVC']),)
 
 def build_vc(cmd):
+    """Make sure environment variables are setup before build"""
     system('cmd /c "vcvarsall.bat x86 && %s"' % (cmd,))
 
 def main():
+    """Build openvpn.exe and openvpnserv.exe"""
     cd_home()
     build_vc("nmake /f %s" % (home_fn('msvc.mak'),))
+    cd_service_win32()
+    build_vc("nmake /f %s" % ('msvc.mak'))
 
 def clean():
+    """Clean up after openvpn.exe and openvpnserv.exe build"""
     cd_home()
     build_vc("nmake /f %s clean" % (home_fn('msvc.mak'),))
+    os.chdir("service-win32")
+    build_vc("nmake /f %s clean" % ('msvc.mak'))
 
 # if we are run directly, and not loaded as a module
 if __name__ == "__main__":