From a05c39047a8a51a71f8fc8c2550fee71d930feca Mon Sep 17 00:00:00 2001 From: James Strachan Date: Fri, 9 Mar 2012 08:42:33 +0000 Subject: [PATCH] added generation of the JS API docs, though had to disable until KT-1522 is fixed --- .../jetbrains/kotlin/site/SiteGenerator.kt | 1 + .../jetbrains/kotlin/site/GenerateSiteTest.kt | 20 ++++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/libraries/website/src/main/kotlin/org/jetbrains/kotlin/site/SiteGenerator.kt b/libraries/website/src/main/kotlin/org/jetbrains/kotlin/site/SiteGenerator.kt index 5985aaa626c..7d087c480fd 100644 --- a/libraries/website/src/main/kotlin/org/jetbrains/kotlin/site/SiteGenerator.kt +++ b/libraries/website/src/main/kotlin/org/jetbrains/kotlin/site/SiteGenerator.kt @@ -94,6 +94,7 @@ class SiteGenerator(val sourceDir: File, val outputDir: File) : Runnable {
  • Blog
  • Forum
  • Issue Tracker
  • +
  • @project_kotlin
  • diff --git a/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt b/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt index a63ee0da56f..64b94754903 100644 --- a/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt +++ b/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt @@ -20,7 +20,7 @@ class GenerateSiteTest : TestCase() { fun testGenerateStdlibKDoc(): Unit { val outDir = File(siteOutputDir, "versions/$versionDir/apidocs") - println("Generating stdlib KDocs to $outDir") + println("Generating library KDocs to $outDir") copyDocResources(outDir) val args = KDocArguments() @@ -35,17 +35,23 @@ class GenerateSiteTest : TestCase() { compiler.exec(System.out, args) } - /** - fun testGenerateJsKDoc(): Unit { + // TODO re-enable when KT-1522 fixed + fun DISABLED_testGenerateJsKDoc(): Unit { + val outDir = File(siteOutputDir, "versions/$versionDir/jsdocs") + println("Generating JS KDocs to $outDir") + + copyDocResources(outDir) val args = KDocArguments() - args.docOutputDir = File(siteOutputDir, "versions/$version/apidocs").toString() - args.src = "../js/src" - args.outputDir = "target/classes-js" + args.setModule("../../js/js.libraries/module.kt") + args.setDocOutputDir(outDir.toString()) + args.setOutputDir("target/classes-js") + val config = args.docConfig + config.title = "Kotlin JS API ($version)" + config.version = version val compiler = KDocCompiler() compiler.exec(System.out, args) } - */ fun copyDocResources(outDir: File): Unit { val sourceDir = File(srcDir, "../apidocs")