Attempt to fix issue where domake-win build system was not properlyv2.1.3

signing drivers and .exe files.

Added win/tap_span.py for building multiple versions of the TAP driver
and tapinstall binaries using different DDK versions to span from Win2K
to Win7 and beyond.

Version 2.1.3


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@6404 e7ae566f-a301-0410-adde-c780ea21d3b5

4 files changed, 169 insertions, 3 deletions

diff --git a/win/build_ddk.py b/win/build_ddk.py
index ca68e81..1a0cf82 100644
--- a/win/build_ddk.py
+++ b/win/build_ddk.py
@@ -2,9 +2,13 @@ import os
 from wb import system, home_fn, choose_arch

 

 def build_ddk(config, dir, x64):

-    setenv_bat = os.path.realpath(os.path.join(config['DDK_PATH'], 'bin/setenv.bat'))

+    ddk_path = config['DDK_PATH']

     ddk_major = int(config['DDKVER_MAJOR'])

     debug = 'PRODUCT_TAP_DEBUG' in config

+    return build_tap(ddk_path, ddk_major, debug, dir, x64)

+

+def build_tap(ddk_path, ddk_major, debug, dir, x64):

+    setenv_bat = os.path.realpath(os.path.join(ddk_path, 'bin/setenv.bat'))

     target = 'chk' if debug else 'fre'

     if x64:

         target += ' x64'

@@ -23,7 +27,7 @@ def build_ddk(config, dir, x64):
 

     system('cmd /c "%s %s %s && cd %s && build -cef"' % (

            setenv_bat,

-           os.path.realpath(config['DDK_PATH']),

+           os.path.realpath(ddk_path),

            target,

            dir

            ))

diff --git a/win/settings.in b/win/settings.in
index 0e1bb1c..f8eeb20 100644
--- a/win/settings.in
+++ b/win/settings.in
@@ -47,6 +47,9 @@
 !define DDK_PATH "c:/winddk/7600.16385.1"
 ;!define DDK_PATH "c:/winddk/6001.18002"
 
+# output path for tap_span.py
+!define TAP_DIST "tap_dist"
+
 # Visual studio path
 !define MSVC "C:/Program Files/Microsoft Visual Studio 9.0"
 
diff --git a/win/tap_span.py b/win/tap_span.py
new file mode 100644
index 0000000..9cd127b
--- /dev/null
+++ b/win/tap_span.py
@@ -0,0 +1,129 @@
+import sys, os, shutil

+from wb import config, home_fn, mod_fn, preprocess, autogen, dict_def, build_autodefs, rm_rf, mkdir_silent, cp

+if 'SIGNTOOL' in config:

+    sys.path.append(home_fn(config['SIGNTOOL']))

+from signtool import SignTool

+from build_ddk import build_tap

+

+ti_dir = "c:/src/tapinstall"

+hi = ("c:/winddk/7600.16385.1", 7600, 7600, ("i386", "amd64"))

+low = ("c:/winddk/6001.18002", 6001, 5600, ("win2k",))

+dest_top = home_fn('tap_build')

+dist = home_fn(config['TAP_DIST'])

+

+def copy_tap(src, dest, x64):

+    dir = os.path.join(src, { False : 'i386', True: 'amd64' }[x64])

+    mkdir_silent(dest)

+    for dirpath, dirnames, filenames in os.walk(dir):

+        for f in filenames:

+            root, ext = os.path.splitext(f)

+            if ext in ('.inf', '.cat', '.sys'):

+                cp(os.path.join(dir, f), dest)

+        break

+

+def copy_tapinstall(src, dest, x64):

+    base = { False : 'i386', True: 'amd64' }[x64]

+    mkdir_silent(dest)

+    for dirpath, dirnames, filenames in os.walk(home_fn(src)):

+        for f in filenames:

+            if f == 'tapinstall.exe':

+                dir_name = os.path.basename(dirpath)

+                s = os.path.join(dirpath, f)

+                if dir_name == base:

+                    cp(s, dest)

+

+def main():

+    rm_rf(dest_top)

+    os.mkdir(dest_top)

+

+    rm_rf(dist)

+    os.mkdir(dist)

+

+    for ver in hi, low:

+        top = os.path.join(dest_top, str(ver[1]))

+        os.mkdir(top)

+        tap_dest = os.path.join(top, "tap-win32")

+        ti_dest = os.path.join(top, "tapinstall")

+        ti_src = os.path.join(ti_dir, str(ver[2]))

+        shutil.copytree(home_fn("tap-win32"), tap_dest)

+        shutil.copytree(ti_src, ti_dest)

+

+        i386 = os.path.join(tap_dest, "i386")

+        amd64 = os.path.join(tap_dest, "amd64")

+

+        build_amd64 = (len(ver[3]) >= 2)

+

+        build_autodefs(config, mod_fn('autodefs.h.in'), os.path.join(top, 'autodefs.h'))

+

+        st = SignTool(config, tap_dest)

+

+        preprocess(config,

+                   in_fn=os.path.join(tap_dest, 'SOURCES.in'),

+                   out_fn=os.path.join(tap_dest, 'SOURCES'),

+                   quote_begin='@@',

+                   quote_end='@@',

+                   head_comment='# %s\n\n' % autogen)

+

+        preprocess(config,

+                   in_fn=os.path.join(i386, 'OemWin2k.inf.in'),

+                   out_fn=os.path.join(i386, 'OemWin2k.inf'),

+                   quote_begin='@@',

+                   quote_end='@@',

+                   if_prefix='!',

+                   head_comment='; %s\n\n' % autogen)

+

+        preprocess(config,

+                   in_fn=os.path.join(ti_dest, 'sources.in'),

+                   out_fn=os.path.join(ti_dest, 'sources'),

+                   if_prefix='!',

+                   head_comment='# %s\n\n' % autogen)

+

+        build_tap(ddk_path=ver[0],

+                  ddk_major=ver[1],

+                  debug=False,

+                  dir=tap_dest,

+                  x64=False)

+

+        st.sign_verify(x64=False)

+

+        build_tap(ddk_path=ver[0],

+                  ddk_major=ver[1],

+                  debug=False,

+                  dir=ti_dest,

+                  x64=False)

+

+        tap_dist = os.path.join(dist, ver[3][0])

+

+        copy_tap(tap_dest, tap_dist, x64=False)

+        copy_tapinstall(ti_dest, tap_dist, x64=False)

+

+        if build_amd64:

+            os.mkdir(amd64)

+            preprocess(dict_def(config, [('AMD64', '1')]),

+                       in_fn=os.path.join(i386, 'OemWin2k.inf.in'),

+                       out_fn=os.path.join(amd64, 'OemWin2k.inf'),

+                       quote_begin='@@',

+                       quote_end='@@',

+                       if_prefix='!',

+                       head_comment='; %s\n\n' % autogen)

+

+            build_tap(ddk_path=ver[0],

+                      ddk_major=ver[1],

+                      debug=False,

+                      dir=tap_dest,

+                      x64=True)

+

+            build_tap(ddk_path=ver[0],

+                      ddk_major=ver[1],

+                      debug=False,

+                      dir=ti_dest,

+                      x64=True)

+

+            st.sign_verify(x64=True)

+

+            tap_dist_x64 = os.path.join(dist, ver[3][1])

+

+            copy_tap(tap_dest, tap_dist_x64, x64=True)

+            copy_tapinstall(ti_dest, tap_dist_x64, x64=True)

+

+main()

diff --git a/win/wb.py b/win/wb.py
index 7c2c8b9..8e23684 100644
--- a/win/wb.py
+++ b/win/wb.py
@@ -1,7 +1,7 @@
 # Python module containing general build functions

 # for OpenVPN on Windows

 

-import os, re, shutil

+import os, re, shutil, stat

 

 autogen = "Automatically generated by OpenVPN Windows build system"

 

@@ -182,4 +182,34 @@ def cp(src, dest, dest_is_dir=True):
     print "COPY %s %s" % (src, dest)

     shutil.copyfile(src, dest)

 

+def rm_rf(path):

+    try:

+        shutil.rmtree(path, onerror=onerror)

+    except:

+        pass

+

+def onerror(func, path, exc_info):

+    """

+    Error handler for ``shutil.rmtree``.

+

+    If the error is due to an access error (read only file)

+    it attempts to add write permission and then retries.

+

+    If the error is for another reason it re-raises the error.

+

+    Usage : ``shutil.rmtree(path, onerror=onerror)``

+    """

+    if not os.access(path, os.W_OK):

+        # Is the error an access error ?

+        os.chmod(path, stat.S_IWUSR)

+        func(path)

+    else:

+        raise

+

+def mkdir_silent(dir):

+    try:

+        os.mkdir(dir)

+    except:

+        pass

+

 config = get_config()