Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Jul 2, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca85999
[Windows] Move flasher binaries + libs to separate folder
fauxpark Jun 30, 2021
ee12bf4
Fix icon references
fauxpark Jun 30, 2021
fcea000
Tidy up file association stuff
fauxpark Jun 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions windows/QMK Toolbox/QMK Toolbox.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>output.ico</ApplicationIcon>
<ApplicationIcon>Resources\output.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup>
<ManifestCertificateThumbprint>07603AD77617C425E84BA2FC0DD2DB546C3DD0DD</ManifestCertificateThumbprint>
Expand Down Expand Up @@ -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" />
Expand All @@ -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">
Expand Down
0 windows/QMK Toolbox/avrdude.exe → windows/QMK Toolbox/Resources/avrdude.exe
View file
Open in desktop
File renamed without changes.
0 windows/QMK Toolbox/bootloadHID.exe → ...ows/QMK Toolbox/Resources/bootloadHID.exe
View file
Open in desktop
File renamed without changes.
0 windows/QMK Toolbox/dfu-programmer.exe → .../QMK Toolbox/Resources/dfu-programmer.exe
View file
Open in desktop
File renamed without changes.
0 windows/QMK Toolbox/dfu-util.exe → windows/QMK Toolbox/Resources/dfu-util.exe
View file
Open in desktop
File renamed without changes.
0 windows/QMK Toolbox/drivers.txt → windows/QMK Toolbox/Resources/drivers.txt
View file
Open in desktop
File renamed without changes.
0 windows/QMK Toolbox/libusb-0-1-4.dll → ...ws/QMK Toolbox/Resources/libusb-0-1-4.dll
View file
Open in desktop
File renamed without changes.
0 windows/QMK Toolbox/libusb-1.0.dll → windows/QMK Toolbox/Resources/libusb-1.0.dll
View file
Open in desktop
File renamed without changes.
0 windows/QMK Toolbox/libusb0.dll → windows/QMK Toolbox/Resources/libusb0.dll
View file
Open in desktop
File renamed without changes.
0 windows/QMK Toolbox/mdloader.exe → windows/QMK Toolbox/Resources/mdloader.exe
View file
Open in desktop
File renamed without changes.
0 windows/QMK Toolbox/output.ico → windows/QMK Toolbox/Resources/output.ico
View file
Open in desktop
File renamed without changes.
0 windows/QMK Toolbox/qmk_driver_installer.exe → ...oolbox/Resources/qmk_driver_installer.exe
View file
Open in desktop
File renamed without changes.
0 windows/QMK Toolbox/teensy_loader_cli.exe → ...K Toolbox/Resources/teensy_loader_cli.exe
View file
Open in desktop
File renamed without changes.
21 changes: 9 additions & 12 deletions windows/install_compiler.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: "";