diff options
| author | Samuli Seppänen <samuli@openvpn.net> | 2011-02-11 16:20:43 +0200 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2011-02-27 00:55:38 +0100 |
| commit | 5e0b636ba6cb26a69ce5e863526e44d0fbd33ffc (patch) | |
| tree | 8d07925ab41801ba0bd83fcd102a4f602e6903a0 /win/build.py | |
| parent | Added configure.h and version.m4 variable parsing to win/config.py (diff) | |
| download | openvpn-5e0b636ba6cb26a69ce5e863526e44d0fbd33ffc.tar.xz | |
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>
Diffstat (limited to '')
| -rw-r--r-- | win/build.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/win/build.py b/win/build.py index 3a9fbc7..fdec7cf 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__":
|