Skip to content

Commit 5a582ce

Browse files
SethTisueSethTisue
committed
rip scala-xml out of bootstrap (& other misc places)
1 parent d1ee2ed commit 5a582ce

File tree

7 files changed

+10
-184
lines changed

7 files changed

+10
-184
lines changed

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- if [ ! -z "$STARR_REF" ]; then buildStarr; fi
4646
- buildLocker
4747
- buildQuick
48-
- set | grep -E '^SCALA_VER=|^SCALA_BINARY_VER=|^XML_VER=|^PARTEST_VER=|^SCALACHECK_VER=|^XML_BUILT=|^PARTEST_BUILT=|^SCALACHECK_BUILT=|^updatedModuleVersions=|^publishToSonatype=' > build/env
48+
- set | grep -E '^SCALA_VER=|^SCALA_BINARY_VER=|^PARTEST_VER=|^SCALACHECK_VER=|^PARTEST_BUILT=|^SCALACHECK_BUILT=|^updatedModuleVersions=|^publishToSonatype=' > build/env
4949
- cat build/env
5050
- triggerScalaDist
5151

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ Assume the current `starr` version is `2.12.0` (defined in
162162
the version you published locally is binary compatible, i.e., if the current
163163
`starr` is a 2.12.x release and not a milestone / RC.
164164

165-
The last step is required to resolve modules (scala-xml, scala-partest, etc). It
165+
The last step is required to resolve modules (scala-partest, etc). It
166166
assumes that the module releases for the current `starr` work (in terms of binary
167167
compatibility) with the local starr that you published locally. A full bootstrap
168168
requires re-building the all the modules. On our CI this is handled by the

‎dbuild-meta.json

-77
This file was deleted.

‎scripts/bootstrap_fun

+7-44
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99

1010
# Modules and stages
11+
# - TODO: xml is no longer in the bootstrap, so a lot of the complexity described in the following
12+
# bullets no longer applies.
1113
# - Each stage (starr, locker quick) builds the modules (if no binary compatible version exists)
1214
# - The reason is: the compiler POM depends on the xml module of the previous stage, i.e., the
1315
# locker compiler uses the starr modules. So the locker scaladoc (building the quick compiler)
@@ -34,7 +36,7 @@
3436

3537
# Specifying module versions. We use release versions for modules.
3638
# - Module versions are read from the versions.properties file.
37-
# - Set <MODULE>_VER to override the default, e.g. XML_VER="1.0.4".
39+
# - Set <MODULE>_VER to override the default, e.g. PARTEST_VER="1.0.4".
3840
# - The git revision is set to <MODULE>_REF="v$<MODULE>_VER". Make sure the tag exists (you can't override <MODULE>_REF).
3941

4042

@@ -85,46 +87,13 @@ forceBuildModules=${forceBuildModules-no}
8587
clean="clean" # TESTING leave empty to speed up testing (on jenkins/locally; on travis it's a fresh machine every time)
8688

8789

88-
docTask() {
89-
# Build the module docs only in the last (quick) stage. The locker scaladoc may be binary
90-
# incompatible with the starr scala-xml (on which it depends, by the pom file)
91-
if [ "$1" = "quick" ]; then
92-
echo "doc"
93-
else
94-
echo "set publishArtifact in (Compile, packageDoc) in ThisBuild := false"
95-
fi
96-
}
97-
98-
# Oh boy... can't use scaladoc to document scala-xml if scaladoc depends on the same version of scala-xml.
99-
# Even if that version is available through the project's resolvers, sbt won't look past this project.
100-
# SOOOOO, we set the version to a dummy (-DOC), generate documentation,
101-
# then set the version to the right one and publish (which won't re-gen the docs).
102-
# Also tried publish-local without docs using 'set publishArtifact in (Compile, packageDoc) := false' and republishing, no dice.
103-
buildXML() {
104-
if [ "$XML_BUILT" != "yes" ] && [ "$forceBuildModules" != "yes" ] && ( sbtResolve "org.scala-lang.modules" "scala-xml" $XML_VER )
105-
then echo "Found scala-xml $XML_VER; not building."
106-
else
107-
update scala scala-xml "$XML_REF" && gfxd
108-
doc="$(docTask $1)"
109-
110-
# Exclude Scala JS https://github.com/scala/scala/pull/6341#issuecomment-372051392
111-
buildTasksXml=("${buildTasks[@]/#/xmlJVM\/}")
112-
docXml="$doc"
113-
if [[ "$doc" == "doc" ]]; then docXml="xmlJVM/$doc"; fi
114-
115-
sbtBuild 'set every version := "'$XML_VER'-DOC"' $clean "$docXml" 'set every version := "'$XML_VER'"' xmlJVM/test "${buildTasksXml[@]}"
116-
XML_BUILT="yes" # ensure the module is built and published when buildXML is invoked for the second time, see comment above
117-
fi
118-
}
119-
12090
buildPartest() {
12191
if [ "$PARTEST_BUILT" != "yes" ] && [ "$forceBuildModules" != "yes" ] && ( sbtResolve "org.scala-lang.modules" "scala-partest" $PARTEST_VER )
12292
then echo "Found scala-partest $PARTEST_VER; not building."
12393
else
12494
update scala scala-partest "$PARTEST_REF" && gfxd
125-
doc="$(docTask $1)"
12695
# disable -Xfatal-warnings until https://github.com/scala/scala-partest/pull/101 is released
127-
sbtBuild 'set version :="'$PARTEST_VER'"' 'set VersionKeys.scalaXmlVersion := "'$XML_VER'"' $clean "$doc" 'set scalacOptions := scalacOptions.value.filterNot(_.contains("fatal-warn"))' test "${buildTasks[@]}"
96+
sbtBuild 'set version :="'$PARTEST_VER'"' $clean doc 'set scalacOptions := scalacOptions.value.filterNot(_.contains("fatal-warn"))' test "${buildTasks[@]}"
12897
PARTEST_BUILT="yes"
12998
fi
13099
}
@@ -135,8 +104,7 @@ buildScalaCheck(){
135104
then echo "Found scalacheck $SCALACHECK_VER; not building."
136105
else
137106
update rickynils scalacheck $SCALACHECK_REF && gfxd
138-
doc="$(docTask $1)"
139-
sbtBuild 'set version := "'$SCALACHECK_VER'"' 'set VersionKeys.scalaParserCombinatorsVersion := "'$PARSERS_VER'"' $clean "$doc" publish # test times out NOTE: never published to sonatype
107+
sbtBuild 'set version := "'$SCALACHECK_VER'"' 'set VersionKeys.scalaParserCombinatorsVersion := "'$PARSERS_VER'"' $clean doc publish # test times out NOTE: never published to sonatype
140108
SCALACHECK_BUILT="yes"
141109
fi
142110
}
@@ -166,7 +134,6 @@ buildModules() {
166134
fi
167135
fi
168136

169-
buildXML $1
170137
# buildScalaCheck $1
171138
buildPartest $1
172139

@@ -237,17 +204,14 @@ determineScalaVersion() {
237204

238205
# determineScalaVersion must have been called (versions.properties is parsed to env vars)
239206
deriveModuleVersions() {
240-
XML_VER=${XML_VER-$scala_xml_version_number}
241207
PARTEST_VER=${PARTEST_VER-$partest_version_number}
242208
SCALACHECK_VER=${SCALACHECK_VER-$scalacheck_version_number}
243209

244-
XML_REF="v$XML_VER"
245210
PARTEST_REF="v$PARTEST_VER"
246211
SCALACHECK_REF="$SCALACHECK_VER" # no `v` in their tags
247212

248213
echo "PARTEST = $PARTEST_VER at $PARTEST_REF"
249214
# echo "SCALACHECK = $SCALACHECK_VER at $SCALACHECK_REF"
250-
echo "XML = $XML_VER at $XML_REF"
251215

252216
}
253217

@@ -269,7 +233,7 @@ removeExistingBuilds() {
269233
createNetrcFile "$HOME/.credentials-private-repo"
270234
local netrcFile="$HOME/.credentials-private-repo-netrc"
271235

272-
# "module" is not a scala module (like scala-xml), but an artifact of a boostrap build. the variable
236+
# "module" is not a scala module, but an artifact of a bootstrap build. the variable
273237
# contains: "org/scala-lang/modules", "org/scala-lang/scala-compiler", "org/scala-lang/scala-library", ...
274238
local scalaLangModules=`curl -s $storageApiUrl/org/scala-lang | jq -r '.children | .[] | "org/scala-lang" + .uri' | grep -v actors-migration`
275239

@@ -289,8 +253,7 @@ constructUpdatedModuleVersions() {
289253
updatedModuleVersions=()
290254

291255
# force the new module versions for building the core. these may be different from the values in versions.properties
292-
# if the variables (XML_VER) were provided. in the common case, the values are the same as in versions.properties.
293-
updatedModuleVersions=("${updatedModuleVersions[@]}" "-Dscala-xml.version.number=$XML_VER")
256+
# if the variables (e.g. PARTEST_VER) were provided. in the common case, the values are the same as in versions.properties.
294257
updatedModuleVersions=("${updatedModuleVersions[@]}" "-Dpartest.version.number=$PARTEST_VER")
295258
# updatedModuleVersions=("${updatedModuleVersions[@]}" "-Dscalacheck.version.number=$SCALACHECK_VER")
296259

‎src/build/dbuild-meta-json-gen.scala

-47
This file was deleted.

‎src/intellij/scala.ipr.SAMPLE

-12
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@
199199
<library name="compiler-deps">
200200
<CLASSES>
201201
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-asm/bundles/scala-asm-5.2.0-scala-2.jar!/" />
202-
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-xml_2.13.0-M3/bundles/scala-xml_2.13.0-M3-1.1.0.jar!/" />
203202
<root url="jar://$USER_HOME$/.ivy2/cache/jline/jline/jars/jline-2.14.5.jar!/" />
204203
</CLASSES>
205204
<JAVADOC />
@@ -208,7 +207,6 @@
208207
<library name="interactive-deps">
209208
<CLASSES>
210209
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-asm/bundles/scala-asm-5.2.0-scala-2.jar!/" />
211-
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-xml_2.13.0-M3/bundles/scala-xml_2.13.0-M3-1.1.0.jar!/" />
212210
<root url="jar://$USER_HOME$/.ivy2/cache/jline/jline/jars/jline-2.14.5.jar!/" />
213211
</CLASSES>
214212
<JAVADOC />
@@ -217,7 +215,6 @@
217215
<library name="junit-deps">
218216
<CLASSES>
219217
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-asm/bundles/scala-asm-5.2.0-scala-2.jar!/" />
220-
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-xml_2.13.0-M3/bundles/scala-xml_2.13.0-M3-1.1.0.jar!/" />
221218
<root url="jar://$USER_HOME$/.ivy2/cache/jline/jline/jars/jline-2.14.5.jar!/" />
222219
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-partest_2.13.0-M3/jars/scala-partest_2.13.0-M3-1.1.1.jar!/" />
223220
<root url="jar://$USER_HOME$/.ivy2/cache/com.googlecode.java-diff-utils/diffutils/jars/diffutils-1.3.0.jar!/" />
@@ -231,7 +228,6 @@
231228
</library>
232229
<library name="manual-deps">
233230
<CLASSES>
234-
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-xml_2.13.0-M3/bundles/scala-xml_2.13.0-M3-1.1.0.jar!/" />
235231
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang/scala-library/jars/scala-library-2.13.0-M3.jar!/" />
236232
</CLASSES>
237233
<JAVADOC />
@@ -240,7 +236,6 @@
240236
<library name="partest-extras-deps">
241237
<CLASSES>
242238
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-asm/bundles/scala-asm-5.2.0-scala-2.jar!/" />
243-
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-xml_2.13.0-M3/bundles/scala-xml_2.13.0-M3-1.1.0.jar!/" />
244239
<root url="jar://$USER_HOME$/.ivy2/cache/jline/jline/jars/jline-2.14.5.jar!/" />
245240
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-partest_2.13.0-M3/jars/scala-partest_2.13.0-M3-1.1.1.jar!/" />
246241
<root url="jar://$USER_HOME$/.ivy2/cache/com.googlecode.java-diff-utils/diffutils/jars/diffutils-1.3.0.jar!/" />
@@ -259,7 +254,6 @@
259254
<library name="repl-deps">
260255
<CLASSES>
261256
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-asm/bundles/scala-asm-5.2.0-scala-2.jar!/" />
262-
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-xml_2.13.0-M3/bundles/scala-xml_2.13.0-M3-1.1.0.jar!/" />
263257
<root url="jar://$USER_HOME$/.ivy2/cache/jline/jline/jars/jline-2.14.5.jar!/" />
264258
</CLASSES>
265259
<JAVADOC />
@@ -268,7 +262,6 @@
268262
<library name="repl-frontend-deps">
269263
<CLASSES>
270264
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-asm/bundles/scala-asm-5.2.0-scala-2.jar!/" />
271-
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-xml_2.13.0-M3/bundles/scala-xml_2.13.0-M3-1.1.0.jar!/" />
272265
<root url="jar://$USER_HOME$/.ivy2/cache/jline/jline/jars/jline-2.14.5.jar!/" />
273266
</CLASSES>
274267
<JAVADOC />
@@ -370,7 +363,6 @@
370363
<library name="scalacheck-deps">
371364
<CLASSES>
372365
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-asm/bundles/scala-asm-5.2.0-scala-2.jar!/" />
373-
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-xml_2.13.0-M3/bundles/scala-xml_2.13.0-M3-1.1.0.jar!/" />
374366
<root url="jar://$USER_HOME$/.ivy2/cache/jline/jline/jars/jline-2.14.5.jar!/" />
375367
<root url="jar://$USER_HOME$/.ivy2/cache/org.scalacheck/scalacheck_2.13.0-M1/jars/scalacheck_2.13.0-M1-1.13.5.jar!/" />
376368
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/test-interface/jars/test-interface-1.0.jar!/" />
@@ -381,7 +373,6 @@
381373
<library name="scaladoc-deps">
382374
<CLASSES>
383375
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-asm/bundles/scala-asm-5.2.0-scala-2.jar!/" />
384-
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-xml_2.13.0-M3/bundles/scala-xml_2.13.0-M3-1.1.0.jar!/" />
385376
<root url="jar://$USER_HOME$/.ivy2/cache/jline/jline/jars/jline-2.14.5.jar!/" />
386377
</CLASSES>
387378
<JAVADOC />
@@ -390,7 +381,6 @@
390381
<library name="scalap-deps">
391382
<CLASSES>
392383
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-asm/bundles/scala-asm-5.2.0-scala-2.jar!/" />
393-
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-xml_2.13.0-M3/bundles/scala-xml_2.13.0-M3-1.1.0.jar!/" />
394384
<root url="jar://$USER_HOME$/.ivy2/cache/jline/jline/jars/jline-2.14.5.jar!/" />
395385
</CLASSES>
396386
<JAVADOC />
@@ -402,7 +392,6 @@
402392
<root url="file://$USER_HOME$/.ivy2/cache/org.scala-lang/scala-library/jars/scala-library-2.13.0-M3.jar" />
403393
<root url="file://$USER_HOME$/.ivy2/cache/org.scala-lang/scala-compiler/jars/scala-compiler-2.13.0-M3.jar" />
404394
<root url="file://$USER_HOME$/.ivy2/cache/org.scala-lang/scala-reflect/jars/scala-reflect-2.13.0-M3.jar" />
405-
<root url="file://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-xml_2.13.0-M3/bundles/scala-xml_2.13.0-M3-1.1.0.jar" />
406395
<root url="file://$USER_HOME$/.ivy2/cache/jline/jline/jars/jline-2.14.4.jar" />
407396
</compiler-classpath>
408397
</properties>
@@ -413,7 +402,6 @@
413402
<library name="test-deps">
414403
<CLASSES>
415404
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-asm/bundles/scala-asm-5.2.0-scala-2.jar!/" />
416-
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-xml_2.13.0-M3/bundles/scala-xml_2.13.0-M3-1.1.0.jar!/" />
417405
<root url="jar://$USER_HOME$/.ivy2/cache/jline/jline/jars/jline-2.14.5.jar!/" />
418406
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-partest_2.13.0-M3/jars/scala-partest_2.13.0-M3-1.1.1.jar!/" />
419407
<root url="jar://$USER_HOME$/.ivy2/cache/com.googlecode.java-diff-utils/diffutils/jars/diffutils-1.3.0.jar!/" />

‎versions.properties

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ scala.binary.version=2.13.0-M4-pre-20d3c21
1313

1414
# These are the versions of the modules that go with this release.
1515
# Artifact dependencies:
16-
# - scala-compiler: scala-xml, jline (% "optional")
16+
# - scala-compiler: jline (% "optional")
1717
# Other usages:
1818
# - scala-asm: jar content included in scala-compiler
1919
# - jline: shaded with JarJar and included in scala-compiler
2020
# - partest: used for running the tests
21-
scala-xml.version.number=1.1.0-newCollectionsBootstrap
2221
partest.version.number=1.1.7
2322
scala-asm.version=6.0.0-scala-1
2423
jline.version=2.14.5

0 commit comments

Comments
 (0)