Author: donaldp
Date: Mon Nov 12 08:04:36 2012
New Revision: 1408181
URL: http://svn.apache.org/viewvc?rev=1408181&view=rev
Log:
Update the scripts to work with the new al;l-i-one
Removed:
buildr/trunk/all-in-one/_buildr
Modified:
buildr/trunk/all-in-one/buildr
buildr/trunk/all-in-one/buildr.cmd
Modified: buildr/trunk/all-in-one/buildr
URL:
http://svn.apache.org/viewvc/buildr/trunk/all-in-one/buildr?rev=1408181&r1=1408180&r2=1408181&view=diff
==============================================================================
--- buildr/trunk/all-in-one/buildr (original)
+++ buildr/trunk/all-in-one/buildr Mon Nov 12 08:04:36 2012
@@ -1,26 +1,8 @@
#!/bin/bash
# -----------------------------------------------------------------------------
-# jruby.sh - Start Script for the JRuby interpreter
-#
-# Environment Variable Prequisites
-#
-# JRUBY_OPTS (Optional) Default JRuby command line args
-# JRUBY_SHELL Where/What is system shell
-#
-# JAVA_HOME Must point at your Java Development Kit installation.
-#
+# buildr.sh - Start Script for the Buildr interpreter
# -----------------------------------------------------------------------------
-cygwin=false
-
-# ----- Identify OS we are running under --------------------------------------
-case "`uname`" in
- CYGWIN*) cygwin=true;;
- Darwin) darwin=true;;
-esac
-
-# ----- Verify and Set Required Environment Variables -------------------------
-
## resolve links - $0 may be a link to home
PRG=$0
progname=`basename "$0"`
@@ -39,330 +21,6 @@ while [ -h "$PRG" ] ; do
fi
done
-JRUBY_HOME_1=`dirname "$PRG"` # the ./bin dir
-if [ "$JRUBY_HOME_1" = '.' ] ; then
- cwd=`pwd`
- JRUBY_HOME=`dirname $cwd` # JRUBY-2699
-else
- JRUBY_HOME=`dirname "$JRUBY_HOME_1"` # the . dir
-fi
-
-if [ -z "$JRUBY_OPTS" ] ; then
- JRUBY_OPTS=""
-fi
-
-JRUBY_OPTS_SPECIAL="--ng" # space-separated list of special flags
-unset JRUBY_OPTS_TEMP
-function process_special_opts {
- case $1 in
- --ng) nailgun_client=true;;
- *) break;;
- esac
-}
-for opt in ${JRUBY_OPTS[@]}; do
- for special in ${JRUBY_OPTS_SPECIAL[@]}; do
- if [ $opt != $special ]; then
- JRUBY_OPTS_TEMP="${JRUBY_OPTS_TEMP} $opt"
- else
- # make sure flags listed in JRUBY_OPTS_SPECIAL are processed
- case "$opt" in
- --ng)
- process_special_opts $opt;;
- esac
- fi
- done
-done
-JRUBY_OPTS=${JRUBY_OPTS_TEMP}
-
-if [ -z "$JAVA_HOME" ] ; then
- JAVA_CMD='java'
-else
- if $cygwin; then
- JAVA_HOME=`cygpath -u "$JAVA_HOME"`
- fi
- JAVA_CMD="$JAVA_HOME/bin/java"
-fi
-
-# If you're seeing odd exceptions, you may have a bad JVM install.
-# Uncomment this and report the version to the JRuby team along with error.
-#$JAVA_CMD -version
-
-JRUBY_SHELL=/bin/sh
-
-# ----- Set Up The Boot Classpath -------------------------------------------
-
-CP_DELIMITER=":"
-
-# add main jruby jar to the bootclasspath
-for j in "$JRUBY_HOME"/lib/jruby.jar "$JRUBY_HOME"/lib/jruby-complete.jar; do
- if [ ! -e "$j" ]; then
- continue
- fi
- if [ "$JRUBY_CP" ]; then
- JRUBY_CP="$JRUBY_CP$CP_DELIMITER$j"
- else
- JRUBY_CP="$j"
- fi
- if [ $JRUBY_ALREADY_ADDED ]; then
- echo "WARNING: more than one JRuby JAR found in lib directory"
- fi
- JRUBY_ALREADY_ADDED=true
-done
-
-if $cygwin; then
- JRUBY_CP=`cygpath -p -w "$JRUBY_CP"`
-fi
-
-# ----- Set Up The System Classpath -------------------------------------------
-
-if [ "$JRUBY_PARENT_CLASSPATH" != "" ]; then
- # Use same classpath propagated from parent jruby
- CP=$JRUBY_PARENT_CLASSPATH
-else
- # add other jars in lib to CP for command-line execution
- for j in "$JRUBY_HOME"/lib/*.jar; do
- if [ "$j" == "$JRUBY_HOME"/lib/jruby.jar ]; then
- continue
- fi
- if [ "$j" == "$JRUBY_HOME"/lib/jruby-complete.jar ]; then
- continue
- fi
- if [ "$CP" ]; then
- CP="$CP$CP_DELIMITER$j"
- else
- CP="$j"
- fi
- done
-
- if $cygwin; then
- CP=`cygpath -p -w "$CP"`
- fi
-fi
-
-if $cygwin; then
- # switch delimiter only after building Unix style classpaths
- CP_DELIMITER=";"
-fi
-
-# ----- Execute The Requested Command -----------------------------------------
-
-if [ -z "$JAVA_MEM" ] ; then
- JAVA_MEM=-Xmx500m
-fi
-
-if [ -z "$JAVA_STACK" ] ; then
- JAVA_STACK=-Xss1024k
-fi
-
-JAVA_VM=-client
-JAVA_ENCODING=""
-
-declare -a java_args
-declare -a ruby_args
-
-java_class=org.jruby.Main
-
-# Split out any -J argument for passing to the JVM.
-# Scanning for args is aborted by '--'.
-while [ $# -gt 0 ]
-do
- case "$1" in
- # Stuff after '-J' in this argument goes to JVM
- -J*)
- val=${1:2}
- if [ "${val:0:4}" = "-Xmx" ]; then
- JAVA_MEM=$val
- elif [ "${val:0:4}" = "-Xss" ]; then
- JAVA_STACK=$val
- elif [ "${val}" = "" ]; then
- $JAVA_CMD -help
- echo "(Prepend -J in front of these options when using 'jruby'
command)"
- exit
- elif [ "${val}" = "-X" ]; then
- $JAVA_CMD -X
- echo "(Prepend -J in front of these options when using 'jruby'
command)"
- exit
- elif [ "${val}" = "-classpath" ]; then
- CP="$CP$CP_DELIMITER$2"
- CLASSPATH=""
- shift
- elif [ "${val}" = "-cp" ]; then
- CP="$CP$CP_DELIMITER$2"
- CLASSPATH=""
- shift
- else
- if [ "${val:0:3}" = "-ea" ]; then
- VERIFY_JRUBY="yes"
- elif [ "${val:0:16}" = "-Dfile.encoding=" ]; then
- JAVA_ENCODING=$val
- fi
- java_args=("${java_args[@]}" "${1:2}")
- fi
- ;;
- # Match switches that take an argument
- -C|-e|-I|-S) ruby_args=("${ruby_args[@]}" "$1" "$2"); shift ;;
- # Match same switches with argument stuck together
- -e*|-I*|-S*) ruby_args=("${ruby_args[@]}" "$1" ) ;;
- # Run with the instrumented profiler: http://jiprof.sourceforge.net/
- --profile)
- PROFILE_ARGS="-javaagent:$JRUBY_HOME/lib/profile.jar
-Dprofile.properties=$JRUBY_HOME/lib/profile-ruby.properties"
- JRUBY_OPTS=("${JRUBY_OPTS[@]}" "-X+C")
- VERIFY_JRUBY="yes"
- ;;
- # Run with the instrumented profiler: http://jiprof.sourceforge.net/
- --profile-all)
- PROFILE_ARGS="-javaagent:$JRUBY_HOME/lib/profile.jar
-Dprofile.properties=$JRUBY_HOME/lib/profile-all.properties"
- JRUBY_OPTS=("${JRUBY_OPTS[@]}" "-X+C")
- VERIFY_JRUBY="yes"
- ;;
- # Run with JMX management enabled
- --manage)
- java_args=("${java_args[@]}" "-Dcom.sun.management.jmxremote")
- java_args=("${java_args[@]}" "-Djruby.management.enabled=true") ;;
- # Don't launch a GUI window, no matter what
- --headless)
- java_args=("${java_args[@]}" "-Djava.awt.headless=true") ;;
- # Run under JDB
- --jdb)
- if [ -z "$JAVA_HOME" ] ; then
- JAVA_CMD='jdb'
- else
- if $cygwin; then
- JAVA_HOME=`cygpath -u "$JAVA_HOME"`
- fi
- JAVA_CMD="$JAVA_HOME/bin/jdb"
- fi
- java_args=("${java_args[@]}" "-sourcepath"
"$JRUBY_HOME/lib/ruby/1.8:.")
- JRUBY_OPTS=("${JRUBY_OPTS[@]}" "-X+C") ;;
- --client)
- JAVA_VM=-client ;;
- --server)
- JAVA_VM=-server ;;
- --noclient) # JRUBY-4296
- unset JAVA_VM ;; # For IBM JVM, neither '-client' nor '-server' is
applicable
- --sample)
- java_args=("${java_args[@]}" "-Xprof") ;;
- --ng-server)
- # Start up as Nailgun server
- java_class=com.martiansoftware.nailgun.NGServer
- VERIFY_JRUBY=true ;;
- --ng)
- # Use native Nailgun client to toss commands to server
- process_special_opts "--ng" ;;
- # Abort processing on the double dash
- --) break ;;
- # Other opts go to ruby
- -*) ruby_args=("${ruby_args[@]}" "$1") ;;
- # Abort processing on first non-opt arg
- *) break ;;
- esac
- shift
-done
-
-# Force file.encoding to UTF-8 when on Mac, since Apple JDK defaults to
MacRoman (JRUBY-3576)
-if [[ $darwin && -z "$JAVA_ENCODING" ]]; then
- java_args=("${java_args[@]}" "-Dfile.encoding=UTF-8")
-fi
-
-# Add a property to report memory max
-JAVA_OPTS="$JAVA_OPTS $JAVA_VM -Djruby.memory.max=${JAVA_MEM:4}
-Djruby.stack.max=${JAVA_STACK:4}"
-
-# Append the rest of the arguments
-ruby_args=("${ruby_args[@]}" "$@")
-
-# Put the ruby_args back into the position arguments $1, $2 etc
-set -- "${ruby_args[@]}"
-
-JAVA_OPTS="$JAVA_OPTS $JAVA_MEM $JAVA_STACK"
-
-JFFI_BOOT=""
-if [ -d $JRUBY_HOME/lib/native/ ]; then
- for d in $JRUBY_HOME/lib/native/*`uname -s`; do
- if [ -z "$JFFI_BOOT" ]; then
- JFFI_BOOT="$d"
- else
- JFFI_BOOT="$JFFI_BOOT:$d"
- fi
- done
-fi
-JFFI_OPTS="-Djffi.boot.library.path=$JFFI_BOOT"
-
-if $cygwin; then
- JRUBY_HOME=`cygpath --mixed "$JRUBY_HOME"`
- JRUBY_SHELL=`cygpath --mixed "$JRUBY_SHELL"`
-
- if [[ ( "${1:0:1}" = "/" ) && ( ( -f "$1" ) || ( -d "$1" )) ]]; then
- win_arg=`cygpath -w "$1"`
- shift
- win_args=("$win_arg" "$@")
- set -- "${win_args[@]}"
- fi
-
- # fix JLine to use UnixTerminal
- stty -icanon min 1 -echo > /dev/null 2>&1
- if [ $? = 0 ]; then
- JAVA_OPTS="$JAVA_OPTS -Djline.terminal=jline.UnixTerminal"
- fi
-
-fi
-
-if [ "$nailgun_client" != "" ]; then
- if [ -f $JRUBY_HOME/tool/nailgun/ng ]; then
- exec $JRUBY_HOME/tool/nailgun/ng org.jruby.util.NailMain $JRUBY_OPTS "$@"
- else
- echo "error: ng executable not found; run 'make' in
${JRUBY_HOME}/tool/nailgun"
- exit 1
- fi
-else
-if [ "$VERIFY_JRUBY" != "" ]; then
- if [ "$PROFILE_ARGS" != "" ]; then
- echo "Running with instrumented profiler"
- fi
-
- "$JAVA_CMD" $PROFILE_ARGS $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}"
-classpath "$JRUBY_CP$CP_DELIMITER$CP$CP_DELIMITER$CLASSPATH" \
- "-Djruby.home=$JRUBY_HOME" \
- "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
- "-Djruby.shell=$JRUBY_SHELL" \
- $java_class $JRUBY_OPTS -S _buildr "$@"
-
- # Record the exit status immediately, or it will be overridden.
- JRUBY_STATUS=$?
-
- if [ "$PROFILE_ARGS" != "" ]; then
- echo "Profiling results:"
- cat profile.txt
- rm profile.txt
- fi
-
- if $cygwin; then
- stty icanon echo > /dev/null 2>&1
- fi
-
- exit $JRUBY_STATUS
-else
- if $cygwin; then
- # exec doed not work correctly with cygwin bash
- "$JAVA_CMD" $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}"
-Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
- "-Djruby.home=$JRUBY_HOME" \
- "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
- "-Djruby.shell=$JRUBY_SHELL" \
- $java_class $JRUBY_OPTS -S _buildr "$@"
-
- # Record the exit status immediately, or it will be overridden.
- JRUBY_STATUS=$?
-
- stty icanon echo > /dev/null 2>&1
-
- exit $JRUBY_STATUS
- else
- exec "$JAVA_CMD" $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}"
-Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
- "-Djruby.home=$JRUBY_HOME" \
- "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
- "-Djruby.shell=$JRUBY_SHELL" \
- $java_class $JRUBY_OPTS -S _buildr "$@"
- fi
-fi
-fi
+BUILDR_HOME=`dirname "$PRG"`
-# Be careful adding code down here, you might override the exit
-# status of the jruby invocation.
+$BUILDR_HOME/../embedded/bin/jruby -S buildr $*
Modified: buildr/trunk/all-in-one/buildr.cmd
URL:
http://svn.apache.org/viewvc/buildr/trunk/all-in-one/buildr.cmd?rev=1408181&r1=1408180&r2=1408181&view=diff
==============================================================================
--- buildr/trunk/all-in-one/buildr.cmd (original)
+++ buildr/trunk/all-in-one/buildr.cmd Mon Nov 12 08:04:36 2012
@@ -1 +1 @@
-@%~dp0\_buildr.exe %*
\ No newline at end of file
+@%~dp0\..\embedded\jruby.exe %*
\ No newline at end of file
