Merge remote-tracking branch

'origin/GP-815_ryanmkurtz_launch-check--SQUASHED' (Closes NationalSecurityAgency#2872)
Modular-X-01 · Mar 30, 2021 · d6810f7 · d6810f7
2 parents 011d5f2 + dc40114
commit d6810f7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/Ghidra/RuntimeScripts/Linux/support/launch.sh b/Ghidra/RuntimeScripts/Linux/support/launch.sh
@@ -101,6 +101,10 @@ else
 	CPATH="${INSTALL_DIR}/Ghidra/Framework/Utility/bin/main"
 	LS_CPATH="${INSTALL_DIR}/GhidraBuild/LaunchSupport/bin/main"
 	DEBUG_LOG4J="${INSTALL_DIR}/Ghidra/RuntimeScripts/Common/support/debug.log4j.xml"
+	if ! [ -d "${LS_CPATH}" ]; then
+		echo "Ghidra cannot launch in development mode because Eclipse has not compiled its class files."
+		exit 1
+	fi
 fi
 
 # Make sure some kind of java is on the path.  It's required to run the LaunchSupport program.

diff --git a/Ghidra/RuntimeScripts/Windows/support/launch.bat b/Ghidra/RuntimeScripts/Windows/support/launch.bat
@@ -77,6 +77,11 @@ set "INSTALL_DIR=%INSTALL_DIR%..\..\..\"
 set "CPATH=%INSTALL_DIR%Ghidra\Framework\Utility\bin\main"
 set "LS_CPATH=%INSTALL_DIR%GhidraBuild\LaunchSupport\bin\main"
 set "DEBUG_LOG4J=%INSTALL_DIR%Ghidra\RuntimeScripts\Common\support\debug.log4j.xml"
+if not exist "%LS_CPATH%" (
+	echo Ghidra cannot launch in development mode because Eclipse has not compiled its class files.
+	set ERRORLEVEL=1
+	goto exit1
+)
 
 :continue2