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

Kobalt 1.0.69 update.

Browse source
This commit is contained in:
Erik C. Thauvin 2017-04-18 17:58:33 -07:00
parent a89860e944
commit c132f817b4
11 changed files with 19 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.gitignore vendored
View file

@ -4,8 +4,8 @@
**/.idea/tasks.xml
**/.idea/workspace.xml
*.iws
.DS_Store
.classpath
.DS_Store
.gradle
.kobalt
.nb-gradle
@ -15,8 +15,10 @@
/build
/deploy
/dist
/example/libs/
/gen
/gradle.properties
/lib
/libs
/local.properties
/out
@ -24,7 +26,6 @@
/project.properties
/target
/test-output
Thumbs.db
ehthumbs.db
kobaltBuild
/example/libs/
Thumbs.db

2
.idea/kobalt.xml generated
View file

@ -5,7 +5,7 @@
<KobaltProjectSettings>
<option name="autoDownloadKobalt" value="true" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="kobaltHome" value="$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.26" />
<option name="kobaltHome" value="$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.69" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />

1
.idea/modules.xml generated
View file

@ -3,7 +3,6 @@
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/kobalt/Build.kt.iml" filepath="$PROJECT_DIR$/kobalt/Build.kt.iml" />
<module fileurl="file://$PROJECT_DIR$/example/example.iml" filepath="$PROJECT_DIR$/example/example.iml" />
<module fileurl="file://$PROJECT_DIR$/example/example2.iml" filepath="$PROJECT_DIR$/example/example2.iml" />
<module fileurl="file://$PROJECT_DIR$/kobalt-exec.iml" filepath="$PROJECT_DIR$/kobalt-exec.iml" />
</modules>

16
example/example.iml
View file

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="example" external.linked.project.path="$MODULE_DIR$/.." external.root.project.path="$MODULE_DIR$/.." external.system.id="KOBALT" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager">
<output url="file://$MODULE_DIR$/../kobaltBuild/classes" />
<output-test url="file://$MODULE_DIR$/../kobaltBuild/test-classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/kobaltBuild" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="kobalt-exec" />
</component>
</module>

16
example/example2.iml
View file

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="example2" external.linked.project.path="$MODULE_DIR$/.." external.root.project.path="$MODULE_DIR$/.." external.system.id="KOBALT" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager">
<output url="file://$MODULE_DIR$/../kobaltBuild/classes" />
<output-test url="file://$MODULE_DIR$/../kobaltBuild/test-classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/kobaltBuild" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="kobalt-exec" />
</component>
</module>

1
example/kobalt/src/Build.kt
View file

@ -8,6 +8,7 @@ import net.thauvin.erik.kobalt.plugin.exec.*
// ./kobaltw example2:exec --log 2
val bs = buildScript {
//plugins(file("../kobaltBuild/libs/kobalt-exec-0.6.4.jar"))
plugins("net.thauvin.erik:kobalt-exec:")
}

2
example/kobalt/wrapper/kobalt-wrapper.properties
View file

@ -1 +1 @@
kobalt.version=1.0.30
kobalt.version=1.0.69

1
kobalt-exec.iml
View file

@ -435,5 +435,6 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
</component>
</module>

1
kobalt/Build.kt.iml
View file

@ -36,5 +36,6 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
</component>
</module>

68
kobalt/src/Build.kt
View file

@ -1,25 +1,13 @@
import com.beust.kobalt.*
import com.beust.kobalt.misc.*
import com.beust.kobalt.plugin.application.*
import com.beust.kobalt.plugin.packaging.*
import com.beust.kobalt.plugin.publish.*
import net.thauvin.erik.kobalt.plugin.exec.*
import net.thauvin.erik.kobalt.plugin.versioneye.*
import org.apache.maven.model.*
import java.io.*
val semver = "0.6.3"
import com.beust.kobalt.*
import com.beust.kobalt.plugin.packaging.assemble
import com.beust.kobalt.plugin.publish.autoGitTag
import com.beust.kobalt.plugin.publish.bintray
import net.thauvin.erik.kobalt.plugin.versioneye.versionEye
import org.apache.maven.model.*
val bs = buildScript {
val p = with(File("kobaltBuild/libs/kobalt-exec-$semver.jar")) {
if (exists()) {
kobaltLog(1, " >>> Using: $path")
file(path)
} else {
"net.thauvin.erik:kobalt-exec:"
}
}
plugins("net.thauvin.erik:kobalt-versioneye:", p)
plugins("net.thauvin.erik:kobalt-versioneye:")
}
val dev by profile()
@ -30,7 +18,7 @@ val p = project {
name = "kobalt-exec"
group = "net.thauvin.erik"
artifactId = name
version = semver
version = "0.6.4"
pom = Model().apply {
description = "Command Line Execution plug-in for the Kobalt build system."
@ -57,7 +45,6 @@ val p = project {
dependenciesTest {
compile("org.testng:testng:")
}
assemble {
@ -79,41 +66,4 @@ val p = project {
org = "Thauvin"
team = "Owners"
}
}
val example = project(p) {
name = "example"
group = "com.example"
artifactId = name
version = "0.1"
directory = ("example")
assemble {
jar {
}
}
application {
mainClass = "com.example.Main"
}
exec {
commandLine(listOf("echo", "Test Example 1"), os = setOf(Os.LINUX))
commandLine(listOf("cmd", "/c", "echo", "Test Example 1"), os = setOf(Os.WINDOWS))
commandLine(args = listOf("ls", "-l"), dir = "../libs", os = setOf(Os.LINUX))
commandLine(args = listOf("cmd", "/c", "dir /Q"), dir = "../libs", os = setOf(Os.WINDOWS))
}
}
val example2 = project(p) {
name = "example2"
directory = "example"
exec {
commandLine(listOf("cmd", "/c", "echo", "Test Example 2"), os = setOf(Os.WINDOWS))
commandLine(listOf("echo", "Test example 2"), os = setOf(Os.LINUX))
//commandLine(listOf("cmd", "/c", "tasklist | find \"cmd.exe\""), os = setOf(Os.WINDOWS), fail = setOf(Fail.NONE))
commandLine(listOf("/bin/sh", "-c", "ps aux | grep bash"), os = setOf(Os.LINUX))
}
}
}

2
kobalt/wrapper/kobalt-wrapper.properties
View file

@ -1 +1 @@
kobalt.version=1.0.30
kobalt.version=1.0.69