fix: win add driver generation and signing during the install step

zsa · Jul 31, 2019 · b17e63b · b17e63b
1 parent 4cc4705
commit b17e63b
Show file tree

Hide file tree

Showing 27 changed files with 6 additions and 858 deletions.
diff --git a/dist/win64/STM32__BOOTLOADER.cat b/dist/win64/STM32__BOOTLOADER.cat
diff --git a/dist/win64/STM32__BOOTLOADER.inf b/dist/win64/STM32__BOOTLOADER.inf
diff --git a/dist/win64/installer/wally.iss b/dist/win64/installer/wally.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Wally"
-#define MyAppVersion "1.1.3"
+#define MyAppVersion "1.1.4"
 #define MyAppPublisher "ZSA.io"
 #define MyAppURL "https://ergodox-ez.com"
 #define MyAppExeName "wally.exe"
@@ -37,10 +37,8 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 [Files]
 Source: "D:\dev\go\src\github.com\zsa\wally\dist\win64\wally.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "D:\dev\go\src\github.com\zsa\wally\dist\win64\wally-cli.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "D:\dev\go\src\github.com\zsa\wally\dist\win64\planck_driver\*"; DestDir: "{app}"; Flags: ignoreversion
-Source: "D:\dev\go\src\github.com\zsa\wally\dist\win64\planck_driver\license\*"; DestDir: "{app}\license"; Flags: ignoreversion
-Source: "D:\dev\go\src\github.com\zsa\wally\dist\win64\planck_driver\amd64\*"; DestDir: "{app}\amd64"; Flags: ignoreversion
-Source: "D:\dev\go\src\github.com\zsa\wally\dist\win64\planck_driver\x86\*"; DestDir: "{app}\x86"; Flags: ignoreversion
+Source: "D:\dev\go\src\github.com\zsa\wally\dist\win64\post_install.bat"; DestDir: "{app}"; Flags: ignoreversion
+Source: "D:\dev\go\src\github.com\zsa\wally\dist\win64\wdi-simple.exe"; DestDir: "{app}"; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

diff --git a/dist/win64/planck_driver/STM32__BOOTLOADER.cat b/dist/win64/planck_driver/STM32__BOOTLOADER.cat
diff --git a/dist/win64/planck_driver/STM32__BOOTLOADER.inf b/dist/win64/planck_driver/STM32__BOOTLOADER.inf
diff --git a/dist/win64/planck_driver/amd64/libusb0.dll b/dist/win64/planck_driver/amd64/libusb0.dll
diff --git a/dist/win64/planck_driver/amd64/libusb0.sys b/dist/win64/planck_driver/amd64/libusb0.sys
diff --git a/dist/win64/planck_driver/amd64/libusb0_x86.dll b/dist/win64/planck_driver/amd64/libusb0_x86.dll
diff --git a/dist/win64/planck_driver/amd64/libusbK.dll b/dist/win64/planck_driver/amd64/libusbK.dll
diff --git a/dist/win64/planck_driver/amd64/libusbK.sys b/dist/win64/planck_driver/amd64/libusbK.sys
diff --git a/dist/win64/planck_driver/amd64/libusbK_x86.dll b/dist/win64/planck_driver/amd64/libusbK_x86.dll
diff --git a/dist/win64/planck_driver/amd64/winusbcoinstaller2.dll b/dist/win64/planck_driver/amd64/winusbcoinstaller2.dll
diff --git a/dist/win64/planck_driver/installer_x64.exe b/dist/win64/planck_driver/installer_x64.exe
diff --git a/dist/win64/planck_driver/installer_x86.exe b/dist/win64/planck_driver/installer_x86.exe
diff --git a/dist/win64/planck_driver/license/installer_license.txt b/dist/win64/planck_driver/license/installer_license.txt
diff --git a/dist/win64/planck_driver/post_install.bat b/dist/win64/planck_driver/post_install.bat
diff --git a/dist/win64/planck_driver/x86/WdfCoInstaller01011.dll b/dist/win64/planck_driver/x86/WdfCoInstaller01011.dll
diff --git a/dist/win64/planck_driver/x86/install-filter.exe b/dist/win64/planck_driver/x86/install-filter.exe
diff --git a/dist/win64/planck_driver/x86/libusb0.dll b/dist/win64/planck_driver/x86/libusb0.dll
diff --git a/dist/win64/planck_driver/x86/libusb0.sys b/dist/win64/planck_driver/x86/libusb0.sys
diff --git a/dist/win64/planck_driver/x86/libusb0_x86.dll b/dist/win64/planck_driver/x86/libusb0_x86.dll
diff --git a/dist/win64/planck_driver/x86/libusbK.dll b/dist/win64/planck_driver/x86/libusbK.dll
diff --git a/dist/win64/planck_driver/x86/libusbK.sys b/dist/win64/planck_driver/x86/libusbK.sys
diff --git a/dist/win64/planck_driver/x86/winusbcoinstaller2.dll b/dist/win64/planck_driver/x86/winusbcoinstaller2.dll
diff --git a/dist/win64/post_install.bat b/dist/win64/post_install.bat
@@ -0,0 +1,2 @@
+wdi-simple.exe --name "Planck DFU" --vid 0x0483 --pid 0xdf11 --type 0 --manufacturer ZSA.io
+%windir%\sysnative\pnputil.exe /add-driver ./usb_driver/usb_device.inf /install
diff --git a/...anck_driver/amd64/WdfCoInstaller01011.dll → dist/win64/wdi-simple.exe b/...anck_driver/amd64/WdfCoInstaller01011.dll → dist/win64/wdi-simple.exe
diff --git a/wally/state.go b/wally/state.go
@@ -46,7 +46,7 @@ func NewState(step int8, filePath string) State {
 	case "linux":
 		s.AppVersion = "1.1.0"
 	case "windows":
-		s.AppVersion = "1.1.3"
+		s.AppVersion = "1.1.4"
 	default:
 		s.AppVersion = "1.1.0"
 	}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		wdi-simple.exe --name "Planck DFU" --vid 0x0483 --pid 0xdf11 --type 0 --manufacturer ZSA.io
		%windir%\sysnative\pnputil.exe /add-driver ./usb_driver/usb_device.inf /install