sjs/gh-XcodesOrg-XcodesApp
1
0
Fork 0
mirror of https://github.com/XcodesOrg/XcodesApp.git synced 2026-03-25 08:55:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #123 from senmu/sam/universal-aria2

Browse source 
Create universal aria2 binary
This commit is contained in:
Matt Kiazyk 2021-04-26 21:05:55 -05:00 committed by GitHub
commit d43aac3346
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Xcodes.xcodeproj/project.pbxproj
View file

@ -98,8 +98,6 @@
CAFE4AB425B7D3AF0064FE51 /* AdvancedPreferencePane.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFE4AB325B7D3AF0064FE51 /* AdvancedPreferencePane.swift */; };
CAFE4ABC25B7D54B0064FE51 /* UpdatesPreferencePane.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFE4ABB25B7D54B0064FE51 /* UpdatesPreferencePane.swift */; };
CAFFFED8259CDA5000903F81 /* XcodeListViewRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFFFED7259CDA5000903F81 /* XcodeListViewRow.swift */; };
E66CC1372628900E00F8CD26 /* aria2c-arm64 in Resources */ = {isa = PBXBuildFile; fileRef = E66CC1362628900E00F8CD26 /* aria2c-arm64 */; };
E66CC13B2628904D00F8CD26 /* aria2c-arm64 in Copy aria2c */ = {isa = PBXBuildFile; fileRef = E66CC1362628900E00F8CD26 /* aria2c-arm64 */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
E87DD6EB25D053FA00D86808 /* Progress+.swift in Sources */ = {isa = PBXBuildFile; fileRef = E87DD6EA25D053FA00D86808 /* Progress+.swift */; };
E8977EA325C11E1500835F80 /* PreferencesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8977EA225C11E1500835F80 /* PreferencesView.swift */; };
E8E98A9025D8631800EC89A0 /* InstallationStepRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFBC3FF259AC17F00E2A3D8 /* InstallationStepRowView.swift */; };
@ -150,7 +148,6 @@
dstPath = "";
dstSubfolderSpec = 6;
files = (
E66CC13B2628904D00F8CD26 /* aria2c-arm64 in Copy aria2c */,
CAA8589325A2B77E00ACF8C0 /* aria2c in Copy aria2c */,
);
name = "Copy aria2c";
@ -264,7 +261,6 @@
CAFE4ABB25B7D54B0064FE51 /* UpdatesPreferencePane.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UpdatesPreferencePane.swift; sourceTree = "<group>"; };
CAFFFED7259CDA5000903F81 /* XcodeListViewRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XcodeListViewRow.swift; sourceTree = "<group>"; };
CAFFFEEE259CEAC400903F81 /* RingProgressViewStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RingProgressViewStyle.swift; sourceTree = "<group>"; };
E66CC1362628900E00F8CD26 /* aria2c-arm64 */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = "aria2c-arm64"; sourceTree = "<group>"; };
E87DD6EA25D053FA00D86808 /* Progress+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Progress+.swift"; sourceTree = "<group>"; };
E8977EA225C11E1500835F80 /* PreferencesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesView.swift; sourceTree = "<group>"; };
E8E98A9525D863D700EC89A0 /* InstallationStepDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstallationStepDetailView.swift; sourceTree = "<group>"; };
@ -468,7 +464,6 @@
children = (
CAA858DA25A3E11F00ACF8C0 /* aria2-release-1.35.0.tar.gz */,
CAA8588025A2B63A00ACF8C0 /* aria2c */,
E66CC1362628900E00F8CD26 /* aria2c-arm64 */,
CAA8588A25A2B69300ACF8C0 /* aria2c.LICENSE */,
CAD2E7A52449575000113D76 /* Assets.xcassets */,
CAD2E7AD2449575000113D76 /* Info.plist */,
@ -696,7 +691,6 @@
buildActionMask = 2147483647;
files = (
CAD2E7A92449575000113D76 /* Preview Assets.xcassets in Resources */,
E66CC1372628900E00F8CD26 /* aria2c-arm64 in Resources */,
CA9FF83F2594FBC000E47BAF /* Licenses.rtf in Resources */,
CAA858DB25A3E11F00ACF8C0 /* aria2-release-1.35.0.tar.gz in Resources */,
CAD2E7A62449575000113D76 /* Assets.xcassets in Resources */,

7
Xcodes/Backend/AppState+Install.swift
View file

@ -118,12 +118,7 @@ extension AppState {
let destination = Path.xcodesApplicationSupport/"Xcode-\(availableXcode.version).\(availableXcode.filename.suffix(fromLast: "."))"
switch downloader {
case .aria2:
#if arch(arm64)
let binaryName = "aria2c-arm64"
#elseif arch(x86_64)
let binaryName = "aria2c"
#endif
let aria2Path = Path(url: Bundle.main.url(forAuxiliaryExecutable: binaryName)!)!
let aria2Path = Path(url: Bundle.main.url(forAuxiliaryExecutable: "aria2c")!)!
return downloadXcodeWithAria2(
availableXcode,
to: destination,

BIN
Xcodes/Resources/aria2c
View file

Binary file not shown.

BIN
Xcodes/Resources/aria2c-arm64
View file

Binary file not shown.