azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed up kdoc after Andrey's changes

Browse Source
This commit is contained in:
James Strachan
2012-03-29 16:54:48 +01:00
parent e6fda5b3d3
commit b29c31ad2d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt
+1 -1
View File
@@ -22,7 +22,7 @@ class KDocCompiler() : KotlinCompiler() {
override fun configureEnvironment(environment : CompileEnvironment?, arguments : CompilerArguments?, errStream : PrintStream?) { override fun configureEnvironment(environment : CompileEnvironment?, arguments : CompilerArguments?, errStream : PrintStream?) {
super.configureEnvironment(environment, arguments, errStream) super.configureEnvironment(environment, arguments, errStream)
val coreEnvironment = environment?.getMyEnvironment() val coreEnvironment = environment?.getEnvironment()
if (coreEnvironment != null) { if (coreEnvironment != null) {
val kdoc = KDoc() val kdoc = KDoc()
libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt
+3 -3
View File
@@ -27,7 +27,7 @@ class GenerateSiteTest : TestCase() {
args.setOutputDir("target/classes-stdlib") args.setOutputDir("target/classes-stdlib")
val config = args.docConfig val config = args.docConfig
config.docOutputDir = outDir.getPath()!! config.docOutputDir = outDir.getCanonicalPath()!!
config.title = "Kotlin API ($version)" config.title = "Kotlin API ($version)"
config.version = version config.version = version
config.ignorePackages.add("kotlin.support") config.ignorePackages.add("kotlin.support")
@@ -52,7 +52,7 @@ class GenerateSiteTest : TestCase() {
args.setOutputDir("target/classes-js") args.setOutputDir("target/classes-js")
val config = args.docConfig val config = args.docConfig
config.docOutputDir = outDir.getPath()!! config.docOutputDir = outDir.getCanonicalPath()!!
config.title = "Kotlin JS API ($version)" config.title = "Kotlin JS API ($version)"
config.version = version config.version = version
config.ignorePackages.add("java") config.ignorePackages.add("java")
@@ -80,7 +80,7 @@ class GenerateSiteTest : TestCase() {
fun findTemplateDir(): File { fun findTemplateDir(): File {
val path = "src/main/templates" val path = "src/main/templates"
for (p in arrayList(".", "apidocs", "library/apidocs")) { for (p in arrayList(".", "website", "library/website")) {
val sourceDir = File(".", path) val sourceDir = File(".", path)
if (sourceDir.exists()) { if (sourceDir.exists()) {
return sourceDir return sourceDir