Browse Source

Allow --javamaxmem as well as -javamaxmem (same for --javastack).

This is consistent with all other switches in PRISM, but these are handled
separately, in the launch shell scripts, so have to be detected there.
accumulation-v4.7
Dave Parker 6 years ago
parent
commit
931bbbb0b1
  1. 4
      prism/src/bin/prism.cygwin
  2. 4
      prism/src/bin/prism.darwin32
  3. 4
      prism/src/bin/prism.darwin64
  4. 4
      prism/src/bin/prism.linux

4
prism/src/bin/prism.cygwin

@ -15,7 +15,7 @@ fi
# If there is a -javamaxmem switch, use it for PRISM_JAVAMAXMEM
ARGS=( "$@" )
for ((i=0;i<${#ARGS[@]};i+=1)); do
if [ "${ARGS[$i]}" = "-javamaxmem" ]; then
if [ "${ARGS[$i]}" = "-javamaxmem" -o "${ARGS[$i]}" = "--javamaxmem" ]; then
PRISM_JAVAMAXMEM=${ARGS[$i+1]}
PRISM_JAVAMAXMEM=`echo "$PRISM_JAVAMAXMEM" | awk /^[0-9]+[kmg]?$/`
if [ "$PRISM_JAVAMAXMEM" = "" ]; then
@ -40,7 +40,7 @@ fi
# If there is a -javastack switch, use it for PRISM_JAVASTACKSIZE
for ((i=0;i<${#ARGS[@]};i+=1)); do
if [ "${ARGS[$i]}" = "-javastack" ]; then
if [ "${ARGS[$i]}" = "-javastack" -o "${ARGS[$i]}" = "--javastack" ]; then
PRISM_JAVASTACKSIZE=${ARGS[$i+1]}
PRISM_JAVASTACKSIZE=`echo "$PRISM_JAVASTACKSIZE" | awk /^[0-9]+[kmg]?$/`
if [ "$PRISM_JAVASTACKSIZE" = "" ]; then

4
prism/src/bin/prism.darwin32

@ -21,7 +21,7 @@ fi
# If there is a -javamaxmem switch, use it for PRISM_JAVAMAXMEM
ARGS=( "$@" )
for ((i=0;i<${#ARGS[@]};i+=1)); do
if [ "${ARGS[$i]}" = "-javamaxmem" ]; then
if [ "${ARGS[$i]}" = "-javamaxmem" -o "${ARGS[$i]}" = "--javamaxmem" ]; then
PRISM_JAVAMAXMEM=${ARGS[$i+1]}
PRISM_JAVAMAXMEM=`echo "$PRISM_JAVAMAXMEM" | awk /^[0-9]+[kmg]?$/`
if [ "$PRISM_JAVAMAXMEM" = "" ]; then
@ -46,7 +46,7 @@ fi
# If there is a -javastack switch, use it for PRISM_JAVASTACKSIZE
for ((i=0;i<${#ARGS[@]};i+=1)); do
if [ "${ARGS[$i]}" = "-javastack" ]; then
if [ "${ARGS[$i]}" = "-javastack" -o "${ARGS[$i]}" = "--javastack" ]; then
PRISM_JAVASTACKSIZE=${ARGS[$i+1]}
PRISM_JAVASTACKSIZE=`echo "$PRISM_JAVASTACKSIZE" | awk /^[0-9]+[kmg]?$/`
if [ "$PRISM_JAVASTACKSIZE" = "" ]; then

4
prism/src/bin/prism.darwin64

@ -21,7 +21,7 @@ fi
# If there is a -javamaxmem switch, use it for PRISM_JAVAMAXMEM
ARGS=( "$@" )
for ((i=0;i<${#ARGS[@]};i+=1)); do
if [ "${ARGS[$i]}" = "-javamaxmem" ]; then
if [ "${ARGS[$i]}" = "-javamaxmem" -o "${ARGS[$i]}" = "--javamaxmem" ]; then
PRISM_JAVAMAXMEM=${ARGS[$i+1]}
PRISM_JAVAMAXMEM=`echo "$PRISM_JAVAMAXMEM" | awk /^[0-9]+[kmg]?$/`
if [ "$PRISM_JAVAMAXMEM" = "" ]; then
@ -46,7 +46,7 @@ fi
# If there is a -javastack switch, use it for PRISM_JAVASTACKSIZE
for ((i=0;i<${#ARGS[@]};i+=1)); do
if [ "${ARGS[$i]}" = "-javastack" ]; then
if [ "${ARGS[$i]}" = "-javastack" -o "${ARGS[$i]}" = "--javastack" ]; then
PRISM_JAVASTACKSIZE=${ARGS[$i+1]}
PRISM_JAVASTACKSIZE=`echo "$PRISM_JAVASTACKSIZE" | awk /^[0-9]+[kmg]?$/`
if [ "$PRISM_JAVASTACKSIZE" = "" ]; then

4
prism/src/bin/prism.linux

@ -15,7 +15,7 @@ fi
# If there is a -javamaxmem switch, use it for PRISM_JAVAMAXMEM
ARGS=( "$@" )
for ((i=0;i<${#ARGS[@]};i+=1)); do
if [ "${ARGS[$i]}" = "-javamaxmem" ]; then
if [ "${ARGS[$i]}" = "-javamaxmem" -o "${ARGS[$i]}" = "--javamaxmem" ]; then
PRISM_JAVAMAXMEM=${ARGS[$i+1]}
PRISM_JAVAMAXMEM=`echo "$PRISM_JAVAMAXMEM" | awk /^[0-9]+[kmg]?$/`
if [ "$PRISM_JAVAMAXMEM" = "" ]; then
@ -40,7 +40,7 @@ fi
# If there is a -javastack switch, use it for PRISM_JAVASTACKSIZE
for ((i=0;i<${#ARGS[@]};i+=1)); do
if [ "${ARGS[$i]}" = "-javastack" ]; then
if [ "${ARGS[$i]}" = "-javastack" -o "${ARGS[$i]}" = "--javastack" ]; then
PRISM_JAVASTACKSIZE=${ARGS[$i+1]}
PRISM_JAVASTACKSIZE=`echo "$PRISM_JAVASTACKSIZE" | awk /^[0-9]+[kmg]?$/`
if [ "$PRISM_JAVASTACKSIZE" = "" ]; then

Loading…
Cancel
Save