From 1505fa948371a5601a1f239708019446927783fd Mon Sep 17 00:00:00 2001 From: Chad Wilson Date: Fri, 5 Jan 2024 23:49:46 +0800 Subject: [PATCH 1/4] p4 - Prefer ARM builds on Apple Silicon --- Casks/p/p4.rb | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/Casks/p/p4.rb b/Casks/p/p4.rb index 5029f25115..ff72592008 100644 --- a/Casks/p/p4.rb +++ b/Casks/p/p4.rb @@ -1,8 +1,23 @@ cask "p4" do + arch arm: "arm64", intel: "x86_64" + version "2023.2,2535420" - sha256 "8a24804e48247104a1e59e99620e57bbe456018fef84b2dff911175908057017" + + on_arm do + sha256 "00264b87bf4ebb26286bc089fc0686d913d921b9b39bc67bf436af3702ac18b1" + + url "https://filehost.perforce.com/perforce/r#{version.major[-2..]}.#{version.minor}/bin.macosx12#{arch}/p4" + + binary "bin.macosx12#{arch}", target: "p4" + end + on_intel do + sha256 "8a24804e48247104a1e59e99620e57bbe456018fef84b2dff911175908057017" + + url "https://filehost.perforce.com/perforce/r#{version.major[-2..]}.#{version.minor}/bin.macosx1015#{arch}/p4" + + binary "bin.macosx1015#{arch}", target: "p4" + end - url "https://filehost.perforce.com/perforce/r#{version.major[-2..]}.#{version.minor}/bin.macosx1015x86_64/p4" name "Perforce Helix Command-Line Client (P4)" desc "Use it to gain instant access to operations and complete control over the system" homepage "https://www.perforce.com/products/helix-core-apps/command-line-client" @@ -16,10 +31,8 @@ cask "p4" do end conflicts_with cask: "perforce" - depends_on macos: ">= :high_sierra" + depends_on macos: ">= :sierra" container type: :naked - binary "bin.macosx1015x86_64", target: "p4" - # No zap stanza required end From a5fb916170fe57785ce22238b094566d654dc281 Mon Sep 17 00:00:00 2001 From: Chad Wilson Date: Fri, 5 Jan 2024 23:59:20 +0800 Subject: [PATCH 2/4] perforce - Prefer ARM builds on Apple Silicon --- Casks/p/perforce.rb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Casks/p/perforce.rb b/Casks/p/perforce.rb index 7b37817462..3581efe923 100644 --- a/Casks/p/perforce.rb +++ b/Casks/p/perforce.rb @@ -1,8 +1,19 @@ cask "perforce" do + arch arm: "arm64", intel: "x86_64" + version "2023.2,2535420" - sha256 "dbccb96d5a954a038ae6f3f49bf7ec9cd43b7094bec56f04ecb2c8ea41a93a8e" + + on_arm do + sha256 "51d6052f9809013aaadab66d2568e827b41b21927894d2794ececad51c25c5b5" + + url "https://filehost.perforce.com/perforce/r#{version.major[-2..]}.#{version.minor}/bin.macosx12#{arch}/helix-core-server.tgz" + end + on_intel do + sha256 "dbccb96d5a954a038ae6f3f49bf7ec9cd43b7094bec56f04ecb2c8ea41a93a8e" + + url "https://filehost.perforce.com/perforce/r#{version.major[-2..]}.#{version.minor}/bin.macosx1015#{arch}/helix-core-server.tgz" + end - url "https://filehost.perforce.com/perforce/r#{version.major[-2..]}.#{version.minor}/bin.macosx1015x86_64/helix-core-server.tgz" name "Perforce Helix Core Server" name "Perforce Helix Command-Line Client (P4)" name "Perforce Helix Broker (P4Broker)" From 775dfeb15099b04b9eaf7aae7fc9be43f817ef94 Mon Sep 17 00:00:00 2001 From: Justin Krehel <39449589+krehel@users.noreply.github.com> Date: Fri, 5 Jan 2024 13:58:46 -0500 Subject: [PATCH 3/4] p4: style fixes --- Casks/p/p4.rb | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/Casks/p/p4.rb b/Casks/p/p4.rb index ff72592008..e0a995d06c 100644 --- a/Casks/p/p4.rb +++ b/Casks/p/p4.rb @@ -1,23 +1,11 @@ cask "p4" do - arch arm: "arm64", intel: "x86_64" + arch arm: "12arm64", intel: "1015x86_64" version "2023.2,2535420" + sha256 arm: "00264b87bf4ebb26286bc089fc0686d913d921b9b39bc67bf436af3702ac18b1", + intel: "8a24804e48247104a1e59e99620e57bbe456018fef84b2dff911175908057017" - on_arm do - sha256 "00264b87bf4ebb26286bc089fc0686d913d921b9b39bc67bf436af3702ac18b1" - - url "https://filehost.perforce.com/perforce/r#{version.major[-2..]}.#{version.minor}/bin.macosx12#{arch}/p4" - - binary "bin.macosx12#{arch}", target: "p4" - end - on_intel do - sha256 "8a24804e48247104a1e59e99620e57bbe456018fef84b2dff911175908057017" - - url "https://filehost.perforce.com/perforce/r#{version.major[-2..]}.#{version.minor}/bin.macosx1015#{arch}/p4" - - binary "bin.macosx1015#{arch}", target: "p4" - end - + url "https://filehost.perforce.com/perforce/r#{version.major[-2..]}.#{version.minor}/bin.macosx#{arch}/p4" name "Perforce Helix Command-Line Client (P4)" desc "Use it to gain instant access to operations and complete control over the system" homepage "https://www.perforce.com/products/helix-core-apps/command-line-client" @@ -34,5 +22,7 @@ cask "p4" do depends_on macos: ">= :sierra" container type: :naked + binary "bin.macosx#{arch}", target: "p4" + # No zap stanza required end From d07fdb126ced9764909f52195f25d1e72b253f92 Mon Sep 17 00:00:00 2001 From: Justin Krehel <39449589+krehel@users.noreply.github.com> Date: Fri, 5 Jan 2024 13:58:55 -0500 Subject: [PATCH 4/4] perforce: style fixes --- Casks/p/perforce.rb | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/Casks/p/perforce.rb b/Casks/p/perforce.rb index 3581efe923..2808ff5358 100644 --- a/Casks/p/perforce.rb +++ b/Casks/p/perforce.rb @@ -1,19 +1,11 @@ cask "perforce" do - arch arm: "arm64", intel: "x86_64" + arch arm: "12arm64", intel: "1015x86_64" version "2023.2,2535420" + sha256 arm: "51d6052f9809013aaadab66d2568e827b41b21927894d2794ececad51c25c5b5", + intel: "dbccb96d5a954a038ae6f3f49bf7ec9cd43b7094bec56f04ecb2c8ea41a93a8e" - on_arm do - sha256 "51d6052f9809013aaadab66d2568e827b41b21927894d2794ececad51c25c5b5" - - url "https://filehost.perforce.com/perforce/r#{version.major[-2..]}.#{version.minor}/bin.macosx12#{arch}/helix-core-server.tgz" - end - on_intel do - sha256 "dbccb96d5a954a038ae6f3f49bf7ec9cd43b7094bec56f04ecb2c8ea41a93a8e" - - url "https://filehost.perforce.com/perforce/r#{version.major[-2..]}.#{version.minor}/bin.macosx1015#{arch}/helix-core-server.tgz" - end - + url "https://filehost.perforce.com/perforce/r#{version.major[-2..]}.#{version.minor}/bin.macosx#{arch}/helix-core-server.tgz" name "Perforce Helix Core Server" name "Perforce Helix Command-Line Client (P4)" name "Perforce Helix Broker (P4Broker)"