脚本编译目录输出编码修复(漏掉了)

TheFloodDragon · Jul 12, 2023 · bbb758a · bbb758a
1 parent 89a0d2d
commit bbb758a
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 24 deletions.
diff --git a/buildSrc/src/main/kotlin/CompiledOutputer.kt b/buildSrc/src/main/kotlin/CompiledOutputer.kt
@@ -6,32 +6,35 @@ const val outputFolder = "outs"
 
 //输出编译后的文件到./outs
 fun Project.output() {
-    gradle.buildFinished {
+    @Suppress("DEPRECATION") gradle.buildFinished {
         val outDir = File(rootDir, outputFolder)
-        rootProject
-            .childProjects["plugin"]!!.childProjects.values
-            .forEach {
-                val platformStr =
-                    if (it.name.equals("all")) "" else "-${it.name.split('-')[1].capitalized()}"
-                it.outCopy(
-                    File(outDir, "$rootName$platformStr-${it.version}.jar")
-                )
+        allprojects.forEach {
+            if (it.parent?.name.equals("plugin")) {
+                it.outCopy(File(outDir, nameOfPlugin(it)))
+            } else if (it.parent?.name.equals("script")) {
+                it.outCopy(File(outDir, nameOfScript(it)))
             }
+        }
     }
+}
+
+fun nameOfPlugin(p: Project): String {
+    return if (p.name.equals("all"))
+        "$rootName-${p.version}.jar"
+    else "$rootName-${p.name.split('-')[1].capitalized()}-${p.version}.jar"
+}
 
-    //    rootProject TODO do after 8000 years
-    //        .childProjects["module"]!!.childProjects.values
-    //        .forEach { copyByProject(it) }
+fun nameOfScript(p: Project): String {
+    return "Script-${p.name.capitalized()}-${p.version}.jar"
 }
 
 /**
  * 复制项目输出文件到指定目录
  */
 fun Project.outCopy(
-    target: File,//输出目标
-    source: File? = this.catchOut()//源
+    target: File,
+    source: File? = this.catchOut()
 ) {
-    //outDir.mkdirs().takeIf { !outDir.exists() } //先创建文件
     //复制
     source?.copyTo(target, true)
 }

diff --git a/script/test01/src/main/kotlin/cn/fd/utilities/test/TestScript.kt b/script/test01/src/main/kotlin/cn/fd/utilities/test/TestScript.kt
@@ -5,20 +5,20 @@ import cn.fd.utilities.script.ScriptF
 object TestScript : ScriptF() {
 
     init {
-        println("static test")
+        println("static test-01")
     }
 
     override fun init() {
-        println("init")
+        println("init-01")
         println(name)
     }
 
     override fun enable() {
-        println("enable")
+        println("enable-01")
     }
 
     override fun disable() {
-        println("disable")
+        println("disable-01")
     }
 
 }
diff --git a/script/test02/build.gradle.kts b/script/test02/build.gradle.kts
@@ -0,0 +1,2 @@
+dependencies {
+}
diff --git a/script/test02/src/main/kotlin/cn/fd/utilities/test/TestScript.kt b/script/test02/src/main/kotlin/cn/fd/utilities/test/TestScript.kt
@@ -0,0 +1,24 @@
+package cn.fd.utilities.test
+
+import cn.fd.utilities.script.ScriptF
+
+object TestScript : ScriptF() {
+
+    init {
+        println("static test-02")
+    }
+
+    override fun init() {
+        println("init-02")
+        println(name)
+    }
+
+    override fun enable() {
+        println("enable-02")
+    }
+
+    override fun disable() {
+        println("disable-02")
+    }
+
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,15 +1,15 @@
 rootProject.name = "FDUtilities"
 
-applyAll("project")
-applyAll("script")
+apply("project")
+apply("script")
 
 //Bukkit
 include("plugin:platform-bukkit")
-//全部聚合版
+//全部聚合版
 include("plugin:all")
 
-//所有字项目的加载(懒得自己一个一个打)
-fun applyAll(name: String) {
+//所有字项目的加载(懒得自己一个一个打)
+fun apply(name: String) {
     File("${rootDir}\\$name").listFiles()?.filter { it.isDirectory }?.forEach {
         include("$name:${it.name}")
     }