-
Notifications
You must be signed in to change notification settings - Fork 28.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
set progress bars for curl and wget when not run on jenkins, no progr…
…ess bar when run on jenkins, moved sbt script to build/sbt, wrote stub and warning under sbt/sbt which calls build/sbt, modified build/sbt to use the correct directory, fixed bug in build/sbt-launch-lib.bash to correctly pull the sbt version
- Loading branch information
Brennon York
committed
Dec 23, 2014
1 parent
be11317
commit b8437ba
Showing
6 changed files
with
134 additions
and
118 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,7 @@ | |
| *.pyc | ||
| .idea/ | ||
| .idea_modules/ | ||
| sbt/*.jar | ||
| build/*.jar | ||
| .settings | ||
| .cache | ||
| cache | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| # When creating new tests for Spark SQL Hive, the HADOOP_CLASSPATH must contain the hive jars so | ||
| # that we can run Hive to generate the golden answer. This is not required for normal development | ||
| # or testing. | ||
| for i in "$HIVE_HOME"/lib/* | ||
| do HADOOP_CLASSPATH="$HADOOP_CLASSPATH:$i" | ||
| done | ||
| export HADOOP_CLASSPATH | ||
|
|
||
| realpath () { | ||
| ( | ||
| TARGET_FILE="$1" | ||
|
|
||
| cd "$(dirname "$TARGET_FILE")" | ||
| TARGET_FILE="$(basename "$TARGET_FILE")" | ||
|
|
||
| COUNT=0 | ||
| while [ -L "$TARGET_FILE" -a $COUNT -lt 100 ] | ||
| do | ||
| TARGET_FILE="$(readlink "$TARGET_FILE")" | ||
| cd $(dirname "$TARGET_FILE") | ||
| TARGET_FILE="$(basename $TARGET_FILE)" | ||
| COUNT=$(($COUNT + 1)) | ||
| done | ||
|
|
||
| echo "$(pwd -P)/"$TARGET_FILE"" | ||
| ) | ||
| } | ||
|
|
||
| . "$(dirname "$(realpath "$0")")"/sbt-launch-lib.bash | ||
|
|
||
|
|
||
| declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy" | ||
| declare -r sbt_opts_file=".sbtopts" | ||
| declare -r etc_sbt_opts_file="/etc/sbt/sbtopts" | ||
|
|
||
| usage() { | ||
| cat <<EOM | ||
| Usage: $script_name [options] | ||
| -h | -help print this message | ||
| -v | -verbose this runner is chattier | ||
| -d | -debug set sbt log level to debug | ||
| -no-colors disable ANSI color codes | ||
| -sbt-create start sbt even if current directory contains no sbt project | ||
| -sbt-dir <path> path to global settings/plugins directory (default: ~/.sbt) | ||
| -sbt-boot <path> path to shared boot directory (default: ~/.sbt/boot in 0.11 series) | ||
| -ivy <path> path to local Ivy repository (default: ~/.ivy2) | ||
| -mem <integer> set memory options (default: $sbt_mem, which is $(get_mem_opts $sbt_mem)) | ||
| -no-share use all local caches; no sharing | ||
| -no-global uses global caches, but does not use global ~/.sbt directory. | ||
| -jvm-debug <port> Turn on JVM debugging, open at the given port. | ||
| -batch Disable interactive mode | ||
| # sbt version (default: from project/build.properties if present, else latest release) | ||
| -sbt-version <version> use the specified version of sbt | ||
| -sbt-jar <path> use the specified jar as the sbt launcher | ||
| -sbt-rc use an RC version of sbt | ||
| -sbt-snapshot use a snapshot version of sbt | ||
| # java version (default: java from PATH, currently $(java -version 2>&1 | grep version)) | ||
| -java-home <path> alternate JAVA_HOME | ||
| # jvm options and output control | ||
| JAVA_OPTS environment variable, if unset uses "$java_opts" | ||
| SBT_OPTS environment variable, if unset uses "$default_sbt_opts" | ||
| .sbtopts if this file exists in the current directory, it is | ||
| prepended to the runner args | ||
| /etc/sbt/sbtopts if this file exists, it is prepended to the runner args | ||
| -Dkey=val pass -Dkey=val directly to the java runtime | ||
| -J-X pass option -X directly to the java runtime | ||
| (-J is stripped) | ||
| -S-X add -X to sbt's scalacOptions (-S is stripped) | ||
| -PmavenProfiles Enable a maven profile for the build. | ||
| In the case of duplicated or conflicting options, the order above | ||
| shows precedence: JAVA_OPTS lowest, command line options highest. | ||
| EOM | ||
| } | ||
|
|
||
| process_my_args () { | ||
| while [[ $# -gt 0 ]]; do | ||
| case "$1" in | ||
| -no-colors) addJava "-Dsbt.log.noformat=true" && shift ;; | ||
| -no-share) addJava "$noshare_opts" && shift ;; | ||
| -no-global) addJava "-Dsbt.global.base=$(pwd)/project/.sbtboot" && shift ;; | ||
| -sbt-boot) require_arg path "$1" "$2" && addJava "-Dsbt.boot.directory=$2" && shift 2 ;; | ||
| -sbt-dir) require_arg path "$1" "$2" && addJava "-Dsbt.global.base=$2" && shift 2 ;; | ||
| -debug-inc) addJava "-Dxsbt.inc.debug=true" && shift ;; | ||
| -batch) exec </dev/null && shift ;; | ||
|
|
||
| -sbt-create) sbt_create=true && shift ;; | ||
|
|
||
| *) addResidual "$1" && shift ;; | ||
| esac | ||
| done | ||
|
|
||
| # Now, ensure sbt version is used. | ||
| [[ "${sbt_version}XXX" != "XXX" ]] && addJava "-Dsbt.version=$sbt_version" | ||
| } | ||
|
|
||
| loadConfigFile() { | ||
| cat "$1" | sed '/^\#/d' | ||
| } | ||
|
|
||
| # if sbtopts files exist, prepend their contents to $@ so it can be processed by this runner | ||
| [[ -f "$etc_sbt_opts_file" ]] && set -- $(loadConfigFile "$etc_sbt_opts_file") "$@" | ||
| [[ -f "$sbt_opts_file" ]] && set -- $(loadConfigFile "$sbt_opts_file") "$@" | ||
|
|
||
| run "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,111 +1,9 @@ | ||
| #!/usr/bin/env bash | ||
| #!/bin/bash | ||
|
|
||
| # When creating new tests for Spark SQL Hive, the HADOOP_CLASSPATH must contain the hive jars so | ||
| # that we can run Hive to generate the golden answer. This is not required for normal development | ||
| # or testing. | ||
| for i in "$HIVE_HOME"/lib/* | ||
| do HADOOP_CLASSPATH="$HADOOP_CLASSPATH:$i" | ||
| done | ||
| export HADOOP_CLASSPATH | ||
| # Determine the current working directory | ||
| _DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" | ||
|
|
||
| realpath () { | ||
| ( | ||
| TARGET_FILE="$1" | ||
| echo "WARNING: The sbt/sbt script has been deprecated in place of build/sbt." >&2 | ||
| echo " Please change all references to point to the new location." >&2 | ||
|
|
||
| cd "$(dirname "$TARGET_FILE")" | ||
| TARGET_FILE="$(basename "$TARGET_FILE")" | ||
|
|
||
| COUNT=0 | ||
| while [ -L "$TARGET_FILE" -a $COUNT -lt 100 ] | ||
| do | ||
| TARGET_FILE="$(readlink "$TARGET_FILE")" | ||
| cd $(dirname "$TARGET_FILE") | ||
| TARGET_FILE="$(basename $TARGET_FILE)" | ||
| COUNT=$(($COUNT + 1)) | ||
| done | ||
|
|
||
| echo "$(pwd -P)/"$TARGET_FILE"" | ||
| ) | ||
| } | ||
|
|
||
| . "$(dirname "$(realpath "$0")")"/sbt-launch-lib.bash | ||
|
|
||
|
|
||
| declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy" | ||
| declare -r sbt_opts_file=".sbtopts" | ||
| declare -r etc_sbt_opts_file="/etc/sbt/sbtopts" | ||
|
|
||
| usage() { | ||
| cat <<EOM | ||
| Usage: $script_name [options] | ||
| -h | -help print this message | ||
| -v | -verbose this runner is chattier | ||
| -d | -debug set sbt log level to debug | ||
| -no-colors disable ANSI color codes | ||
| -sbt-create start sbt even if current directory contains no sbt project | ||
| -sbt-dir <path> path to global settings/plugins directory (default: ~/.sbt) | ||
| -sbt-boot <path> path to shared boot directory (default: ~/.sbt/boot in 0.11 series) | ||
| -ivy <path> path to local Ivy repository (default: ~/.ivy2) | ||
| -mem <integer> set memory options (default: $sbt_mem, which is $(get_mem_opts $sbt_mem)) | ||
| -no-share use all local caches; no sharing | ||
| -no-global uses global caches, but does not use global ~/.sbt directory. | ||
| -jvm-debug <port> Turn on JVM debugging, open at the given port. | ||
| -batch Disable interactive mode | ||
| # sbt version (default: from project/build.properties if present, else latest release) | ||
| -sbt-version <version> use the specified version of sbt | ||
| -sbt-jar <path> use the specified jar as the sbt launcher | ||
| -sbt-rc use an RC version of sbt | ||
| -sbt-snapshot use a snapshot version of sbt | ||
| # java version (default: java from PATH, currently $(java -version 2>&1 | grep version)) | ||
| -java-home <path> alternate JAVA_HOME | ||
| # jvm options and output control | ||
| JAVA_OPTS environment variable, if unset uses "$java_opts" | ||
| SBT_OPTS environment variable, if unset uses "$default_sbt_opts" | ||
| .sbtopts if this file exists in the current directory, it is | ||
| prepended to the runner args | ||
| /etc/sbt/sbtopts if this file exists, it is prepended to the runner args | ||
| -Dkey=val pass -Dkey=val directly to the java runtime | ||
| -J-X pass option -X directly to the java runtime | ||
| (-J is stripped) | ||
| -S-X add -X to sbt's scalacOptions (-S is stripped) | ||
| -PmavenProfiles Enable a maven profile for the build. | ||
| In the case of duplicated or conflicting options, the order above | ||
| shows precedence: JAVA_OPTS lowest, command line options highest. | ||
| EOM | ||
| } | ||
|
|
||
| process_my_args () { | ||
| while [[ $# -gt 0 ]]; do | ||
| case "$1" in | ||
| -no-colors) addJava "-Dsbt.log.noformat=true" && shift ;; | ||
| -no-share) addJava "$noshare_opts" && shift ;; | ||
| -no-global) addJava "-Dsbt.global.base=$(pwd)/project/.sbtboot" && shift ;; | ||
| -sbt-boot) require_arg path "$1" "$2" && addJava "-Dsbt.boot.directory=$2" && shift 2 ;; | ||
| -sbt-dir) require_arg path "$1" "$2" && addJava "-Dsbt.global.base=$2" && shift 2 ;; | ||
| -debug-inc) addJava "-Dxsbt.inc.debug=true" && shift ;; | ||
| -batch) exec </dev/null && shift ;; | ||
|
|
||
| -sbt-create) sbt_create=true && shift ;; | ||
|
|
||
| *) addResidual "$1" && shift ;; | ||
| esac | ||
| done | ||
|
|
||
| # Now, ensure sbt version is used. | ||
| [[ "${sbt_version}XXX" != "XXX" ]] && addJava "-Dsbt.version=$sbt_version" | ||
| } | ||
|
|
||
| loadConfigFile() { | ||
| cat "$1" | sed '/^\#/d' | ||
| } | ||
|
|
||
| # if sbtopts files exist, prepend their contents to $@ so it can be processed by this runner | ||
| [[ -f "$etc_sbt_opts_file" ]] && set -- $(loadConfigFile "$etc_sbt_opts_file") "$@" | ||
| [[ -f "$sbt_opts_file" ]] && set -- $(loadConfigFile "$sbt_opts_file") "$@" | ||
|
|
||
| run "$@" | ||
| ${_DIR}/../build/sbt $@ |