Skip to content

Commit cf44170

Browse files
JolanrensenJolanrensen
authored
Merge pull request #329 from Kotlin/windows-fix
Windows build fix
2 parents cb884c8 + 69f5022 commit cf44170

File tree

7 files changed

+75
-68
lines changed

7 files changed

+75
-68
lines changed

‎core/build.gradle.kts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,12 @@ val addGeneratedSourcesToGit by tasks.creating(GitTask::class) {
7171
val kotlinMainSources = kotlin.sourceSets.main.get().kotlin.sourceDirectories
7272
val kotlinTestSources = kotlin.sourceSets.test.get().kotlin.sourceDirectories
7373

74+
fun pathOf(vararg parts: String) = parts.joinToString(File.separator)
75+
7476
// Task to generate the processed documentation
7577
val processKDocsMain by creatingProcessDocTask(
7678
sources = (kotlinMainSources + kotlinTestSources) // Include both test and main sources for cross-referencing
77-
.filterNot { "build/generated" in it.path }, // Exclude generated sources
79+
.filterNot { pathOf("build", "generated") in it.path }, // Exclude generated sources
7880
) {
7981
target = file(generatedSourcesFolderName)
8082
processors = listOf(
@@ -110,8 +112,13 @@ tasks.withType<Jar> {
110112
kotlin.sourceSets.main {
111113
kotlin.setSrcDirs(
112114
processKDocsMain.targets
113-
.filterNot { "src/test/kotlin" in it.path || "src/test/java" in it.path } // filter out test sources again
114-
.plus(kotlinMainSources.filter { "build/generated" in it.path }) // Include generated sources (which were excluded above)
115+
.filterNot {
116+
pathOf("src", "test", "kotlin") in it.path ||
117+
pathOf("src", "test", "java") in it.path
118+
} // filter out test sources again
119+
.plus(kotlinMainSources.filter {
120+
pathOf("build", "generated") in it.path
121+
}) // Include generated sources (which were excluded above)
115122
)
116123
}
117124
}

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Nulls.kt

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import kotlin.reflect.KProperty
2323
*/
2424
internal interface FillNulls {
2525

26-
/** ## [fillNulls][org.jetbrains.kotlinx.dataframe.api.fillNulls] Operation Usage
26+
/** ## [fillNulls][fillNulls] Operation Usage
2727
*
28-
* [fillNulls][org.jetbrains.kotlinx.dataframe.api.fillNulls] `{ `[columns][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns]` }`
28+
* [fillNulls][fillNulls] `{ `[columns][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns]` }`
2929
*
3030
* - `[.`[where][org.jetbrains.kotlinx.dataframe.api.Update.where]` { `[rowValueCondition][org.jetbrains.kotlinx.dataframe.documentation.SelectingRows.RowValueCondition.WithExample]` } ]`
3131
*
@@ -227,9 +227,9 @@ internal inline val Float?.isNA: Boolean get() = this == null || this.isNaN()
227227
*/
228228
internal interface FillNaNs {
229229

230-
/** ## [fillNaNs][org.jetbrains.kotlinx.dataframe.api.fillNaNs] Operation Usage
230+
/** ## [fillNaNs][fillNaNs] Operation Usage
231231
*
232-
* [fillNaNs][org.jetbrains.kotlinx.dataframe.api.fillNaNs] `{ `[columns][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns]` }`
232+
* [fillNaNs][fillNaNs] `{ `[columns][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns]` }`
233233
*
234234
* - `[.`[where][org.jetbrains.kotlinx.dataframe.api.Update.where]` { `[rowValueCondition][org.jetbrains.kotlinx.dataframe.documentation.SelectingRows.RowValueCondition.WithExample]` } ]`
235235
*
@@ -401,9 +401,9 @@ public fun <T, C> DataFrame<T>.fillNaNs(columns: Iterable<ColumnReference<C>>):
401401
*/
402402
internal interface FillNA {
403403

404-
/** ## [fillNA][org.jetbrains.kotlinx.dataframe.api.fillNA] Operation Usage
404+
/** ## [fillNA][fillNA] Operation Usage
405405
*
406-
* [fillNA][org.jetbrains.kotlinx.dataframe.api.fillNA] `{ `[columns][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns]` }`
406+
* [fillNA][fillNA] `{ `[columns][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns]` }`
407407
*
408408
* - `[.`[where][org.jetbrains.kotlinx.dataframe.api.Update.where]` { `[rowValueCondition][org.jetbrains.kotlinx.dataframe.documentation.SelectingRows.RowValueCondition.WithExample]` } ]`
409409
*
@@ -639,7 +639,7 @@ private interface CommonDropNullsFunctionDoc
639639
*
640640
* `df.`[dropNulls][org.jetbrains.kotlinx.dataframe.api.dropNulls]` { `[colsOf][org.jetbrains.kotlinx.dataframe.api.colsOf]`<`[Double][Double]`>() }`
641641
*
642-
* `df.`[dropNulls][org.jetbrains.kotlinx.dataframe.api.dropNulls]`(whereAllNull = true) { `[colsOf][org.jetbrains.kotlinx.dataframe.api.colsOf]`<`[Double][Double]`>() }`
642+
* `df.`[dropNulls][dropNulls]`(whereAllNull = true) { `[colsOf][colsOf]`<`[Double][Double]`>() }`
643643
* @param whereAllNull `false` by default.
644644
* If `true`, rows are dropped if all selected cells are `null`.
645645
* If `false`, rows are dropped if any of the selected cells is `null`.
@@ -662,7 +662,7 @@ public fun <T> DataFrame<T>.dropNulls(whereAllNull: Boolean = false, columns: Co
662662
*
663663
* For more information: [See `dropNulls` on the documentation website.](https://kotlin.github.io/dataframe/drop.html#dropnulls)
664664
* ## This Drop Nulls Overload
665-
* This overload operates on all columns in the [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame].
665+
* This overload operates on all columns in the [DataFrame].
666666
* @param whereAllNull `false` by default.
667667
* If `true`, rows are dropped if all selected cells are `null`.
668668
* If `false`, rows are dropped if any of the selected cells is `null`.
@@ -690,7 +690,7 @@ public fun <T> DataFrame<T>.dropNulls(whereAllNull: Boolean = false): DataFrame<
690690
*
691691
* `df.`[dropNulls][org.jetbrains.kotlinx.dataframe.api.dropNulls]`(Person::length, Person::age)`
692692
*
693-
* `df.`[dropNulls][org.jetbrains.kotlinx.dataframe.api.dropNulls]`(Person::length, whereAllNull = true)`
693+
* `df.`[dropNulls][dropNulls]`(Person::length, whereAllNull = true)`
694694
* @param whereAllNull `false` by default.
695695
* If `true`, rows are dropped if all selected cells are `null`.
696696
* If `false`, rows are dropped if any of the selected cells is `null`.
@@ -717,7 +717,7 @@ public fun <T> DataFrame<T>.dropNulls(vararg columns: KProperty<*>, whereAllNull
717717
*
718718
* `df.`[dropNulls][org.jetbrains.kotlinx.dataframe.api.dropNulls]`("length", "age")`
719719
*
720-
* `df.`[dropNulls][org.jetbrains.kotlinx.dataframe.api.dropNulls]`("length", whereAllNull = true)`
720+
* `df.`[dropNulls][dropNulls]`("length", whereAllNull = true)`
721721
* @param whereAllNull `false` by default.
722722
* If `true`, rows are dropped if all selected cells are `null`.
723723
* If `false`, rows are dropped if any of the selected cells is `null`.
@@ -748,7 +748,7 @@ public fun <T> DataFrame<T>.dropNulls(vararg columns: String, whereAllNull: Bool
748748
*
749749
* `df.`[dropNulls][org.jetbrains.kotlinx.dataframe.api.dropNulls]`(length, age)`
750750
*
751-
* `df.`[dropNulls][org.jetbrains.kotlinx.dataframe.api.dropNulls]`(length, whereAllNull = true)`
751+
* `df.`[dropNulls][dropNulls]`(length, whereAllNull = true)`
752752
* @param whereAllNull `false` by default.
753753
* If `true`, rows are dropped if all selected cells are `null`.
754754
* If `false`, rows are dropped if any of the selected cells is `null`.
@@ -847,7 +847,7 @@ private interface CommonDropNAFunctionDoc
847847
*
848848
* `df.`[dropNA][org.jetbrains.kotlinx.dataframe.api.dropNA]` { `[colsOf][org.jetbrains.kotlinx.dataframe.api.colsOf]`<`[Double][Double]`>() }`
849849
*
850-
* `df.`[dropNA][org.jetbrains.kotlinx.dataframe.api.dropNA]`(whereAllNA = true) { `[colsOf][org.jetbrains.kotlinx.dataframe.api.colsOf]`<`[Double][Double]`>() }`
850+
* `df.`[dropNA][dropNA]`(whereAllNA = true) { `[colsOf][colsOf]`<`[Double][Double]`>() }`
851851
* @param whereAllNA `false` by default.
852852
* If `true`, rows are dropped if all selected cells are [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA].
853853
* If `false`, rows are dropped if any of the selected cells is [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA].
@@ -879,7 +879,7 @@ public fun <T> DataFrame<T>.dropNA(whereAllNA: Boolean = false, columns: Columns
879879
*
880880
* `df.`[dropNA][org.jetbrains.kotlinx.dataframe.api.dropNA]`(Person::length, Person::age)`
881881
*
882-
* `df.`[dropNA][org.jetbrains.kotlinx.dataframe.api.dropNA]`(Person::length, whereAllNA = true)`
882+
* `df.`[dropNA][dropNA]`(Person::length, whereAllNA = true)`
883883
* @param whereAllNA `false` by default.
884884
* If `true`, rows are dropped if all selected cells are [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA].
885885
* If `false`, rows are dropped if any of the selected cells is [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA].
@@ -906,7 +906,7 @@ public fun <T> DataFrame<T>.dropNA(vararg columns: KProperty<*>, whereAllNA: Boo
906906
*
907907
* `df.`[dropNA][org.jetbrains.kotlinx.dataframe.api.dropNA]`("length", "age")`
908908
*
909-
* `df.`[dropNA][org.jetbrains.kotlinx.dataframe.api.dropNA]`("length", whereAllNA = true)`
909+
* `df.`[dropNA][dropNA]`("length", whereAllNA = true)`
910910
* @param whereAllNA `false` by default.
911911
* If `true`, rows are dropped if all selected cells are [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA].
912912
* If `false`, rows are dropped if any of the selected cells is [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA].
@@ -937,7 +937,7 @@ public fun <T> DataFrame<T>.dropNA(vararg columns: String, whereAllNA: Boolean =
937937
*
938938
* `df.`[dropNA][org.jetbrains.kotlinx.dataframe.api.dropNA]`(length, age)`
939939
*
940-
* `df.`[dropNA][org.jetbrains.kotlinx.dataframe.api.dropNA]`(length, whereAllNA = true)`
940+
* `df.`[dropNA][dropNA]`(length, whereAllNA = true)`
941941
* @param whereAllNA `false` by default.
942942
* If `true`, rows are dropped if all selected cells are [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA].
943943
* If `false`, rows are dropped if any of the selected cells is [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA].
@@ -969,7 +969,7 @@ public fun <T> DataFrame<T>.dropNA(columns: Iterable<AnyColumnReference>, whereA
969969
*
970970
* For more information: [See `dropNA` on the documentation website.](https://kotlin.github.io/dataframe/drop.html#dropna)
971971
* ## This Drop NA Overload
972-
* This overload operates on all columns in the [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame].
972+
* This overload operates on all columns in the [DataFrame].
973973
* @param whereAllNA `false` by default.
974974
* If `true`, rows are dropped if all selected cells are [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA].
975975
* If `false`, rows are dropped if any of the selected cells is [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA].
@@ -1055,7 +1055,7 @@ private interface CommonDropNaNsFunctionDoc
10551055
*
10561056
* `df.`[dropNaNs][org.jetbrains.kotlinx.dataframe.api.dropNaNs]` { `[colsOf][org.jetbrains.kotlinx.dataframe.api.colsOf]`<`[Double][Double]`>() }`
10571057
*
1058-
* `df.`[dropNaNs][org.jetbrains.kotlinx.dataframe.api.dropNaNs]`(whereAllNaN = true) { `[colsOf][org.jetbrains.kotlinx.dataframe.api.colsOf]`<`[Double][Double]`>() }`
1058+
* `df.`[dropNaNs][dropNaNs]`(whereAllNaN = true) { `[colsOf][colsOf]`<`[Double][Double]`>() }`
10591059
* @param whereAllNaN `false` by default.
10601060
* If `true`, rows are dropped if all selected cells are [`NaN`][Double.isNaN].
10611061
* If `false`, rows are dropped if any of the selected cells is [`NaN`][Double.isNaN].
@@ -1087,7 +1087,7 @@ public fun <T> DataFrame<T>.dropNaNs(whereAllNaN: Boolean = false, columns: Colu
10871087
*
10881088
* `df.`[dropNaNs][org.jetbrains.kotlinx.dataframe.api.dropNaNs]`(Person::length, Person::age)`
10891089
*
1090-
* `df.`[dropNaNs][org.jetbrains.kotlinx.dataframe.api.dropNaNs]`(Person::length, whereAllNaN = true)`
1090+
* `df.`[dropNaNs][dropNaNs]`(Person::length, whereAllNaN = true)`
10911091
* @param whereAllNaN `false` by default.
10921092
* If `true`, rows are dropped if all selected cells are [`NaN`][Double.isNaN].
10931093
* If `false`, rows are dropped if any of the selected cells is [`NaN`][Double.isNaN].
@@ -1114,7 +1114,7 @@ public fun <T> DataFrame<T>.dropNaNs(vararg columns: KProperty<*>, whereAllNaN:
11141114
*
11151115
* `df.`[dropNaNs][org.jetbrains.kotlinx.dataframe.api.dropNaNs]`("length", "age")`
11161116
*
1117-
* `df.`[dropNaNs][org.jetbrains.kotlinx.dataframe.api.dropNaNs]`("length", whereAllNaN = true)`
1117+
* `df.`[dropNaNs][dropNaNs]`("length", whereAllNaN = true)`
11181118
* @param whereAllNaN `false` by default.
11191119
* If `true`, rows are dropped if all selected cells are [`NaN`][Double.isNaN].
11201120
* If `false`, rows are dropped if any of the selected cells is [`NaN`][Double.isNaN].
@@ -1145,7 +1145,7 @@ public fun <T> DataFrame<T>.dropNaNs(vararg columns: String, whereAllNaN: Boolea
11451145
*
11461146
* `df.`[dropNaNs][org.jetbrains.kotlinx.dataframe.api.dropNaNs]`(length, age)`
11471147
*
1148-
* `df.`[dropNaNs][org.jetbrains.kotlinx.dataframe.api.dropNaNs]`(length, whereAllNaN = true)`
1148+
* `df.`[dropNaNs][dropNaNs]`(length, whereAllNaN = true)`
11491149
* @param whereAllNaN `false` by default.
11501150
* If `true`, rows are dropped if all selected cells are [`NaN`][Double.isNaN].
11511151
* If `false`, rows are dropped if any of the selected cells is [`NaN`][Double.isNaN].
@@ -1180,7 +1180,7 @@ public fun <T> DataFrame<T>.dropNaNs(
11801180
*
11811181
* For more information: [See `dropNaNs` on the documentation website.](https://kotlin.github.io/dataframe/drop.html#dropnans)
11821182
* ## This Drop NaNs Overload
1183-
* This overload operates on all columns in the [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame].
1183+
* This overload operates on all columns in the [DataFrame].
11841184
* @param whereAllNaN `false` by default.
11851185
* If `true`, rows are dropped if all selected cells are [`NaN`][Double.isNaN].
11861186
* If `false`, rows are dropped if any of the selected cells is [`NaN`][Double.isNaN].

0 commit comments

Comments
 (0)