From ff7f9fcaa2958e3ef386c7a0a20233b6bb9e3864 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Fri, 9 Dec 2011 09:49:04 -0800
Subject: Unified 2.8.x and 2.9.x build scripts.

---
 tools/epfl-build-2.8.x | 30 ------------------------------
 tools/epfl-build-2.x.x | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 30 deletions(-)
 delete mode 100755 tools/epfl-build-2.8.x
 create mode 100755 tools/epfl-build-2.x.x

diff --git a/tools/epfl-build-2.8.x b/tools/epfl-build-2.8.x
deleted file mode 100755
index 0fd64cf842..0000000000
--- a/tools/epfl-build-2.8.x
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh -e
-#
-# Jenkins should run tools/$0 --publish "$ssh_conn:$nightly_dir"
-
-unset rsyncDest
-if [ "$1" == "--publish" ]; then
-  rsyncDest="$2"
-fi
-
-# 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
-  # 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"
-  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-build-2.x.x b/tools/epfl-build-2.x.x
new file mode 100755
index 0000000000..7bc884c162
--- /dev/null
+++ b/tools/epfl-build-2.x.x
@@ -0,0 +1,35 @@
+#!/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
-- 
cgit v1.2.3