Merge remote-tracking branch

'origin/GP-815_ryanmkurtz_launch-check--SQUASHED' (Closes #2872)
This commit is contained in:
ghidra1 2021-03-30 14:28:54 -04:00
commit d6810f76c3
2 changed files with 9 additions and 0 deletions

View file

@ -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.

View file

@ -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