From e2b6c7b608b82fca5343f6d09236c2b48b5d824d Mon Sep 17 00:00:00 2001
From: Stefan Zeiger <szeiger@novocode.com>
Date: Fri, 22 Jul 2016 18:19:45 +0200
Subject: Switch remaining uses of ant over to sbt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Modify `tools/scaladoc-diff` to use sbt instead of ant.

- Move `stability-test.sh` from `tools` to `scripts`. With the new
  build process without separate `locker` and `strap` stages, it doesn’t
  make sense to call this script without first setting up the proper
  test environment in a CI build.

- Replace the use of `build.number` in `bootstrap` with a new
  `SHA-NIGHTLY` mode for `baseVersionSuffix`.

- Make `partest` call sbt instead of ant for initializing the classpath
  and use the new classpath location (`quick` instead of `pack`).
---
 tools/scaladoc-diff     |  4 ++--
 tools/stability-test.sh | 29 -----------------------------
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100755 tools/stability-test.sh

(limited to 'tools')

diff --git a/tools/scaladoc-diff b/tools/scaladoc-diff
index df0d1f3335..1003b3dc02 100755
--- a/tools/scaladoc-diff
+++ b/tools/scaladoc-diff
@@ -49,7 +49,7 @@ if [ ! -f "build/scaladoc-output-$oldsha.txt" ]
 then
   echo "making scaladoc for parent commit ($oldsha)"
   git checkout -q $oldsha
-  ant docs.lib -Dscaladoc.raw.output='yes' > build/scaladoc-output-$oldsha.txt
+  sbt 'set scalacOptions in Compile in doc in library += "-raw-output"' library/doc > build/scaladoc-output-$oldsha.txt
   rm -rf build/scaladoc-${oldsha}
   mv build/scaladoc build/scaladoc-${oldsha}
   git checkout -q $sha
@@ -57,7 +57,7 @@ fi
 
 # create scaladoc for current commit
 echo "making scaladoc for current commit ($sha)"
-ant docs.lib -Dscaladoc.raw.output='yes' > build/scaladoc-output-$sha.txt
+sbt 'set scalacOptions in Compile in doc in library += "-raw-output"' library/doc > build/scaladoc-output-$sha.txt
 rm -rf build/scaladoc-${sha}
 mv build/scaladoc build/scaladoc-${sha}
 
diff --git a/tools/stability-test.sh b/tools/stability-test.sh
deleted file mode 100755
index f017ac0842..0000000000
--- a/tools/stability-test.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-#
-
-declare failed
-
-echo "Comparing build/quick/classes and build/strap/classes"
-for dir in library reflect compiler; do
-  # feel free to replace by a more elegant approach -- don't know how
-  if diff -rw -x '*.css' \
-              -x '*.custom' \
-              -x '*.gif' \
-              -x '*.js' \
-              -x '*.layout' \
-              -x '*.png' \
-              -x '*.properties' \
-              -x '*.tmpl' \
-              -x '*.tooltip' \
-              -x '*.txt' \
-              -x '*.xml' \
-              build/{quick,strap}/classes/$dir
-  then
-    classes=$(find build/quick/classes/$dir -name '*.class' | wc -l)
-    printf "%8s: %5d classfiles verified identical\n" $dir $classes
-  else
-    failed=true
-  fi
-done
-
-[[ -z $failed ]] || exit 127
-- 
cgit v1.2.3