From 110a4200698859e76b4a21b9b4fa253f419297f9 Mon Sep 17 00:00:00 2001 From: fauxpark Date: Wed, 30 Jun 2021 13:39:57 +1000 Subject: [PATCH 1/3] [macOS] Move flasher binaries + libs to separate folder --- osx/QMK Toolbox.xcodeproj/project.pbxproj | 70 ++++++++++-------- osx/{ => qmk_toolbox/Resources}/avrdude | Bin osx/{ => qmk_toolbox/Resources}/bootloadHID | Bin .../Resources}/dfu-programmer | Bin osx/{ => qmk_toolbox/Resources}/dfu-util | Bin .../Resources}/libftdi.1.dylib | Bin .../Resources}/libusb-0.1.4.dylib | Bin .../Resources}/libusb-1.0.0.dylib | Bin osx/{ => qmk_toolbox/Resources}/mdloader_mac | Bin .../Resources}/teensy_loader_cli | Bin 10 files changed, 39 insertions(+), 31 deletions(-) rename osx/{ => qmk_toolbox/Resources}/avrdude (100%) rename osx/{ => qmk_toolbox/Resources}/bootloadHID (100%) rename osx/{ => qmk_toolbox/Resources}/dfu-programmer (100%) rename osx/{ => qmk_toolbox/Resources}/dfu-util (100%) rename osx/{ => qmk_toolbox/Resources}/libftdi.1.dylib (100%) rename osx/{ => qmk_toolbox/Resources}/libusb-0.1.4.dylib (100%) rename osx/{ => qmk_toolbox/Resources}/libusb-1.0.0.dylib (100%) rename osx/{ => qmk_toolbox/Resources}/mdloader_mac (100%) rename osx/{ => qmk_toolbox/Resources}/teensy_loader_cli (100%) diff --git a/osx/QMK Toolbox.xcodeproj/project.pbxproj b/osx/QMK Toolbox.xcodeproj/project.pbxproj index f11defb9f9..21287da861 100644 --- a/osx/QMK Toolbox.xcodeproj/project.pbxproj +++ b/osx/QMK Toolbox.xcodeproj/project.pbxproj @@ -56,12 +56,12 @@ 092964011F5C8B2C004F2D3F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 092964041F5C8B2C004F2D3F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; 092964061F5C8B2C004F2D3F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 0929640C1F5E403C004F2D3F /* dfu-programmer */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = "dfu-programmer"; path = "../dfu-programmer"; sourceTree = ""; }; - 0929640E1F5E4068004F2D3F /* teensy_loader_cli */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = teensy_loader_cli; path = ../teensy_loader_cli; sourceTree = ""; }; - 092964101F5E4186004F2D3F /* avrdude */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = avrdude; path = ../avrdude; sourceTree = ""; }; - 09522BB21F61E32700AEBC5E /* mcu-list.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "mcu-list.txt"; path = "../../common/mcu-list.txt"; sourceTree = ""; }; - 09522BBA1F6216BA00AEBC5E /* avrdude.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = avrdude.conf; path = ../../common/avrdude.conf; sourceTree = ""; }; - 098AEDFA1F5E45C300CA054D /* dfu-util */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = "dfu-util"; path = "../dfu-util"; sourceTree = ""; }; + 0929640C1F5E403C004F2D3F /* dfu-programmer */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = "dfu-programmer"; sourceTree = ""; }; + 0929640E1F5E4068004F2D3F /* teensy_loader_cli */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = teensy_loader_cli; sourceTree = ""; }; + 092964101F5E4186004F2D3F /* avrdude */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = avrdude; sourceTree = ""; }; + 09522BB21F61E32700AEBC5E /* mcu-list.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "mcu-list.txt"; path = "../../../common/mcu-list.txt"; sourceTree = ""; }; + 09522BBA1F6216BA00AEBC5E /* avrdude.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = avrdude.conf; path = ../../../common/avrdude.conf; sourceTree = ""; }; + 098AEDFA1F5E45C300CA054D /* dfu-util */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = "dfu-util"; sourceTree = ""; }; 098AEDFC1F5F220500CA054D /* Printing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = Printing.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 098AEDFD1F5F220500CA054D /* Printing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = Printing.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 098AEE011F5F296000CA054D /* Flashing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = Flashing.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; @@ -73,15 +73,15 @@ 098AEE0A1F5F97A000CA054D /* USB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = USB.h; sourceTree = ""; }; 098AEE0E1F60C6F600CA054D /* QMKWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = QMKWindow.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 098AEE0F1F60C6F600CA054D /* QMKWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = QMKWindow.m; sourceTree = ""; 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"; name = "libusb-1.0.0.dylib"; path = "qmk_toolbox/Resources/libusb-1.0.0.dylib"; sourceTree = SOURCE_ROOT; }; + 09D79CBB1FB8A6490086ABF6 /* libusb-0.1.4.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libusb-0.1.4.dylib"; path = "qmk_toolbox/Resources/libusb-0.1.4.dylib"; sourceTree = SOURCE_ROOT; }; 303568C01FA7DEF400803BEF /* Constants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Constants.m; sourceTree = ""; }; 303568C21FA7DF0900803BEF /* Constants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Constants.h; sourceTree = ""; }; - 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 = ""; }; - C93A0FF32292232D0006C88F /* reset.eep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = reset.eep; path = ../../common/reset.eep; sourceTree = ""; }; - C9A09B5622EE6826008C3CF3 /* mdloader_mac */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = mdloader_mac; path = ../mdloader_mac; sourceTree = ""; }; - C9A09B5822EE6837008C3CF3 /* applet-mdflash.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = "applet-mdflash.bin"; path = "../../common/applet-mdflash.bin"; sourceTree = ""; }; + 3A7770D822BD3B8200398C40 /* libftdi.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libftdi.1.dylib; path = qmk_toolbox/Resources/libftdi.1.dylib; sourceTree = SOURCE_ROOT; }; + 3AB4BC9C2495540A00204A3F /* bootloadHID */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = bootloadHID; sourceTree = ""; }; + C93A0FF32292232D0006C88F /* reset.eep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = reset.eep; path = ../../../common/reset.eep; sourceTree = ""; }; + C9A09B5622EE6826008C3CF3 /* mdloader_mac */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = mdloader_mac; sourceTree = ""; }; + C9A09B5822EE6837008C3CF3 /* applet-mdflash.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = "applet-mdflash.bin"; path = "../../../common/applet-mdflash.bin"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -116,24 +116,24 @@ 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 = ""; @@ -141,22 +141,30 @@ 092963FE1F5C8B2C004F2D3F /* Supporting Files */ = { isa = PBXGroup; children = ( - 3AB4BC9C2495540A00204A3F /* bootloadHID */, + 3A53FB5B268A33F10020BAB0 /* Resources */, + 092963FF1F5C8B2C004F2D3F /* main.m */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; + 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 = ""; }; /* End PBXGroup section */ diff --git a/osx/avrdude b/osx/qmk_toolbox/Resources/avrdude similarity index 100% rename from osx/avrdude rename to osx/qmk_toolbox/Resources/avrdude diff --git a/osx/bootloadHID b/osx/qmk_toolbox/Resources/bootloadHID similarity index 100% rename from osx/bootloadHID rename to osx/qmk_toolbox/Resources/bootloadHID diff --git a/osx/dfu-programmer b/osx/qmk_toolbox/Resources/dfu-programmer similarity index 100% rename from osx/dfu-programmer rename to osx/qmk_toolbox/Resources/dfu-programmer diff --git a/osx/dfu-util b/osx/qmk_toolbox/Resources/dfu-util similarity index 100% rename from osx/dfu-util rename to osx/qmk_toolbox/Resources/dfu-util diff --git a/osx/libftdi.1.dylib b/osx/qmk_toolbox/Resources/libftdi.1.dylib similarity index 100% rename from osx/libftdi.1.dylib rename to osx/qmk_toolbox/Resources/libftdi.1.dylib diff --git a/osx/libusb-0.1.4.dylib b/osx/qmk_toolbox/Resources/libusb-0.1.4.dylib similarity index 100% rename from osx/libusb-0.1.4.dylib rename to osx/qmk_toolbox/Resources/libusb-0.1.4.dylib diff --git a/osx/libusb-1.0.0.dylib b/osx/qmk_toolbox/Resources/libusb-1.0.0.dylib similarity index 100% rename from osx/libusb-1.0.0.dylib rename to osx/qmk_toolbox/Resources/libusb-1.0.0.dylib diff --git a/osx/mdloader_mac b/osx/qmk_toolbox/Resources/mdloader_mac similarity index 100% rename from osx/mdloader_mac rename to osx/qmk_toolbox/Resources/mdloader_mac diff --git a/osx/teensy_loader_cli b/osx/qmk_toolbox/Resources/teensy_loader_cli similarity index 100% rename from osx/teensy_loader_cli rename to osx/qmk_toolbox/Resources/teensy_loader_cli From 34be7240a12c196c7fac3d009e9eaffe23557db5 Mon Sep 17 00:00:00 2001 From: fauxpark Date: Wed, 30 Jun 2021 14:11:48 +1000 Subject: [PATCH 2/3] Update workflow --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eaf1f16aa5..41af256bcd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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: | From de7f1c5992e5aec3ca42f028db9a04493933b3db Mon Sep 17 00:00:00 2001 From: fauxpark Date: Wed, 30 Jun 2021 14:16:45 +1000 Subject: [PATCH 3/3] Set dylib files relative to group --- osx/QMK Toolbox.xcodeproj/project.pbxproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/osx/QMK Toolbox.xcodeproj/project.pbxproj b/osx/QMK Toolbox.xcodeproj/project.pbxproj index 21287da861..383f263908 100644 --- a/osx/QMK Toolbox.xcodeproj/project.pbxproj +++ b/osx/QMK Toolbox.xcodeproj/project.pbxproj @@ -73,11 +73,11 @@ 098AEE0A1F5F97A000CA054D /* USB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = USB.h; sourceTree = ""; }; 098AEE0E1F60C6F600CA054D /* QMKWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = QMKWindow.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 098AEE0F1F60C6F600CA054D /* QMKWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = QMKWindow.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; - 09D79CB51FB0DD7F0086ABF6 /* libusb-1.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libusb-1.0.0.dylib"; path = "qmk_toolbox/Resources/libusb-1.0.0.dylib"; sourceTree = SOURCE_ROOT; }; - 09D79CBB1FB8A6490086ABF6 /* libusb-0.1.4.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libusb-0.1.4.dylib"; path = "qmk_toolbox/Resources/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 = ""; }; + 09D79CBB1FB8A6490086ABF6 /* libusb-0.1.4.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = "libusb-0.1.4.dylib"; sourceTree = ""; }; 303568C01FA7DEF400803BEF /* Constants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Constants.m; sourceTree = ""; }; 303568C21FA7DF0900803BEF /* Constants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Constants.h; sourceTree = ""; }; - 3A7770D822BD3B8200398C40 /* libftdi.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libftdi.1.dylib; path = qmk_toolbox/Resources/libftdi.1.dylib; sourceTree = SOURCE_ROOT; }; + 3A7770D822BD3B8200398C40 /* libftdi.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libftdi.1.dylib; sourceTree = ""; }; 3AB4BC9C2495540A00204A3F /* bootloadHID */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = bootloadHID; sourceTree = ""; }; C93A0FF32292232D0006C88F /* reset.eep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = reset.eep; path = ../../../common/reset.eep; sourceTree = ""; }; C9A09B5622EE6826008C3CF3 /* mdloader_mac */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = mdloader_mac; sourceTree = ""; };