From 3d58e4ac3608f8d1f3698c78e265f4cf2cea6b2f Mon Sep 17 00:00:00 2001
From: d-millar <33498836+d-millar@users.noreply.github.com>
Date: Thu, 23 Mar 2023 11:27:47 -0400
Subject: [PATCH] GP-3247: pull-request (re-arranged)

---
 Ghidra/Debug/Debugger-swig-lldb/build.gradle      |  1 +
 .../macos_debugger_lldb_build_from_brew.sh        | 15 +++++++++++++++
 Ghidra/RuntimeScripts/build.gradle                |  6 ------
 3 files changed, 16 insertions(+), 6 deletions(-)
 rename Ghidra/{RuntimeScripts/macOS/support => Debug/Debugger-swig-lldb}/macos_debugger_lldb_build_from_brew.sh (78%)

diff --git a/Ghidra/Debug/Debugger-swig-lldb/build.gradle b/Ghidra/Debug/Debugger-swig-lldb/build.gradle
index 6d796089e0..f9e971c3bc 100644
--- a/Ghidra/Debug/Debugger-swig-lldb/build.gradle
+++ b/Ghidra/Debug/Debugger-swig-lldb/build.gradle
@@ -45,6 +45,7 @@ sourceSets {
 rootProject.assembleDistribution {
     from (this.project.projectDir.toString()) {
 		include "src/**"
+		include "*.sh"
 		include "*.txt"
 		into  { getZipPath(this.project) }
     }
diff --git a/Ghidra/RuntimeScripts/macOS/support/macos_debugger_lldb_build_from_brew.sh b/Ghidra/Debug/Debugger-swig-lldb/macos_debugger_lldb_build_from_brew.sh
similarity index 78%
rename from Ghidra/RuntimeScripts/macOS/support/macos_debugger_lldb_build_from_brew.sh
rename to Ghidra/Debug/Debugger-swig-lldb/macos_debugger_lldb_build_from_brew.sh
index 69cd60f667..d930dc8edf 100755
--- a/Ghidra/RuntimeScripts/macOS/support/macos_debugger_lldb_build_from_brew.sh
+++ b/Ghidra/Debug/Debugger-swig-lldb/macos_debugger_lldb_build_from_brew.sh
@@ -1,4 +1,19 @@
 #!/usr/bin/env bash
+## ###
+#  IP: GHIDRA
+# 
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#  
+#       http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+##
 # This script will download lldb from homebrew and
 # build the Ghidra JNI bindings for this version of
 # lldb. It will then patch your Ghidra distribution
diff --git a/Ghidra/RuntimeScripts/build.gradle b/Ghidra/RuntimeScripts/build.gradle
index 708f1d4c43..f70ebaa803 100644
--- a/Ghidra/RuntimeScripts/build.gradle
+++ b/Ghidra/RuntimeScripts/build.gradle
@@ -42,12 +42,6 @@ rootProject.PLATFORMS.each { platform ->
 			t.from (p.file("Linux/ghidraRun")) 
 		}
 
-		if (isMac(platform.name)) {
-			t.from ("${p.projectDir}/macOS/support") {
-				into "support"
-			}
-		}
-
 		if (isWindows(platform.name)) {
 			t.from ("${p.projectDir}/Windows/support") {
 				into "support"