Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-31 02:36:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-3119_ryanmkurtz_yajsw'

Browse Source
This commit is contained in:
ghidra1
2023-04-19 17:22:56 -04:00
parent e7b97c8f70 abbda21163
commit 4a2ceba6e0
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/GhidraServer/Module.manifest
+1 -1
View File
@@ -1,2 +1,2 @@
DATA SEARCH IGNORE DIR: yajsw-stable-13.05 DATA SEARCH IGNORE DIR: yajsw-stable-13.09
EXCLUDE FROM GHIDRA JAR: true EXCLUDE FROM GHIDRA JAR: true
Ghidra/Features/GhidraServer/build.gradle
+1 -1
View File
@@ -21,7 +21,7 @@ apply plugin: 'eclipse'
eclipse.project.name = 'Features GhidraServer' eclipse.project.name = 'Features GhidraServer'
def yajswRelease = "yajsw-stable-13.05" def yajswRelease = "yajsw-stable-13.09"
configurations { configurations {
runGhidraServer runGhidraServer
Ghidra/RuntimeScripts/Windows/server/ghidraSvr.bat
+14 -14
View File
@@ -68,7 +68,7 @@ set "APP_NAME=ghidraSvr"
set "APP_LONG_NAME=Ghidra Server" set "APP_LONG_NAME=Ghidra Server"
set "MODULE_DIR=Ghidra\Features\GhidraServer" set "MODULE_DIR=Ghidra\Features\GhidraServer"
set "WRAPPER_NAME_PREFIX=yajsw" set "WRAPPER_NAME_PREFIX=yajsw"
set "wrapper_tmpdir=%TEMP%" set "WRAPPER_TMPDIR=%TEMP%"
if exist "%SERVER_DIR%\..\Ghidra\" goto normal if exist "%SERVER_DIR%\..\Ghidra\" goto normal
@@ -77,13 +77,13 @@ rem NOTE: If adjusting JAVA command assignment - do not attempt to add parameter
rem NOTE: Variables that get accessed in server.conf must be lowercase rem NOTE: Variables that get accessed in server.conf must be lowercase
rem Development Environment (Eclipse classes or "gradle jar") rem Development Environment (Eclipse classes or "gradle jar")
set "ghidra_home=%SERVER_DIR%\..\..\..\.." set "GHIDRA_HOME=%SERVER_DIR%\..\..\..\.."
set "WRAPPER_CONF=%SERVER_DIR%\..\..\Common\server\server.conf" set "WRAPPER_CONF=%SERVER_DIR%\..\..\Common\server\server.conf"
set "DATA_DIR=%ghidra_home%\%MODULE_DIR%\build\data" set "DATA_DIR=%GHIDRA_HOME%\%MODULE_DIR%\build\data"
set "classpath_frag=%ghidra_home%\%MODULE_DIR%\build\dev-meta\classpath.frag" set "CLASSPATH_FRAG=%GHIDRA_HOME%\%MODULE_DIR%\build\dev-meta\classpath.frag"
set "LS_CPATH=%ghidra_home%\GhidraBuild\LaunchSupport\bin\main" set "LS_CPATH=%GHIDRA_HOME%\GhidraBuild\LaunchSupport\bin\main"
if not exist "%LS_CPATH%" ( if not exist "%LS_CPATH%" (
set "LS_CPATH=%ghidra_home%\GhidraBuild\LaunchSupport\build\libs\LaunchSupport.jar" set "LS_CPATH=%GHIDRA_HOME%\GhidraBuild\LaunchSupport\build\libs\LaunchSupport.jar"
) )
if not exist "%LS_CPATH%" ( if not exist "%LS_CPATH%" (
set ERROR=ERROR: Cannot launch from repo because Ghidra has not been compiled with Eclipse or Gradle. set ERROR=ERROR: Cannot launch from repo because Ghidra has not been compiled with Eclipse or Gradle.
@@ -93,11 +93,11 @@ if not exist "%LS_CPATH%" (
goto lab1 goto lab1
:normal :normal
set "ghidra_home=%SERVER_DIR%\.." set "GHIDRA_HOME=%SERVER_DIR%\.."
set "WRAPPER_CONF=%SERVER_DIR%\server.conf" set "WRAPPER_CONF=%SERVER_DIR%\server.conf"
set "DATA_DIR=%ghidra_home%\%MODULE_DIR%\data" set "DATA_DIR=%GHIDRA_HOME%\%MODULE_DIR%\data"
set "classpath_frag=%ghidra_home%\%MODULE_DIR%\data\classpath.frag" set "CLASSPATH_FRAG=%GHIDRA_HOME%\%MODULE_DIR%\data\classpath.frag"
set "LS_CPATH=%ghidra_home%\support\LaunchSupport.jar" set "LS_CPATH=%GHIDRA_HOME%\support\LaunchSupport.jar"
:lab1 :lab1
@@ -134,7 +134,7 @@ goto reportError
:: Get the java that will be used to launch GhidraServer :: Get the java that will be used to launch GhidraServer
set JAVA_HOME= set JAVA_HOME=
for /f "delims=*" %%i in ('call "%java%" -cp "%LS_CPATH%" LaunchSupport "%ghidra_home%" -java_home') do set JAVA_HOME=%%i for /f "delims=*" %%i in ('call "%java%" -cp "%LS_CPATH%" LaunchSupport "%GHIDRA_HOME%" -java_home') do set JAVA_HOME=%%i
if "%JAVA_HOME%" == "" ( if "%JAVA_HOME%" == "" (
set ERROR=Failed to find a supported Java runtime. Please refer to the Ghidra Installation Guide's Troubleshooting section. set ERROR=Failed to find a supported Java runtime. Please refer to the Ghidra Installation Guide's Troubleshooting section.
goto reportError goto reportError
@@ -143,8 +143,8 @@ if "%JAVA_HOME%" == "" (
rem reestablish JAVA path based upon final JAVA_HOME rem reestablish JAVA path based upon final JAVA_HOME
set "java=%JAVA_HOME%\bin\java.exe" set "java=%JAVA_HOME%\bin\java.exe"
set VMARGS=-Djava.io.tmpdir="%wrapper_tmpdir%" set VMARGS=-Djava.io.tmpdir="%WRAPPER_TMPDIR%"
set VMARGS=%VMARGS% -Djna_tmpdir="%wrapper_tmpdir%" set VMARGS=%VMARGS% -Djna_tmpdir="%WRAPPER_TMPDIR%"
:: set DEBUG=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:18888 :: set DEBUG=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:18888
@@ -188,7 +188,7 @@ goto eof
echo. echo.
echo %ERROR% echo %ERROR%
echo. echo.
echo %ERROR% >> %ghidra_home%\wrapper.log echo %ERROR% >> %GHIDRA_HOME%\wrapper.log
exit /B 1 exit /B 1
:eof :eof
gradle/support/fetchDependencies.gradle
+3 -3
View File
@@ -76,9 +76,9 @@ ext.deps = [
destination: FLAT_REPO_DIR destination: FLAT_REPO_DIR
], ],
[ [
name: "yajsw-stable-13.05.zip", name: "yajsw-stable-13.09.zip",
url: "https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-13.05/yajsw-stable-13.05.zip", url: "https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-13.09/yajsw-stable-13.09.zip",
sha256: "ff7a4c8262f7d24079b16607122bad8f6fb024f051c27b91883d9498568429a9", sha256: "4dae732a535846ae5dfab753e82a4d5f93ad9a05a065e2172bb9774a1b15453a",
destination: file("${DEPS_DIR}/GhidraServer") destination: file("${DEPS_DIR}/GhidraServer")
], ],
[ [