mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-09-28 17:11:11 -09:00
GP-693: Fixed additional issues with Ghidra and its supporting launch
scripts not being able to run correctly on Windows when an ampersand was in the path. Also fixed an issue with svrAdmin.bat and buildGhidraJar.bat not working if the Ghidra path contained a space.
This commit is contained in:
@@ -24,7 +24,7 @@ set VMARG_LIST=-XX:ParallelGCThreads=2
|
||||
set VMARG_LIST=%VMARG_LIST% -XX:CICompilerCount=2
|
||||
|
||||
:: store current path
|
||||
set filepath=%~dp0
|
||||
set "filepath=%~dp0"
|
||||
|
||||
:: Loop through parameters (if there aren't any, just continue) and store
|
||||
:: in params variable.
|
||||
|
||||
@@ -8,9 +8,9 @@ setlocal
|
||||
set LAUNCH_MODE=fg
|
||||
|
||||
:: Sets SCRIPT_DIR to the directory that contains this file (ends with '\')
|
||||
set SCRIPT_DIR=%~dp0
|
||||
set "SCRIPT_DIR=%~dp0"
|
||||
|
||||
set GHIDRA_ROOT_DIR=%SCRIPT_DIR%..\Ghidra
|
||||
set "GHIDRA_ROOT_DIR=%SCRIPT_DIR%..\Ghidra"
|
||||
if exist "%GHIDRA_ROOT_DIR%" goto continue
|
||||
|
||||
echo This script does not support development mode use
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
setlocal
|
||||
|
||||
REM Get parent of current folder
|
||||
set SCRIPT_DIR=%~dp0
|
||||
set "SCRIPT_DIR=%~dp0"
|
||||
|
||||
set GHIDRA_DIR=%SCRIPT_DIR%..\Ghidra
|
||||
set "GHIDRA_DIR=%SCRIPT_DIR%..\Ghidra"
|
||||
set OS_DIR=os
|
||||
|
||||
REM Production Environment
|
||||
if exist "%GHIDRA_DIR%" goto continue
|
||||
|
||||
REM Development Environment
|
||||
set GHIDRA_DIR=%SCRIPT_DIR%..\..\..
|
||||
set "GHIDRA_DIR=%SCRIPT_DIR%..\..\.."
|
||||
set OS_DIR=build\os
|
||||
|
||||
:continue
|
||||
@@ -35,7 +35,7 @@ if exist "%PROGRAMFILES(X86)%" (
|
||||
set OS_TYPE=win32
|
||||
)
|
||||
|
||||
set PDB_EXE=%GHIDRA_DIR%\Features\PDB\%OS_DIR%\%OS_TYPE%\pdb.exe
|
||||
set "PDB_EXE=%GHIDRA_DIR%\Features\PDB\%OS_DIR%\%OS_TYPE%\pdb.exe"
|
||||
|
||||
if not exist "%PDB_EXE%" (
|
||||
echo "%PDB_EXE% not found"
|
||||
|
||||
@@ -26,6 +26,6 @@ set VMARG_LIST=-XX:ParallelGCThreads=2
|
||||
set VMARG_LIST=%VMARG_LIST% -XX:CICompilerCount=2
|
||||
|
||||
:: store current path
|
||||
set filepath=%~dp0
|
||||
set "filepath=%~dp0"
|
||||
|
||||
call "%filepath%launch.bat" %LAUNCH_MODE% Ghidra-Python "%MAXMEM%" "%VMARG_LIST%" ghidra.python.PythonRun %params%
|
||||
|
||||
Reference in New Issue
Block a user