From 2f3370524f2348ab2bdc0665f548ac8c5bf586c7 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Fri, 3 Feb 2012 16:00:18 -0800
Subject: Injecting epfl-publish into merge-base.

---
 tools/epfl-publish | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100755 tools/epfl-publish

diff --git a/tools/epfl-publish b/tools/epfl-publish
new file mode 100755
index 0000000000..4982f930bb
--- /dev/null
+++ b/tools/epfl-publish
@@ -0,0 +1,32 @@
+#!/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
+}
+
+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"
+fi
-- 
cgit v1.2.3


From b16cbcdf2eeca3e5bcd0601df3524df6d307704b Mon Sep 17 00:00:00 2001
From: Vlad Ureche <vlad.ureche@gmail.com>
Date: Fri, 3 Feb 2012 22:59:55 +0100
Subject: Fix 2.9.2 scaladoc replacing nightlies in jenkins

---
 tools/epfl-publish | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/epfl-publish b/tools/epfl-publish
index 4982f930bb..de5e17b13f 100755
--- a/tools/epfl-publish
+++ b/tools/epfl-publish
@@ -25,8 +25,8 @@ 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"
+  # only publish scaladoc nightly for trunk
+  [[ $version == "master" ]] && rsync -az build/scaladoc/ "$publish_to/docs"
   # sbaz
   [[ -d dists/sbaz ]] && rsync -az dists/sbaz/ "$publish_to/sbaz"
 fi
-- 
cgit v1.2.3