[Windows] Move flasher binaries + libs to separate folder (#270)

qmk · Jul 2, 2021 · 4101d60 · 4101d60
1 parent 1297765
commit 4101d60
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 37 deletions.
diff --git a/windows/QMK Toolbox/QMK Toolbox.csproj b/windows/QMK Toolbox/QMK Toolbox.csproj
@@ -52,7 +52,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>output.ico</ApplicationIcon>
+    <ApplicationIcon>Resources\output.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestCertificateThumbprint>07603AD77617C425E84BA2FC0DD2DB546C3DD0DD</ManifestCertificateThumbprint>
@@ -205,22 +205,30 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="output.ico" />
-    <EmbeddedResource Include="..\..\common\applet-mdflash.bin" />
-    <EmbeddedResource Include="..\..\common\avrdude.conf" />
-    <EmbeddedResource Include="..\..\common\mcu-list.txt" />
-    <EmbeddedResource Include="..\..\common\reset.eep" />
-    <EmbeddedResource Include="avrdude.exe" />
-    <EmbeddedResource Include="bootloadHID.exe" />
-    <EmbeddedResource Include="dfu-programmer.exe" />
-    <EmbeddedResource Include="dfu-util.exe" />
-    <EmbeddedResource Include="mdloader.exe" />
-    <EmbeddedResource Include="qmk_driver_installer.exe" />
-    <EmbeddedResource Include="teensy_loader_cli.exe" />
-    <EmbeddedResource Include="libusb0.dll" />
-    <EmbeddedResource Include="libusb-0-1-4.dll" />
-    <EmbeddedResource Include="libusb-1.0.dll" />
-    <EmbeddedResource Include="drivers.txt" />
+    <Content Include="Resources\output.ico" />
+    <EmbeddedResource Include="..\..\common\applet-mdflash.bin">
+      <Link>Resources\applet-mdflash.bin</Link>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\common\avrdude.conf">
+      <Link>Resources\avrdude.conf</Link>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\common\mcu-list.txt">
+      <Link>Resources\mcu-list.txt</Link>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\common\reset.eep">
+      <Link>Resources\reset.eep</Link>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\avrdude.exe" />
+    <EmbeddedResource Include="Resources\bootloadHID.exe" />
+    <EmbeddedResource Include="Resources\dfu-programmer.exe" />
+    <EmbeddedResource Include="Resources\dfu-util.exe" />
+    <EmbeddedResource Include="Resources\mdloader.exe" />
+    <EmbeddedResource Include="Resources\qmk_driver_installer.exe" />
+    <EmbeddedResource Include="Resources\teensy_loader_cli.exe" />
+    <EmbeddedResource Include="Resources\libusb0.dll" />
+    <EmbeddedResource Include="Resources\libusb-0-1-4.dll" />
+    <EmbeddedResource Include="Resources\libusb-1.0.dll" />
+    <EmbeddedResource Include="Resources\drivers.txt" />
   </ItemGroup>
   <ItemGroup>
     <None Include="FodyWeavers.xml" />
@@ -237,14 +245,6 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup>
-    <FileAssociation Include=".qmk">
-      <Visible>False</Visible>
-      <Description>QMK Firmware File</Description>
-      <Progid>qmk_toolbox</Progid>
-      <DefaultIcon>output.ico</DefaultIcon>
-    </FileAssociation>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\Fody.2.0.0\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.2.0.0\build\dotnet\Fody.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

diff --git a/windows/QMK Toolbox/avrdude.exe → windows/QMK Toolbox/Resources/avrdude.exe b/windows/QMK Toolbox/avrdude.exe → windows/QMK Toolbox/Resources/avrdude.exe
diff --git a/windows/QMK Toolbox/bootloadHID.exe → ...ows/QMK Toolbox/Resources/bootloadHID.exe b/windows/QMK Toolbox/bootloadHID.exe → ...ows/QMK Toolbox/Resources/bootloadHID.exe
diff --git a/windows/QMK Toolbox/dfu-programmer.exe → .../QMK Toolbox/Resources/dfu-programmer.exe b/windows/QMK Toolbox/dfu-programmer.exe → .../QMK Toolbox/Resources/dfu-programmer.exe
diff --git a/windows/QMK Toolbox/dfu-util.exe → windows/QMK Toolbox/Resources/dfu-util.exe b/windows/QMK Toolbox/dfu-util.exe → windows/QMK Toolbox/Resources/dfu-util.exe
diff --git a/windows/QMK Toolbox/drivers.txt → windows/QMK Toolbox/Resources/drivers.txt b/windows/QMK Toolbox/drivers.txt → windows/QMK Toolbox/Resources/drivers.txt
diff --git a/windows/QMK Toolbox/libusb-0-1-4.dll → ...ws/QMK Toolbox/Resources/libusb-0-1-4.dll b/windows/QMK Toolbox/libusb-0-1-4.dll → ...ws/QMK Toolbox/Resources/libusb-0-1-4.dll
diff --git a/windows/QMK Toolbox/libusb-1.0.dll → windows/QMK Toolbox/Resources/libusb-1.0.dll b/windows/QMK Toolbox/libusb-1.0.dll → windows/QMK Toolbox/Resources/libusb-1.0.dll
diff --git a/windows/QMK Toolbox/libusb0.dll → windows/QMK Toolbox/Resources/libusb0.dll b/windows/QMK Toolbox/libusb0.dll → windows/QMK Toolbox/Resources/libusb0.dll
diff --git a/windows/QMK Toolbox/mdloader.exe → windows/QMK Toolbox/Resources/mdloader.exe b/windows/QMK Toolbox/mdloader.exe → windows/QMK Toolbox/Resources/mdloader.exe
diff --git a/windows/QMK Toolbox/output.ico → windows/QMK Toolbox/Resources/output.ico b/windows/QMK Toolbox/output.ico → windows/QMK Toolbox/Resources/output.ico
diff --git a/windows/QMK Toolbox/qmk_driver_installer.exe → ...oolbox/Resources/qmk_driver_installer.exe b/windows/QMK Toolbox/qmk_driver_installer.exe → ...oolbox/Resources/qmk_driver_installer.exe
diff --git a/windows/QMK Toolbox/teensy_loader_cli.exe → ...K Toolbox/Resources/teensy_loader_cli.exe b/windows/QMK Toolbox/teensy_loader_cli.exe → ...K Toolbox/Resources/teensy_loader_cli.exe
diff --git a/windows/install_compiler.iss b/windows/install_compiler.iss
@@ -24,7 +24,7 @@ DefaultDirName={commonpf}\{#MyAppName}
 DisableProgramGroupPage=yes
 OutputDir=.
 OutputBaseFilename=qmk_toolbox_install
-SetupIconFile=QMK Toolbox\output.ico
+SetupIconFile=QMK Toolbox\Resources\output.ico
 Compression=lzma
 SolidCompression=yes
 ChangesAssociations=yes
@@ -50,16 +50,13 @@ Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChang
 
 [Registry]
 ; .qmk file format handler
-Root: HKCR; Subkey: ".qmk";                             ValueData: "{#MyAppName}";          Flags: uninsdeletevalue; ValueType: string;  ValueName: ""
-Root: HKCR; Subkey: "{#MyAppName}";                     ValueData: "{#MyAppName}";  Flags: uninsdeletekey;   ValueType: string;  ValueName: ""
-Root: HKCR; Subkey: "{#MyAppName}\DefaultIcon";         ValueData: "{app}\{#MyAppExeName}";               ValueType: string;  ValueName: ""
-Root: HKCR; Subkey: "{#MyAppName}\shell\open\command";  ValueData: """{app}\{#MyAppExeName}"" ""%1""";  ValueType: string;  ValueName: ""
+Root: HKCR; Subkey: ".qmk";                            ValueData: "{#MyAppName}";                     ValueType: string; ValueName: ""; Flags: uninsdeletevalue
+Root: HKCR; Subkey: "{#MyAppName}";                    ValueData: "{#MyAppName}";                     ValueType: string; ValueName: ""; Flags: uninsdeletekey
+Root: HKCR; Subkey: "{#MyAppName}\DefaultIcon";        ValueData: "{app}\{#MyAppExeName}";            ValueType: string; ValueName: ""
+Root: HKCR; Subkey: "{#MyAppName}\shell\open\command"; ValueData: """{app}\{#MyAppExeName}"" ""%1"""; ValueType: string; ValueName: ""
 
 ; qmk:// protocol handler
-Root: HKCR; Subkey: "{#MyAppHandle}"; Flags: uninsdeletekey
-Root: HKCR; Subkey: "{#MyAppHandle}"; ValueType: string; ValueName: ""; ValueData: "URL:{#MyAppName}"; Flags: uninsdeletekey
-Root: HKCR; Subkey: "{#MyAppHandle}"; ValueType: string; ValueName: "URL Protocol"; ValueData: ""; Flags: uninsdeletekey
-Root: HKCR; Subkey: "{#MyAppHandle}\DefaultIcon"; Flags: uninsdeletekey
-Root: HKCR; Subkey: "{#MyAppHandle}\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#MyAppExeName}"; Flags: uninsdeletekey
-Root: HKCR; Subkey: "{#MyAppHandle}\shell\open\command"; Flags: uninsdeletekey
-Root: HKCR; Subkey: "{#MyAppHandle}\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""; Flags: uninsdeletekey
+Root: HKCR; Subkey: "{#MyAppHandle}";                    ValueData: "URL:{#MyAppName}";                 ValueType: string; ValueName: "";             Flags: uninsdeletevalue
+Root: HKCR; Subkey: "{#MyAppHandle}";                    ValueData: "";                                 ValueType: string; ValueName: "URL Protocol"; Flags: uninsdeletekey
+Root: HKCR; Subkey: "{#MyAppHandle}\DefaultIcon";        ValueData: "{app}\{#MyAppExeName}";            ValueType: string; ValueName: "";
+Root: HKCR; Subkey: "{#MyAppHandle}\shell\open\command"; ValueData: """{app}\{#MyAppExeName}"" ""%1"""; ValueType: string; ValueName: "";