Added win/build_exe.py script, which is similar to

win/build_all.py except that it doesn't build the
TAP drivers or tapinstall.

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

diff --git a/win/build_exe.py b/win/build_exe.py
new file mode 100644 (file)
index 0000000..087f9a3
--- /dev/null
+++ b/win/build_exe.py
@@ -0,0 +1,15 @@
+from config import main as config_main\r
+from build import main as build_openvpn\r
+from build_ddk import main as build_ddk\r
+from sign import main as sign\r
+from make_dist import main as make_dist\r
+\r
+def main(config):\r
+    config_main(config)\r
+    build_openvpn()\r
+    make_dist(config, tap=False)\r
+\r
+# if we are run directly, and not loaded as a module\r
+if __name__ == "__main__":\r
+    from wb import config\r
+    main(config)\r

diff --git a/win/make_dist.py b/win/make_dist.py
index 30112798459f4766fd01777990601870c59b9249..a6a0563753a642cfb9ec13d5253b4d3e1ea1713d 100644 (file)
--- a/win/make_dist.py
+++ b/win/make_dist.py
@@ -1,7 +1,7 @@
 import os\r
 from wb import home_fn, rm_rf, mkdir, cp_a, cp\r
 \r
-def main(config):\r
+def main(config, tap=True):\r
     dist = config['DIST']\r
     assert dist\r
     dist = home_fn(dist)\r
@@ -13,8 +13,9 @@ def main(config):
     rm_rf(dist)\r
     mkdir(dist)\r
     mkdir(bin)\r
-    mkdir(i386)\r
-    mkdir(amd64)\r
+    if tap:\r
+        mkdir(i386)\r
+        mkdir(amd64)\r
 \r
     # copy openvpn.exe and manifest\r
     cp(home_fn('openvpn.exe'), bin)\r
@@ -28,25 +29,26 @@ def main(config):
     # copy MSVC CRT\r
     cp_a(home_fn(config['MSVC_CRT']), bin)\r
 \r
-    # copy TAP drivers\r
-    for dir_name, dest in (('amd64', amd64), ('i386', i386)):\r
-        dir = home_fn(os.path.join('tap-win32', dir_name))\r
-        for dirpath, dirnames, filenames in os.walk(dir):\r
+    if tap:\r
+        # copy TAP drivers\r
+        for dir_name, dest in (('amd64', amd64), ('i386', i386)):\r
+            dir = home_fn(os.path.join('tap-win32', dir_name))\r
+            for dirpath, dirnames, filenames in os.walk(dir):\r
+                for f in filenames:\r
+                    root, ext = os.path.splitext(f)\r
+                    if ext in ('.inf', '.cat', '.sys'):\r
+                        cp(os.path.join(dir, f), dest)\r
+                break\r
+\r
+        # copy tapinstall\r
+        dest = {'amd64' : amd64, 'i386' : i386}\r
+        for dirpath, dirnames, filenames in os.walk(home_fn('tapinstall')):\r
             for f in filenames:\r
-                root, ext = os.path.splitext(f)\r
-                if ext in ('.inf', '.cat', '.sys'):\r
-                    cp(os.path.join(dir, f), dest)\r
-            break\r
-\r
-    # copy tapinstall\r
-    dest = {'amd64' : amd64, 'i386' : i386}\r
-    for dirpath, dirnames, filenames in os.walk(home_fn('tapinstall')):\r
-        for f in filenames:\r
-            if f == 'tapinstall.exe':\r
-                dir_name = os.path.basename(dirpath)\r
-                src = os.path.join(dirpath, f)\r
-                if dir_name in dest:\r
-                    cp(src, dest[dir_name])\r
+                if f == 'tapinstall.exe':\r
+                    dir_name = os.path.basename(dirpath)\r
+                    src = os.path.join(dirpath, f)\r
+                    if dir_name in dest:\r
+                        cp(src, dest[dir_name])\r
 \r
 # if we are run directly, and not loaded as a module\r
 if __name__ == "__main__":\r