diff --git a/.idea/kobalt.xml b/.idea/kobalt.xml index 18044a8..cc61a64 100644 --- a/.idea/kobalt.xml +++ b/.idea/kobalt.xml @@ -17,11 +17,6 @@ diff --git a/.idea/modules.xml b/.idea/modules.xml index 47c9da8..48f8f9e 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,7 +3,6 @@ - diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/example/example.iml b/example/example.iml deleted file mode 100644 index 514e55d..0000000 --- a/example/example.iml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/example/kobalt/src/Build.kt b/example/kobalt/src/Build.kt index ab4c586..429d6e6 100644 --- a/example/kobalt/src/Build.kt +++ b/example/kobalt/src/Build.kt @@ -2,7 +2,7 @@ import com.beust.kobalt.* import com.beust.kobalt.plugin.packaging.* import com.beust.kobalt.plugin.application.* import com.beust.kobalt.plugin.java.* -//import net.thauvin.erik.kobalt.plugin.exec.* +import net.thauvin.erik.kobalt.plugin.exec.* val p = project { @@ -20,7 +20,7 @@ val p = project { } dependencies { - compile(file("../libs/kobalt-exec-0.1.jar")) + compile(file("../kobaltBuild/libs/kobalt-exec-0.1.jar")) } dependenciesTest { diff --git a/kobalt-exec.iml b/kobalt-exec.iml index fa44f8b..2041920 100644 --- a/kobalt-exec.iml +++ b/kobalt-exec.iml @@ -16,36 +16,18 @@ - + - + - + - - - - - - - - - - - - - - - - - - - + @@ -61,9 +43,27 @@ - + - + + + + + + + + + + + + + + + + + + + diff --git a/src/main/kotlin/net/thauvin/erik/kobalt/plugin/exec/ExecPlugin.kt b/src/main/kotlin/net/thauvin/erik/kobalt/plugin/exec/ExecPlugin.kt index e9811d0..f6e4a2b 100644 --- a/src/main/kotlin/net/thauvin/erik/kobalt/plugin/exec/ExecPlugin.kt +++ b/src/main/kotlin/net/thauvin/erik/kobalt/plugin/exec/ExecPlugin.kt @@ -39,12 +39,6 @@ import com.beust.kobalt.misc.log class ExecPlugin : BasePlugin(), ITaskContributor { -/* - fun main(argv: Array) { - com.beust.kobalt.main(argv) - } -*/ - // ITaskContributor override fun tasksFor(project: Project, context: KobaltContext): List { return emptyList() @@ -52,18 +46,18 @@ class ExecPlugin : BasePlugin(), ITaskContributor { companion object { - const val NAME: String = "kobalt-exec" + const val NAME: String = "Exec" } override val name = NAME - @Task(name = "exec", description = "Executes a command line process.") + @Task(name = "exec", description = "Execute a command line process.") fun taskExec(project: Project): TaskResult { return executeCommands(project) } private fun executeCommands(project: Project): TaskResult { - var success = false + var success = true val config = configs[project.name] if (config != null) {