Fix build scripts

hexagontk · Feb 1, 2020 · 7bda1b0 · 7bda1b0
1 parent dca8dfd
commit 7bda1b0
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,8 @@
 # Gradle
 .gradle/
 build/
-local*
+local_*
+private_*
 
 # Eclipse
 .settings/

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -64,9 +64,17 @@ tasks.register<JacocoReport>("jacocoReport") {
 
     val rootPath = rootDir.absolutePath
     val execPattern = "**/build/jacoco/test.exec"
+    val sourcePattern = "**/src/main/kotlin"
     executionData.setFrom(fileTree(rootPath).include(execPattern))
+    sourceDirectories.setFrom(fileTree(rootPath).include(sourcePattern))
 
     subprojects.forEach {
+//        try {
+//            println(it.tasks["build"].javaClass)
+//        }
+//        catch (e: Throwable) {
+//            e.printStackTrace()
+//        }
 //        sourceSets(it.sourceSets.main as SourceSet)
     }
 
@@ -84,25 +92,20 @@ childProjects.forEach { pair ->
     val empty = prj.getTasksByName("dokkaMd", false)?.isEmpty() ?: true
     val siteContentPath = "${rootDir}/hexagon_site/content"
 
-    if (!(name in listOf("hexagon_benchmark", "hexagon_site", "hexagon_starters")) && empty) {
-        project(name) {
-            tasks.register<DokkaTask>("dokkaMd") {
-                outputFormat = "gfm"
-                outputDirectory = siteContentPath
-
-                configuration {
-                    reportUndocumented = false
-                    includes = filesCollection(prj.projectDir, "*.md")
-                    samples = filesCollection(
-                        "${prj.projectDir}/src/test/kotlin",
-                        "**/*SamplesTest.kt"
-                    )
-                    sourceRoot { path = "$projectDir/src/main/kotlin" }
-                }
-
-                doLast {
-                    addMetadata(siteContentPath, prj)
-                }
+    if (name !in listOf("hexagon_benchmark", "hexagon_site", "hexagon_starters") && empty) {
+        project(name).tasks.register<DokkaTask>("dokkaMd") {
+            outputFormat = "gfm"
+            outputDirectory = siteContentPath
+
+            configuration {
+                reportUndocumented = false
+                includes = filesCollection(prj.projectDir, "*.md")
+                samples = filesCollection("${prj.projectDir}/src/test/kotlin", "**/*SamplesTest.kt")
+                sourceRoot { path = "$projectDir/src/main/kotlin" }
+            }
+
+            doLast {
+                addMetadata(siteContentPath, prj)
             }
         }
     }