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

[macOS] Move flasher binaries + libs to separate folder #269

Merged
merged 3 commits into from
Jul 2, 2021
Merged

[macOS] Move flasher binaries + libs to separate folder #269

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
110a420
[macOS] Move flasher binaries + libs to separate folder
fauxpark Jun 30, 2021
34be724
Update workflow
fauxpark Jun 30, 2021
de7f1c5
Set dylib files relative to group
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- uses: actions/checkout@v2

- name: Check binary permissions
working-directory: ./osx
working-directory: ./osx/qmk_toolbox/Resources
env:
QMK_BINARIES: avrdude bootloadHID dfu-programmer dfu-util mdloader_mac teensy_loader_cli
run: |
Expand Down
70 changes: 39 additions & 31 deletions osx/QMK Toolbox.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@
092964011F5C8B2C004F2D3F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
092964041F5C8B2C004F2D3F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
092964061F5C8B2C004F2D3F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
0929640C1F5E403C004F2D3F /* dfu-programmer */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = "dfu-programmer"; path = "../dfu-programmer"; sourceTree = "<group>"; };
0929640E1F5E4068004F2D3F /* teensy_loader_cli */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = teensy_loader_cli; path = ../teensy_loader_cli; sourceTree = "<group>"; };
092964101F5E4186004F2D3F /* avrdude */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = avrdude; path = ../avrdude; sourceTree = "<group>"; };
09522BB21F61E32700AEBC5E /* mcu-list.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "mcu-list.txt"; path = "../../common/mcu-list.txt"; sourceTree = "<group>"; };
09522BBA1F6216BA00AEBC5E /* avrdude.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = avrdude.conf; path = ../../common/avrdude.conf; sourceTree = "<group>"; };
098AEDFA1F5E45C300CA054D /* dfu-util */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = "dfu-util"; path = "../dfu-util"; sourceTree = "<group>"; };
0929640C1F5E403C004F2D3F /* dfu-programmer */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = "dfu-programmer"; sourceTree = "<group>"; };
0929640E1F5E4068004F2D3F /* teensy_loader_cli */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = teensy_loader_cli; sourceTree = "<group>"; };
092964101F5E4186004F2D3F /* avrdude */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = avrdude; sourceTree = "<group>"; };
09522BB21F61E32700AEBC5E /* mcu-list.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "mcu-list.txt"; path = "../../../common/mcu-list.txt"; sourceTree = "<group>"; };
09522BBA1F6216BA00AEBC5E /* avrdude.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = avrdude.conf; path = ../../../common/avrdude.conf; sourceTree = "<group>"; };
098AEDFA1F5E45C300CA054D /* dfu-util */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = "dfu-util"; sourceTree = "<group>"; };
098AEDFC1F5F220500CA054D /* Printing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = Printing.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
098AEDFD1F5F220500CA054D /* Printing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = Printing.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
098AEE011F5F296000CA054D /* Flashing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = Flashing.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
Expand All @@ -73,15 +73,15 @@
098AEE0A1F5F97A000CA054D /* USB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = USB.h; sourceTree = "<group>"; };
098AEE0E1F60C6F600CA054D /* QMKWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = QMKWindow.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
098AEE0F1F60C6F600CA054D /* QMKWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = QMKWindow.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
09D79CB51FB0DD7F0086ABF6 /* libusb-1.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = "libusb-1.0.0.dylib"; sourceTree = SOURCE_ROOT; };
09D79CBB1FB8A6490086ABF6 /* libusb-0.1.4.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = "libusb-0.1.4.dylib"; sourceTree = SOURCE_ROOT; };
09D79CB51FB0DD7F0086ABF6 /* libusb-1.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = "libusb-1.0.0.dylib"; sourceTree = "<group>"; };
09D79CBB1FB8A6490086ABF6 /* libusb-0.1.4.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = "libusb-0.1.4.dylib"; sourceTree = "<group>"; };
303568C01FA7DEF400803BEF /* Constants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Constants.m; sourceTree = "<group>"; };
303568C21FA7DF0900803BEF /* Constants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Constants.h; sourceTree = "<group>"; };
3A7770D822BD3B8200398C40 /* libftdi.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libftdi.1.dylib; sourceTree = SOURCE_ROOT; };
3AB4BC9C2495540A00204A3F /* bootloadHID */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = bootloadHID; path = ../bootloadHID; sourceTree = "<group>"; };
C93A0FF32292232D0006C88F /* reset.eep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = reset.eep; path = ../../common/reset.eep; sourceTree = "<group>"; };
C9A09B5622EE6826008C3CF3 /* mdloader_mac */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = mdloader_mac; path = ../mdloader_mac; sourceTree = "<group>"; };
C9A09B5822EE6837008C3CF3 /* applet-mdflash.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = "applet-mdflash.bin"; path = "../../common/applet-mdflash.bin"; sourceTree = "<group>"; };
3A7770D822BD3B8200398C40 /* libftdi.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libftdi.1.dylib; sourceTree = "<group>"; };
3AB4BC9C2495540A00204A3F /* bootloadHID */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = bootloadHID; sourceTree = "<group>"; };
C93A0FF32292232D0006C88F /* reset.eep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = reset.eep; path = ../../../common/reset.eep; sourceTree = "<group>"; };
C9A09B5622EE6826008C3CF3 /* mdloader_mac */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = mdloader_mac; sourceTree = "<group>"; };
C9A09B5822EE6837008C3CF3 /* applet-mdflash.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = "applet-mdflash.bin"; path = "../../../common/applet-mdflash.bin"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -116,47 +116,55 @@
092963FA1F5C8B2C004F2D3F /* qmk_toolbox */ = {
isa = PBXGroup;
children = (
092964011F5C8B2C004F2D3F /* Assets.xcassets */,
092964061F5C8B2C004F2D3F /* Info.plist */,
092964031F5C8B2C004F2D3F /* MainMenu.xib */,
092963FB1F5C8B2C004F2D3F /* AppDelegate.h */,
092963FC1F5C8B2C004F2D3F /* AppDelegate.m */,
303568C21FA7DF0900803BEF /* Constants.h */,
303568C01FA7DEF400803BEF /* Constants.m */,
098AEE0A1F5F97A000CA054D /* USB.h */,
098AEE091F5F97A000CA054D /* USB.m */,
098AEE031F5F296B00CA054D /* Flashing.h */,
098AEE011F5F296000CA054D /* Flashing.m */,
098AEE061F5F359500CA054D /* HID.h */,
098AEE041F5F356000CA054D /* HID.m */,
098AEDFC1F5F220500CA054D /* Printing.h */,
098AEDFD1F5F220500CA054D /* Printing.m */,
092963FB1F5C8B2C004F2D3F /* AppDelegate.h */,
092963FC1F5C8B2C004F2D3F /* AppDelegate.m */,
092964011F5C8B2C004F2D3F /* Assets.xcassets */,
092964031F5C8B2C004F2D3F /* MainMenu.xib */,
092964061F5C8B2C004F2D3F /* Info.plist */,
092963FE1F5C8B2C004F2D3F /* Supporting Files */,
098AEE0E1F60C6F600CA054D /* QMKWindow.h */,
098AEE0F1F60C6F600CA054D /* QMKWindow.m */,
098AEE0A1F5F97A000CA054D /* USB.h */,
098AEE091F5F97A000CA054D /* USB.m */,
092963FE1F5C8B2C004F2D3F /* Supporting Files */,
);
path = qmk_toolbox;
sourceTree = "<group>";
};
092963FE1F5C8B2C004F2D3F /* Supporting Files */ = {
isa = PBXGroup;
children = (
3AB4BC9C2495540A00204A3F /* bootloadHID */,
3A53FB5B268A33F10020BAB0 /* Resources */,
092963FF1F5C8B2C004F2D3F /* main.m */,
);
name = "Supporting Files";
sourceTree = "<group>";
};
3A53FB5B268A33F10020BAB0 /* Resources */ = {
isa = PBXGroup;
children = (
C9A09B5822EE6837008C3CF3 /* applet-mdflash.bin */,
C9A09B5622EE6826008C3CF3 /* mdloader_mac */,
C93A0FF32292232D0006C88F /* reset.eep */,
3A7770D822BD3B8200398C40 /* libftdi.1.dylib */,
09D79CB51FB0DD7F0086ABF6 /* libusb-1.0.0.dylib */,
09D79CBB1FB8A6490086ABF6 /* libusb-0.1.4.dylib */,
09522BBA1F6216BA00AEBC5E /* avrdude.conf */,
09522BB21F61E32700AEBC5E /* mcu-list.txt */,
098AEDFA1F5E45C300CA054D /* dfu-util */,
C93A0FF32292232D0006C88F /* reset.eep */,
092964101F5E4186004F2D3F /* avrdude */,
0929640E1F5E4068004F2D3F /* teensy_loader_cli */,
3AB4BC9C2495540A00204A3F /* bootloadHID */,
0929640C1F5E403C004F2D3F /* dfu-programmer */,
092963FF1F5C8B2C004F2D3F /* main.m */,
098AEDFA1F5E45C300CA054D /* dfu-util */,
C9A09B5622EE6826008C3CF3 /* mdloader_mac */,
0929640E1F5E4068004F2D3F /* teensy_loader_cli */,
3A7770D822BD3B8200398C40 /* libftdi.1.dylib */,
09D79CBB1FB8A6490086ABF6 /* libusb-0.1.4.dylib */,
09D79CB51FB0DD7F0086ABF6 /* libusb-1.0.0.dylib */,
);
name = "Supporting Files";
path = Resources;
sourceTree = "<group>";
};
/* End PBXGroup section */
Expand Down
0 osx/avrdude → osx/qmk_toolbox/Resources/avrdude
View file
Open in desktop
File renamed without changes.
0 osx/bootloadHID → osx/qmk_toolbox/Resources/bootloadHID
View file
Open in desktop
File renamed without changes.
0 osx/dfu-programmer → osx/qmk_toolbox/Resources/dfu-programmer
View file
Open in desktop
File renamed without changes.
0 osx/dfu-util → osx/qmk_toolbox/Resources/dfu-util
View file
Open in desktop
File renamed without changes.
0 osx/libftdi.1.dylib → osx/qmk_toolbox/Resources/libftdi.1.dylib
View file
Open in desktop
File renamed without changes.
0 osx/libusb-0.1.4.dylib → osx/qmk_toolbox/Resources/libusb-0.1.4.dylib
View file
Open in desktop
File renamed without changes.
0 osx/libusb-1.0.0.dylib → osx/qmk_toolbox/Resources/libusb-1.0.0.dylib
View file
Open in desktop
File renamed without changes.
0 osx/mdloader_mac → osx/qmk_toolbox/Resources/mdloader_mac
View file
Open in desktop
File renamed without changes.
0 osx/teensy_loader_cli → osx/qmk_toolbox/Resources/teensy_loader_cli
View file
Open in desktop
File renamed without changes.