@@ -1962,7 +1962,7 @@ object ScaladocConfigs {
1962
1962
SourceLinks (
1963
1963
List (
1964
1964
scalaSrcLink(stdLibVersion, srcManaged(version, " scala" ) + " =" ),
1965
- dottySrcLink(refVersion, srcManaged(version, " dotty " ) + " =" , " #library/src" ),
1965
+ dottySrcLink(refVersion, " library/src =" , " #library/src" ),
1966
1966
dottySrcLink(refVersion),
1967
1967
" docs=github://lampepfl/dotty/main#docs"
1968
1968
)
@@ -2047,6 +2047,7 @@ object ScaladocConfigs {
2047
2047
lazy val Scala3 = Def .task {
2048
2048
val dottyJars : Seq [java.io.File ] = Seq (
2049
2049
(`stdlib-bootstrapped`/ Compile / products).value,
2050
+ (`scala3-library-bootstrapped`/ Compile / products).value,
2050
2051
(`scala3-interfaces`/ Compile / products).value,
2051
2052
(`tasty-core-bootstrapped`/ Compile / products).value,
2052
2053
).flatten
@@ -2060,7 +2061,7 @@ object ScaladocConfigs {
2060
2061
val docRootFile = stdLibRoot.resolve(" rootdoc.txt" )
2061
2062
2062
2063
val dottyManagesSources =
2063
- (`stdlib- bootstrapped`/ Compile / sourceManaged ).value / " dotty-library-src "
2064
+ (`scala3-library- bootstrapped`/ Compile / sourceDirectory ).value
2064
2065
2065
2066
val tastyCoreSources = projectRoot.relativize((`tasty-core-bootstrapped`/ Compile / scalaSource).value.toPath().normalize())
2066
2067
@@ -2088,24 +2089,27 @@ object ScaladocConfigs {
2088
2089
}
2089
2090
2090
2091
def stableScala3 (version : String ) = Def .task {
2092
+ val scalaLibrarySrc = s " out/bootstrap/stdlib-bootstrapped/scala- $version-bin-SNAPSHOT-nonbootstrapped/src_managed "
2093
+ val dottyLibrarySrc = " library/src"
2091
2094
Scala3 .value
2092
2095
.add(defaultSourceLinks(version + " -bin-SNAPSHOT-nonbootstrapped" , version).value)
2093
2096
.add(ProjectVersion (version))
2094
2097
.add(SnippetCompiler (
2095
2098
List (
2096
- s " out/bootstrap/stdlib-bootstrapped/scala- $version -bin-SNAPSHOT-nonbootstrapped/src_managed/main/dotty-library-src /scala/quoted=compile" ,
2097
- s " out/bootstrap/stdlib-bootstrapped/scala- $version -bin-SNAPSHOT-nonbootstrapped/src_managed/main/dotty-library-src /scala/compiletime=compile"
2099
+ s " $dottyLibrarySrc /scala/quoted=compile " ,
2100
+ s " $dottyLibrarySrc /scala/compiletime=compile "
2098
2101
)
2099
2102
))
2100
2103
.add(CommentSyntax (List (
2101
- s " out/bootstrap/stdlib-bootstrapped/scala- $version -bin-SNAPSHOT-nonbootstrapped/src_managed/main/dotty-library-src =markdown" ,
2102
- s " out/bootstrap/stdlib-bootstrapped/scala- $version -bin-SNAPSHOT-nonbootstrapped/src_managed/main/scala-library-src =wiki" ,
2104
+ s " $dottyLibrarySrc =markdown " ,
2105
+ s " $scalaLibrarySrc =wiki " ,
2103
2106
" wiki"
2104
2107
)))
2105
- .add(DocRootContent (s " out/bootstrap/stdlib-bootstrapped/scala- $version -bin-SNAPSHOT-nonbootstrapped/src_managed/main/scala-library-src /rootdoc.txt" ))
2108
+ .add(DocRootContent (s " $scalaLibrarySrc /rootdoc.txt " ))
2106
2109
.withTargets(
2107
2110
Seq (
2108
2111
s " out/bootstrap/stdlib-bootstrapped/scala- $version-bin-SNAPSHOT-nonbootstrapped/classes " ,
2112
+ s " out/bootstrap/scala3-library-bootstrapped/scala- $version-bin-SNAPSHOT-nonbootstrapped/classes " ,
2109
2113
s " tmp/interfaces/target/classes " ,
2110
2114
s " out/bootstrap/tasty-core-bootstrapped/scala- $version-bin-SNAPSHOT-nonbootstrapped/classes "
2111
2115
)
0 commit comments