diff options
author | Paul Phillips <paulp@improving.org> | 2011-12-09 10:24:46 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-12-09 10:54:20 -0800 |
commit | abfc737822739d258aa22387eb1acd11df1ff5cd (patch) | |
tree | d89717b62dd3d4fe8489c82adb3be8cf7a5ed10c | |
parent | ff7f9fcaa2958e3ef386c7a0a20233b6bb9e3864 (diff) | |
download | scala-abfc737822739d258aa22387eb1acd11df1ff5cd.tar.gz scala-abfc737822739d258aa22387eb1acd11df1ff5cd.tar.bz2 scala-abfc737822739d258aa22387eb1acd11df1ff5cd.zip |
Separated build and publish scripts.
Unified further with build options.
-rwxr-xr-x | tools/epfl-build | 29 | ||||
-rwxr-xr-x | tools/epfl-build-2.x.x | 35 | ||||
-rwxr-xr-x | tools/epfl-publish | 31 |
3 files changed, 60 insertions, 35 deletions
diff --git a/tools/epfl-build b/tools/epfl-build new file mode 100755 index 0000000000..e8f1be4a46 --- /dev/null +++ b/tools/epfl-build @@ -0,0 +1,29 @@ +#!/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_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_TARGETS; do ant $target ; done +# [[ -n "$BUILD_DOCSCOMP" ]] && ant docscomp diff --git a/tools/epfl-build-2.x.x b/tools/epfl-build-2.x.x deleted file mode 100755 index 7bc884c162..0000000000 --- a/tools/epfl-build-2.x.x +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash -# - -[[ $# -gt 0 ]] || { - echo "Usage: $0 <version> [publish destination]" - echo "" - exit 0 -} - -version="$1" -shift -rsyncDest="$1" - -# should not be hardcoded -mavenSettings="/home/linuxsoft/apps/hudson-maven-settings/settings.xml" - -# main build sequence -ant all.clean -./pull-binary-libs.sh -ant nightly -ant docscomp - -# publish nightly build -if [ -n "$rsyncDest" ]; then - echo "Copying nightly build to $rsyncDest" - # Archive Scala nightly distribution - rsync -az dists/archives/ "$rsyncDest/distributions" - # SKIP PUBLISHING DOCS IN 2.8.X BRANCH - if [[ $version != "2.8.x" ]]; then - rsync -az build/scaladoc/ "$rsyncDest/docs" - fi - rsync -az dists/sbaz/ "$rsyncDest/sbaz" - # Deploy the maven artifacts on scala-tools.org - ( cd dists/maven/latest && ant deploy.snapshot -Dsettings.file="$mavenSettings" ) -fi diff --git a/tools/epfl-publish b/tools/epfl-publish new file mode 100755 index 0000000000..5f38bd067b --- /dev/null +++ b/tools/epfl-publish @@ -0,0 +1,31 @@ +#!/usr/bin/env bash +# +# publishes nightly build + +[[ $# -eq 2 ]] || { + cat <<EOM +Usage: $0 <scala version> <rsync dest> +EOM + exit 0 +} + +[[ -d dists/archives ]] || { + echo "Can't find build, has it completed? No directory at dists/archives" + exit 1 +} + +version="$1" +rsyncDest="$2" + +# should not be hardcoded +mavenSettings="/home/linuxsoft/apps/hudson-maven-settings/settings.xml" + +echo "Copying nightly build to $rsyncDest" +# Archive Scala nightly distribution +rsync -az dists/archives/ "$rsyncDest/distributions" +# don't publish docs in 2.8.x +[[ $version == "2.8.x" ]] || rsync -az build/scaladoc/ "$rsyncDest/docs" +# sbaz +[[ -d dists/sbaz ]] && rsync -az dists/sbaz/ "$rsyncDest/sbaz" +# Deploy the maven artifacts on scala-tools.org +( cd dists/maven/latest && ant deploy.snapshot -Dsettings.file="$mavenSettings" ) |