Fixing unsigned windows driver issue

Issue was invalid path in makefile.inc that allowed the build script to
"pass" but fail to sign the RIFFA catalog file and driver (!). This
issue has been fixed, and more comments have been added to the README to
avoid this issue in the future.

driver/windows/README.txt

@@ -4,9 +4,15 @@ To build the Windows driver:
    version 7600.16385.1).
 2) Open a DDK command window environment for Windows 7 (which ever version 
    you're targeting).
-3) Move to the directory containing this README.txt and run: build -ceZ
+3) Move to the directory containing this README.txt and run build -ceZ
 4) The driver should be built and ready in the output directory along with a
    Windows 7 catalog file and the coinstaller DLLs.
+5) To build the installer you will need to build the driver using the DDK for
+   each architecture (x86/x64). If you want both setup.exe and setup_dbg.exe
+   executables, you will run the build command FOUR TIMES before step 6.
+6) To build the setup.exe file, run the win7install.bat script from the DDK
+   unchecked/free command window. To build the setup_dbg.exe file, run the 
+   script from the checked command window.
   
 A few notes:
 
@@ -15,7 +21,11 @@ A few notes:
   process will attempt to sign the catalog file with the UCSD certificate. You
   don't have that, so you won't get a signed driver simply by building. You'll
   need to get a certificate from a certificate authority that is capable of 
-  cross-certificate kernel driver signing. See this page for more details:
+  cross-certificate kernel driver signing to authenticate yourself (.pfx), 
+  and the cross-signing certificate from that authority (.crt file available 
+  from link). These should both be added to the windows certificate list and
+  and copied into the root folder for the windows driver (same location as this
+  README.txt file). See this page for more details:
   http://msdn.microsoft.com/en-us/windows/hardware/gg487315.aspx
     
 - Debugging on Windows is difficult because there exists no kernel log file.

driver/windows/install/install.bat

@@ -1,4 +1,4 @@
-@echo off
+@echo on
 
 rmdir /s /q build
 md build
@@ -14,12 +14,21 @@ xcopy /E /H /K /I /Y ..\..\..\c_c++\windows .\build\c_c++
 xcopy /E /H /K /I /Y ..\..\..\java .\build\java
 xcopy /E /H /K /I /Y ..\..\..\python .\build\python
 xcopy /E /H /K /I /Y ..\..\..\matlab .\build\matlab
+echo "%3"
 
 if "%3" == "chk" (
-    "c:\program files\inno setup 5\iscc.exe" /dDebug="1" /o.\build .\build\win7.iss 
+	md .\build.\tmp_dbg
+    "c:\program files (x86)\inno setup 5\iscc.exe" /dDebug="1" /o.\build\tmp_dbg .\build\win7.iss
+	signtool sign /v /ac "..\GlobalSign Root CA.crt" /s my /n "University of California, San Diego" /t http://timestamp.verisign.com/scripts/timestamp.dll .\build\tmp_dbg\setup.exe
+	move .\build\tmp_dbg\setup.exe .\setup_dbg.exe 	
+	rmdir /s /q .\build\tmp_dbg\
 ) else (
-    "c:\program files\inno setup 5\iscc.exe" /o.\build .\build\win7.iss 
+	md .\build\tmp
+    "c:\program files (x86)\inno setup 5\iscc.exe" /o.\build\tmp\ .\build\win7.iss 
+	signtool sign /v /ac "..\GlobalSign Root CA.crt" /s my /n "University of California, San Diego" /t http://timestamp.verisign.com/scripts/timestamp.dll .\build\tmp\setup.exe
+	move .\build\tmp\setup.exe .\setup.exe
+	rmdir /s /q .\build\tmp\
 )
-signtool sign /v /s my /n "University of California, San Diego" /t http://timestamp.verisign.com/scripts/timestamp.dll .\build\setup.exe
+
 
 

driver/windows/install/win7.iss

@@ -13,7 +13,7 @@
 
 [Setup]
 AppName=RIFFA
-AppVersion=2.0
+AppVersion=2.2.1
 AppPublisher=University of California, San Diego
 AppPublisherURL=https://sites.google.com/a/eng.ucsd.edu/matt-jacobsen/riffa
 AppCopyright=Copyright (C) 2016 The Regents of the University of California. All Rights Reserved.

driver/windows/sys/makefile.inc

@@ -22,7 +22,7 @@ POST:
             inf2cat /driver:$(OBJ_PATH)\$(O) /os:7_x64
 !       endif 
 !   endif 
-    signtool sign /v /ac "$(_INX)\GlobalSign Root CA.crt" /s my /n "University of California, San Diego" /t http://timestamp.verisign.com/scripts/timestamp.dll $(OBJ_PATH)\$(O)\$(INF_NAME).cat
+    signtool sign /v /ac "$(_INX)\..\GlobalSign Root CA.crt" /s my /n "University of California, San Diego" /t http://timestamp.verisign.com/scripts/timestamp.dll $(OBJ_PATH)\$(O)\$(INF_NAME).cat
-    signtool sign /v /ac "$(_INX)\GlobalSign Root CA.crt" /s my /n "University of California, San Diego" /t http://timestamp.verisign.com/scripts/timestamp.dll $(OBJ_PATH)\$(O)\$(INF_NAME).sys
+    signtool sign /v /ac "$(_INX)\..\GlobalSign Root CA.crt" /s my /n "University of California, San Diego" /t http://timestamp.verisign.com/scripts/timestamp.dll $(OBJ_PATH)\$(O)\$(INF_NAME).sys