Pārlūkot izejas kodu

refactoring some xmake info

Seedking 1 gadu atpakaļ
vecāks
revīzija
c9bc539b3f

+ 4 - 6
src/main/kotlin/io/xmake/utils/SystemUtils.kt

@@ -10,9 +10,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
 import io.xmake.project.*
 import io.xmake.shared.XMakeProblem
-import java.io.BufferedReader
-import java.io.IOException
-import java.io.InputStreamReader
+import io.xmake.utils.interact.kXMakeVersion
 import java.io.File
 import java.nio.file.Path
 import java.nio.file.Paths
@@ -45,7 +43,7 @@ object SystemUtils {
             )
             for (program in programs) {
                 if (program == "xmake" || File(program).exists()) {
-                    val result = runVOutAll(listOf(program, "--version"))
+                    val result = ioRunv(listOf(program, "--version"))
                     if (result.isNotEmpty()) {
                         _xmakeProgram = program
                         break
@@ -63,9 +61,9 @@ object SystemUtils {
     var xmakeVersion: String
         get() {
             if (_xmakeVersion == "") {
-                val result = runVOutAll(listOf(xmakeProgram, "--version"))[0].split(',')
+                val result = kXMakeVersion
                 if (result.isNotEmpty()) {
-                    _xmakeVersion = result[0]
+                    _xmakeVersion = result
                 }
             }
             return _xmakeVersion

+ 28 - 0
src/main/kotlin/io/xmake/utils/interact/XMakeData.kt

@@ -0,0 +1,28 @@
+package io.xmake.utils.interact
+
+import io.xmake.utils.SystemUtils
+import io.xmake.utils.ioRunv
+
+val kXMakeFind:Boolean
+    get() = TODO()
+
+val kXMakeVersion:String
+    get() {
+        val verTemp: String = ioRunv(listOf(SystemUtils.xmakeProgram, "--version"))[0]
+        if (verTemp.isNotEmpty()) {
+            return verTemp.split(' ')[1].substring(0, verTemp.length - 1)
+        }
+        return verTemp
+    }
+
+val kXMakeInstallDir:String
+    get() = TODO()
+
+val kArchList:List<String>
+    get() = TODO()
+
+val kPlatList:List<String>
+    get() = TODO()
+
+val kPlatArchMap:Map<String, List<String>>
+    get() = TODO()