diff options
author | Josh Suereth <joshua.suereth@gmail.com> | 2011-12-09 15:58:34 -0500 |
---|---|---|
committer | Josh Suereth <joshua.suereth@gmail.com> | 2011-12-09 15:58:34 -0500 |
commit | 5f4fe83eba247af60aea138986152dd001e56b23 (patch) | |
tree | 83a128631c75e6873c3b55ea1a2154633948f5ac | |
parent | b0e74c560ade7bfadb5bd86bc9bb127bc47e7e43 (diff) | |
parent | 04d13e6071b5daa0106d80c146048a148d7fad13 (diff) | |
download | scala-5f4fe83eba247af60aea138986152dd001e56b23.tar.gz scala-5f4fe83eba247af60aea138986152dd001e56b23.tar.bz2 scala-5f4fe83eba247af60aea138986152dd001e56b23.zip |
Merge branch 'master' into xsbt
-rw-r--r-- | test/disabled/properties.check (renamed from test/files/presentation/properties.check) | 0 | ||||
-rw-r--r-- | test/disabled/properties/Runner.scala (renamed from test/files/presentation/properties/Runner.scala) | 0 | ||||
-rw-r--r-- | test/disabled/properties/src/properties.scala (renamed from test/files/presentation/properties/src/properties.scala) | 0 | ||||
-rwxr-xr-x | tools/epfl-build | 28 | ||||
-rwxr-xr-x | tools/epfl-publish | 37 |
5 files changed, 65 insertions, 0 deletions
diff --git a/test/files/presentation/properties.check b/test/disabled/properties.check index a721d49e3a..a721d49e3a 100644 --- a/test/files/presentation/properties.check +++ b/test/disabled/properties.check diff --git a/test/files/presentation/properties/Runner.scala b/test/disabled/properties/Runner.scala index 1ef3cf9025..1ef3cf9025 100644 --- a/test/files/presentation/properties/Runner.scala +++ b/test/disabled/properties/Runner.scala diff --git a/test/files/presentation/properties/src/properties.scala b/test/disabled/properties/src/properties.scala index 35b6a92221..35b6a92221 100644 --- a/test/files/presentation/properties/src/properties.scala +++ b/test/disabled/properties/src/properties.scala diff --git a/tools/epfl-build b/tools/epfl-build new file mode 100755 index 0000000000..dd66307de3 --- /dev/null +++ b/tools/epfl-build @@ -0,0 +1,28 @@ +#!/usr/bin/env bash +# +# builds nightlies + +[[ $# -gt 0 ]] || { + cat <<EOM +Usage: $0 <version> [opt opt ...] + + Everything after the version is supplied to scalac and partest. + Example: $0 -Xcheckinit -Ycheck:all + +Environment variables: + extra_ant_targets Additional ant targets to run after nightly + +EOM + exit 0 +} + +# version isn't actually used at present. +scalaVersion="$1" && shift +scalaArgs="-Dscalac.args=\"$@\" -Dpartest.scalac_opts=\"$@\"" + +ant all.clean && ./pull-binary-libs.sh + +ant $scalaArgs build-opt && +ant $scalaArgs nightly && +for target in $extra_ant_targets; do ant $target ; done +# [[ -n "$BUILD_DOCSCOMP" ]] && ant docscomp diff --git a/tools/epfl-publish b/tools/epfl-publish new file mode 100755 index 0000000000..2c0141e264 --- /dev/null +++ b/tools/epfl-publish @@ -0,0 +1,37 @@ +#!/usr/bin/env bash +# +# publishes nightly build if $publish_to is set in environment. +# + +[[ $# -eq 1 ]] || { + cat <<EOM +Usage: $0 <scala version> + +Environment variables: + publish_to rsync destination +EOM + exit 0 +} +version="$1" + +[[ -d dists/archives ]] || { + echo "Can't find build, has it completed? No directory at dists/archives" + exit 1 +} + +# should not be hardcoded +mavenSettings="/home/linuxsoft/apps/hudson-maven-settings/settings.xml" + +if [[ -z $publish_to ]]; then + echo "Nothing to publish." +else + echo "Publishing nightly build to $publish_to" + # Archive Scala nightly distribution + rsync -az dists/archives/ "$publish_to/distributions" + # don't publish docs in 2.8.x + [[ $version == "2.8.x" ]] || rsync -az build/scaladoc/ "$publish_to/docs" + # sbaz + [[ -d dists/sbaz ]] && rsync -az dists/sbaz/ "$publish_to/sbaz" + # Deploy the maven artifacts on scala-tools.org + ( cd dists/maven/latest && ant deploy.snapshot -Dsettings.file="$mavenSettings" ) +fi |