summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2016-03-16 16:14:27 +1000
committerJason Zaugg <jzaugg@gmail.com>2016-03-18 11:44:33 +1000
commit699a5d907943330c59cea8e7b1abb536af8e5885 (patch)
tree4d6798bd21e3601c0ba760a1f32ed4f2721b4b46 /scripts
parent99a82be91cbb85239f70508f6695c6b21fd3558c (diff)
downloadscala-699a5d907943330c59cea8e7b1abb536af8e5885.tar.gz
scala-699a5d907943330c59cea8e7b1abb536af8e5885.tar.bz2
scala-699a5d907943330c59cea8e7b1abb536af8e5885.zip
Skip module docs in first round of bootstrap when STARR_REF is used
This is a second attempt at making this script operate when making a binary incompatible change to the compiler, such as the current effort to change the trait encoding. For builds that don't define STARR_REF, we continue to build docs in the first pass, as there will only be one pass for non-release builds. A previous attempt than disabling them in the first pass for all builds (c4fc2fd) triggered scala-dev/#89.
Diffstat (limited to 'scripts')
-rw-r--r--[-rwxr-xr-x]scripts/jobs/integrate/bootstrap25
1 files changed, 20 insertions, 5 deletions
diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap
index a8b027daa8..65758ea528 100755..100644
--- a/scripts/jobs/integrate/bootstrap
+++ b/scripts/jobs/integrate/bootstrap
@@ -209,12 +209,23 @@ sbtResolve() {
# scala-xml depends on scala-library, so sbt tries to find the scala-library of the version that we are currently building,
# which exists only in private-repo.
+docTask() {
+ if [[ "$STARR_REF" != "" && "$1" != "yes" ]]; then
+ # Don't build module docs on the first round of module builds when bootstrapping
+ # a binary incompatible compiler change to avoid linkage errors with using the old Scaladoc
+ echo set publishArtifact in packageDoc in Compile := false
+ else
+ echo doc
+ fi
+}
+
buildXML() {
if [ "$XML_BUILT" != "yes" ] && [ "$forceRebuild" != "yes" ] && ( sbtResolve "org.scala-lang.modules" "scala-xml" $XML_VER )
then echo "Found scala-xml $XML_VER; not building."
else
update scala scala-xml "$XML_REF" && gfxd
- sbtBuild 'set version := "'$XML_VER'-DOC"' $clean doc 'set version := "'$XML_VER'"' test "${buildTasks[@]}"
+ doc="$(docTask $XML_BUILT)"
+ sbtBuild 'set version := "'$XML_VER'-DOC"' $clean "$doc" 'set version := "'$XML_VER'"' test "${buildTasks[@]}"
XML_BUILT="yes" # ensure the module is built and published when buildXML is invoked for the second time, see comment above
fi
}
@@ -224,7 +235,8 @@ buildParsers() {
then echo "Found scala-parser-combinators $PARSERS_VER; not building."
else
update scala scala-parser-combinators "$PARSERS_REF" && gfxd
- sbtBuild 'set version := "'$PARSERS_VER'-DOC"' $clean doc 'set version := "'$PARSERS_VER'"' test "${buildTasks[@]}"
+ doc="$(docTask $PARSERS_BUILT)"
+ sbtBuild 'set version := "'$PARSERS_VER'-DOC"' $clean "$doc" 'set version := "'$PARSERS_VER'"' test "${buildTasks[@]}"
PARSERS_BUILT="yes"
fi
}
@@ -234,7 +246,8 @@ buildPartest() {
then echo "Found scala-partest $PARTEST_VER; not building."
else
update scala scala-partest "$PARTEST_REF" && gfxd
- sbtBuild 'set version :="'$PARTEST_VER'"' 'set VersionKeys.scalaXmlVersion := "'$XML_VER'"' 'set VersionKeys.scalaCheckVersion := "'$SCALACHECK_VER'"' $clean doc test "${buildTasks[@]}"
+ doc="$(docTask $PARTEST_BUILT)"
+ sbtBuild 'set version :="'$PARTEST_VER'"' 'set VersionKeys.scalaXmlVersion := "'$XML_VER'"' 'set VersionKeys.scalaCheckVersion := "'$SCALACHECK_VER'"' $clean "$doc" test "${buildTasks[@]}"
PARTEST_BUILT="yes"
fi
}
@@ -244,7 +257,8 @@ buildSwing() {
then echo "Found scala-swing $SWING_VER; not building."
else
update scala scala-swing "$SWING_REF" && gfxd
- sbtBuild 'set version := "'$SWING_VER'"' $clean doc test "${buildTasks[@]}"
+ doc="$(docTask $SWING_BUILT)"
+ sbtBuild 'set version := "'$SWING_VER'"' $clean "$doc" test "${buildTasks[@]}"
SWING_BUILT="yes"
fi
}
@@ -255,7 +269,8 @@ buildScalacheck(){
then echo "Found scalacheck $SCALACHECK_VER; not building."
else
update rickynils scalacheck $SCALACHECK_REF && gfxd
- sbtBuild 'set version := "'$SCALACHECK_VER'"' 'set VersionKeys.scalaParserCombinatorsVersion := "'$PARSERS_VER'"' $clean doc publish # test times out NOTE: never published to sonatype
+ doc="$(docTask $SCALACHECK_BUILT)"
+ sbtBuild 'set version := "'$SCALACHECK_VER'"' 'set VersionKeys.scalaParserCombinatorsVersion := "'$PARSERS_VER'"' $clean "$doc" publish # test times out NOTE: never published to sonatype
SCALACHECK_BUILT="yes"
fi
}