erik/kobalt-exec
erik/kobalt-exec
1
0
Fork 0
Code Issues Pull requests Releases Activity

Added Cygwin, MinGW and MSYS support.

Browse source
This commit is contained in:
Erik C. Thauvin 2017-04-28 10:55:59 -07:00
parent 395fa127b9
commit 9fb31c09e5
2 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
README.md
View file

@ -45,7 +45,7 @@ exec {
### `args` ### `args`
The full command line arguments including the executable and all parameters. The full command line including the executable and all arguments.
```kotlin ```kotlin
exec { exec {
@ -74,9 +74,12 @@ The following predefined values are available:
Name | Operating System Name | Operating System
--------------|----------------------- --------------|-----------------------
`Os.CYGWIN` | Cygwin
`Os.FREEBSD` | FreeBSD `Os.FREEBSD` | FreeBSD
`Os.LINUX` | Linux `Os.LINUX` | Linux
`Os.MAC` | Apple Macintosh / OS X `Os.MAC` | Apple Macintosh / OS X
`Os.MINGW` | Minimalist GNU for Windows
`OS.MSYS` | MSYS
`Os.OPENVMS` | OpenVMS `Os.OPENVMS` | OpenVMS
`Os.OS400` | OS/400 `Os.OS400` | OS/400
`Os.SOLARIS` | Solaris / SunOS `Os.SOLARIS` | Solaris / SunOS
@ -118,7 +121,7 @@ exec {
## taskName ## taskName
Additionally, you can specify a task name to easily identify multiple `exec` directives. Additionally, you can specify a task name to easily identify multiple `exec` tasks.
```kotlin ```kotlin
exec { exec {
@ -162,7 +165,4 @@ exec {
commandLine("/bin/sh", "-c", "./stop.sh 2> error.txt", os = setOf(Os.LINUX)) commandLine("/bin/sh", "-c", "./stop.sh 2> error.txt", os = setOf(Os.LINUX))
commandLine("cmd", "/c", "stop.bat 2> error.txt", os = setOf(Os.WINDOWS)) commandLine("cmd", "/c", "stop.bat 2> error.txt", os = setOf(Os.WINDOWS))
} }
``` ```

14
src/main/kotlin/net/thauvin/erik/kobalt/plugin/exec/ExecPlugin.kt
View file

@ -102,6 +102,18 @@ class ExecPlugin @Inject constructor(val taskContributor: TaskContributor, val c
Os.OS400 -> { Os.OS400 -> {
return curOs.contains("os/400") return curOs.contains("os/400")
} }
Os.CYGWIN -> {
val cygwin: String? = System.getenv("ORIGINAL_PATH")
return cygwin?.contains("/cygdrive/") ?: false
}
Os.MINGW -> {
val mingw: String? = System.getenv("MSYSTEM")
return mingw?.startsWith("MINGW") ?: false
}
Os.MSYS -> {
val msys: String? = System.getenv("MSYSTEM")
return msys?.startsWith("MSYS") ?: false
}
} }
} }
@ -184,7 +196,7 @@ enum class Fail {
} }
enum class Os { enum class Os {
FREEBSD, LINUX, MAC, OPENVMS, OS400, SOLARIS, TANDEM, WINDOWS, ZOS CYGWIN, FREEBSD, LINUX, MAC, MINGW, MSYS, OPENVMS, OS400, SOLARIS, TANDEM, WINDOWS, ZOS
} }
data class CommandLine(var args: List<String> = emptyList(), var dir: String = "", var os: Set<Os> = emptySet(), data class CommandLine(var args: List<String> = emptyList(), var dir: String = "", var os: Set<Os> = emptySet(),