From 7c2de68892e61673ba4532f2ac44c4aee9c41c43 Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Mon, 9 Jan 2017 12:37:39 -0800
Subject: [PATCH] tools: build: create single driver.cab file

---
 tools/build.bat | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/tools/build.bat b/tools/build.bat
index 0b827522..47bf53c9 100755
--- a/tools/build.bat
+++ b/tools/build.bat
@@ -45,24 +45,25 @@ if X%SignedPackage%==X (
     )
 
     pushd build\%Configuration%
-    for %%a in (x64 x86) do (
-        echo .OPTION EXPLICIT >driver-%%a.ddf
-        echo .Set CabinetFileCountThreshold=0 >>driver-%%a.ddf
-        echo .Set FolderFileCountThreshold=0 >>driver-%%a.ddf
-        echo .Set FolderSizeThreshold=0 >>driver-%%a.ddf
-        echo .Set MaxCabinetSize=0 >>driver-%%a.ddf
-        echo .Set MaxDiskFileCount=0 >>driver-%%a.ddf
-        echo .Set MaxDiskSize=0 >>driver-%%a.ddf
-        echo .Set CompressionType=MSZIP >>driver-%%a.ddf
-        echo .Set Cabinet=on >>driver-%%a.ddf
-        echo .Set Compress=on >>driver-%%a.ddf
-        echo .Set CabinetNameTemplate=driver-%%a.cab >>driver-%%a.ddf
-        echo .Set DiskDirectory1=. >>driver-%%a.ddf
-        echo .Set DestinationDir=winfsp >>driver-%%a.ddf
-        echo driver-%%a.inf >>driver-%%a.ddf
-        echo winfsp-%%a.sys >>driver-%%a.ddf
-        makecab /F driver-%%a.ddf
-    )
+    echo .OPTION EXPLICIT >driver.ddf
+    echo .Set CabinetFileCountThreshold=0 >>driver.ddf
+    echo .Set FolderFileCountThreshold=0 >>driver.ddf
+    echo .Set FolderSizeThreshold=0 >>driver.ddf
+    echo .Set MaxCabinetSize=0 >>driver.ddf
+    echo .Set MaxDiskFileCount=0 >>driver.ddf
+    echo .Set MaxDiskSize=0 >>driver.ddf
+    echo .Set CompressionType=MSZIP >>driver.ddf
+    echo .Set Cabinet=on >>driver.ddf
+    echo .Set Compress=on >>driver.ddf
+    echo .Set CabinetNameTemplate=driver.cab >>driver.ddf
+    echo .Set DiskDirectory1=. >>driver.ddf
+    echo .Set DestinationDir=x64 >>driver.ddf
+    echo driver-x64.inf >>driver.ddf
+    echo winfsp-x64.sys >>driver.ddf
+    echo .Set DestinationDir=x86 >>driver.ddf
+    echo driver-x86.inf >>driver.ddf
+    echo winfsp-x86.sys >>driver.ddf
+    makecab /F driver.ddf
     popd
 )