summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-12-09 09:49:04 -0800
committerPaul Phillips <paulp@improving.org>2011-12-09 09:50:21 -0800
commitceba686503dc2fcd5637925d7153ee526958c89f (patch)
tree4eccec94cf6ad0fd07d783efbcecdae85dd11539
parent6f721b5dfc955365c43fd98160393aa8c80da725 (diff)
downloadscala-ceba686503dc2fcd5637925d7153ee526958c89f.tar.gz
scala-ceba686503dc2fcd5637925d7153ee526958c89f.tar.bz2
scala-ceba686503dc2fcd5637925d7153ee526958c89f.zip
Unified 2.8.x and 2.9.x build scripts.
-rwxr-xr-xtools/epfl-build-2.x.x (renamed from tools/epfl-build-2.8.x)21
1 files changed, 13 insertions, 8 deletions
diff --git a/tools/epfl-build-2.8.x b/tools/epfl-build-2.x.x
index 0fd64cf842..7bc884c162 100755
--- a/tools/epfl-build-2.8.x
+++ b/tools/epfl-build-2.x.x
@@ -1,11 +1,15 @@
-#!/bin/sh -e
+#!/usr/bin/env bash
#
-# Jenkins should run tools/$0 --publish "$ssh_conn:$nightly_dir"
-unset rsyncDest
-if [ "$1" == "--publish" ]; then
- rsyncDest="$2"
-fi
+[[ $# -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"
@@ -20,10 +24,11 @@ ant docscomp
if [ -n "$rsyncDest" ]; then
echo "Copying nightly build to $rsyncDest"
# Archive Scala nightly distribution
- # Tailing slash is required, otherwise the directory gets synchronized instead of its content
rsync -az dists/archives/ "$rsyncDest/distributions"
# SKIP PUBLISHING DOCS IN 2.8.X BRANCH
- # rsync -az scala/build/scaladoc/ "$rsyncDest/docs"
+ 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" )