GT-2913: launch.properties can now take platform-specific VMARGS.

This commit is contained in:
Ryan Kurtz
2019-07-25 11:31:08 -04:00
parent 8c689a0099
commit fa20ba3762
7 changed files with 87 additions and 75 deletions

View File

@@ -15,20 +15,14 @@ VMARGS=-Duser.country=US
VMARGS=-Duser.language=en
VMARGS=-Duser.variant=
# The following two options increase rendering performance when using
# anti-aliasing/transparency/transforms. If you experience any trouble
# rendering Ghidra, try toggling these values
# The following options affect rendering on different platforms. It may be necessary to play
# with these settings to get Ghidra to display and perform optimally on HiDPI monitors or in VM's.
# - All platforms
VMARGS=-Dsun.java2d.opengl=false
VMARGS=-Dsun.java2d.uiScale=1
# - Linux
VMARGS=-Dsun.java2d.pmoffscreen=false
VMARGS=-Dsun.java2d.xrender=true
# - Windows
VMARGS=-Dsun.java2d.d3d=false
VMARGS=-Dsun.java2d.opengl=false
VMARGS=-Dsun.java2d.uiScale=1
VMARGS_LINUX=-Dsun.java2d.pmoffscreen=false
VMARGS_LINUX=-Dsun.java2d.xrender=true
VMARGS_LINUX=-Dawt.useSystemAAFontSettings=on
VMARGS_WINDOWS=-Dsun.java2d.d3d=false
# Set acceptable HTTPS protocols
VMARGS=-Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2
@@ -52,31 +46,34 @@ VMARGS=-Dcpu.core.override=
# Default font size for many java swing elements.
VMARGS=-Dfont.size.override=
# Temporary directory used by the application. This directory will be used for
# all temporary files and may also be used for the persistent user cache
# directory <java.io.tmpdir>/<username>-Ghidra. The specified directory must
# exist and have appropriate read/write/execute permissions
#VMARGS=-Djava.io.tmpdir=
# Eclipse on macOS can have file locking issues if the user home directory is networked. Therefore,
# we will disable file locking by default for macOS. Comment the following line out if Eclipse file
# locking is needed and known to work.
VMARGS_MACOS=-Declipse.filelock.disable=true
# Persistent cache directory used by the application. This directory will be
# used to store persistent application caches for all users. The default
# location for Mac/Linux is the same as specified by java.io.tmpdir property.
# The default location for Windows corresponds to the application local
# settings directory for the user (e.g., %LOCALAPPDATA%). If you wish to use a
# directory with more storage or avoid system cleanups, it may be desirable to
# override the default location.
# Where the menu bar is displayed on macOS
VMARGS_MACOS=-Dapple.laf.useScreenMenuBar=false
# Prevent log4j from using the Jansi DLL on Windows.
VMARGS_WINDOWS=-Dlog4j.skipJansi=true
# Persistent cache directory used by the application. This directory will be used to store
# persistent application caches for all users. The default location for Mac/Linux is the same as
# specified by java.io.tmpdir property. The default location for Windows corresponds to the
# application local settings directory for the user (e.g., %LOCALAPPDATA%). If you wish to use a
# directory with more storage or avoid system cleanups, it may be desirable to override the default
# location.
#VMARGS=-Dapplication.cachedir=
# Temporary directory used by the application. This directory will be used for all temporary files
# and may also be used for the persistent user cache directory <java.io.tmpdir>/<username>-Ghidra.
# The specified directory must exist and have appropriate read/write/execute permissions
#VMARGS=-Djava.io.tmpdir=
# Disable alternating row colors in tables
#VMARGS=-Ddisable.alternating.row.colors=true
# Hoist the menu bar out of the window on macOS
#VMARGS=-Dapple.laf.useScreenMenuBar=true
# The ContinuesInterceptor allows the import process to proceed if parsing corrupted headers
# generates uncaught exceptions. Disabling it can be helpful when trying to debug what went
# wrong because the ContinuesIntercepter affects the usefulness of the stack trace.
#VMARGS=-DContinuesInterceptor.disabled
# Prevent log4j from using the Jansi DLL on Windows.
VMARGS=-Dlog4j.skipJansi=true
#VMARGS=-DContinuesInterceptor.disabled=true

View File

@@ -116,17 +116,6 @@ VMARG_LIST+=" $(java -cp "${LS_CPATH}" LaunchSupport "${INSTALL_DIR}" -vmargs)"
# Add extra macOS VM arguments
if [ "$(uname -s)" = "Darwin" ]; then
VMARG_LIST+=" -Xdock:name=${APPNAME}"
VMARG_LIST+=" -Xdock:icon=\"${INSTALL_DIR}/Ghidra/Features/Base/os/osx64/ghidra.icns\""
# Eclipse on macOS (Darwin) can have file locking issues if the user home directory is
# networked. Therefore, we will disable file locking by default for macOS. Comment the
# following line out if Eclipse file locking is needed and known to work.
VMARG_LIST+=" -Declipse.filelock.disable=true"
fi
# Add extra Linux VM arguments
if [ "$(uname -s)" = "Linux" ]; then
VMARG_LIST+=" -Dawt.useSystemAAFontSettings=on"
fi
# Set Max Heap Size if specified