@@ -21,6 +21,10 @@ if [ -f "$NARWHAL_HOME/narwhal.conf" ]; then source "$NARWHAL_HOME"/narwhal.conf fi +if [ -n "$NARWHAL_DEBUG" ]; then + export NARWHAL_DEBUG +fi + # if NARWHAL_ENGINE isn't yet set, set it to the default engine, and export it if [ -z "$NARWHAL_ENGINE" ]; then NARWHAL_ENGINE=$NARWHAL_DEFAULT_ENGINE bin/narwhal @@ -145,6 +145,11 @@ Environment Variables command line arguments have been parsed, which happens before packages are loaded. +* `NARWHAL_DEBUGGER` starts Narwhal with a debugger + GUI if one is available for the engine. For the + Rhino-Java engine, this activates the Rhino Java + AWT-based debugger. + * `SEA` is an environment variable set by `sea` that notifies `narwhal` to search the given virtual environment for packages first. This function can docs/narwhal.md @@ -33,7 +33,11 @@ if [ "$(which cygpath 2>/dev/null)" ]; then export NARWHAL_ENGINE_HOME=$(cygpath -wa -- "$NARWHAL_ENGINE_HOME") fi -JAVA_MAIN=org.mozilla.javascript.tools.shell.Main +if [ -z "$NARWHAL_DEBUGGER" ] || [ "$NARWHAL_DEBUGGER" -eq 0 ]; then + JAVA_MAIN=org.mozilla.javascript.tools.shell.Main +else + JAVA_MAIN=org.mozilla.javascript.tools.debugger.Main +fi # check the java version number in the most complicated fashion imaginable JAVA_VERSION=$(java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}') engines/rhino/bin/narwhal-rhino @@ -1,9 +1,13 @@ -# Rhino -NARWHAL_DEFAULT_ENGINE="rhino" +# If a debugger is available for your engine, use it? +#NARWHAL_DEBUGGER=1 + +# Alternate engines -# k7 -#NARWHAL_DEFAULT_ENGINE="k7" +# Rhino +#NARWHAL_DEFAULT_ENGINE="rhino" -#NARWHAL_ENGINE_HOME="." +# JavaScript Core +#NARWHAL_ENGINE="jsc" +#NARWHAL_ENGINE_HOME="packages/jsc" narwhal.conf.template 8dcfb60f526f653b721de72a8ac238a35390c5dc kriskowal kris.kowal@cixar.com http://github.com/tlrobinson/narwhal/commit/cb6d392524dac724719310bc2c1f281abb92a2f2 cb6d392524dac724719310bc2c1f281abb92a2f2

2009-10-03T21:52:45-07:00

Added a debugger option. 95470bf15c03b0f240fdaed5b8beca6f7695c388 kriskowal kris.kowal@cixar.com