diff --git a/buildJvm/build.gradle b/buildJvm/build.gradle deleted file mode 100644 index 646bad8b..00000000 --- a/buildJvm/build.gradle +++ /dev/null @@ -1,17 +0,0 @@ -plugins { - id 'org.jetbrains.kotlin.jvm' version '1.6.0' -// id 'application' -} - -repositories { - mavenCentral() -} - -java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 -} - -dependencies { - implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.6.0' -} \ No newline at end of file diff --git a/buildJvm/build.gradle.kts b/buildJvm/build.gradle.kts new file mode 100644 index 00000000..d4dcecd3 --- /dev/null +++ b/buildJvm/build.gradle.kts @@ -0,0 +1,81 @@ +plugins { + kotlin("jvm") version "1.6.0" + id("application") +} + +version = "unspecified" + +repositories { + mavenCentral() +} + +dependencies { + implementation(kotlin("stdlib")) +} + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} + +task("copyScripts", Copy::class) { + from(filesType("bin")) + into("/tmp/bin7/bin") + duplicatesStrategy = DuplicatesStrategy.WARN + mustRunAfter(":installDist") +} + +task("copyLibs", Copy::class) { + from(filesType("lib")) + into("/tmp/bin7/lib") + duplicatesStrategy = DuplicatesStrategy.WARN + mustRunAfter(":installDist") +} + +task ("copyAll") { + dependsOn( + ":assemble", + ":installDist", + ":copyScripts", + ":copyLibs" + ) +} + +// +//java { +// toolchain { +// languageVersion = JavaLanguageVersion.of(17) +// } +//} +// +//dependencies { +// implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.6.0' +//} +// +//task buildAll { +// doLast { +// def bins = fileTree(dir: "$buildDir/..").getFiles() +// println bins +// } +//} +//tasks.register('fullBuild', Copy) { +//// from fileTree(dir: "$buildDir/../").getFiles() +//// into file("/tmp/bin6") +//// duplicatesStrategy = DuplicatesStrategy.WARN +// doLast { +// println (fileTree(dir: "$buildDir/../").getFiles()) +// } +//// def i=0 +//// eachFile { +//// details -> +//// details.setPath( "bbb${i}") +//// i++ +//// duplicatesStrategy = DuplicatesStrategy.WARN +//// } +//} + +fun Build_gradle.filesType(type: String) = fileTree("$buildDir/..").files.filter { + it.path.contains("build/install/build_.*/$type".toRegex()) + && it.isFile +} \ No newline at end of file