[testng] 313/355: Build and tests working.

[Eugene Zhukov]

This is an automated email from the git hooks/post-receive script.

eugene-guest pushed a commit to annotated tag OpenBSD
in repository testng.

commit 71f679780443e4a425c831261fc34fcad9e2a48b
Author: Cedric Beust <cedric at beust.com>
Date:   Sun May 10 22:38:40 2015 -0700

    Build and tests working.
---
 .gitignore        |  4 ++++
 build-with-gradle |  1 +
 build.gradle      | 44 +++++++++++++++++++++++++++++---------------
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2c51bc2..bf6de7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,7 @@ testng.iml
 .ant-targets*
 nb-configuration.xml
 /_eclipse/
+.gitignore
+.gradle
+src/generated
+
diff --git a/build-with-gradle b/build-with-gradle
new file mode 100644
index 0000000..28d4642
--- /dev/null
+++ b/build-with-gradle
@@ -0,0 +1 @@
+./gradlew clean build cleanTest test
diff --git a/build.gradle b/build.gradle
index d7e8849..821e64e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ plugins {
     id "com.jfrog.bintray" version "1.1"
 }
 
-version = '6.9.47-SNAPSHOT'
+version = '6.9.48-SNAPSHOT'
 
 apply plugin: 'java'
 apply from: 'gradle/publishing.gradle'
@@ -55,18 +55,23 @@ task removeVersion {
     delete 'src/main/java/org/testng/internal/Version.java'
 }
 
+sourceSets {
+    generated {
+        java {
+            srcDir 'src/generated/java'
+        }
+        resources {
+            srcDir 'src/generated/resources'
+        }
+    }
+}
 
-//sourceSets {
-//    generated
-//}
-//
-//sourceSets {
-//    generated {
-//        java {
-//            srcDir 'src/generated/java'
-//        }
-//    }
-//}
+sourceSets {
+    main {
+        compileClasspath += generated.output
+        runtimeClasspath += generated.output
+    }
+}
 
 sourceSets.each { s ->
     println("Source set: ${s}")
@@ -78,6 +83,10 @@ def dirFrom = projectDir.toString() + '/src/main/resources/org/testng/internal'
 def dirTo = generatedSourcesFolder + "/org/testng/internal"
 def fileTemplate = 'VersionTemplateJava'
 
+gradle.projectsEvaluated {
+    compileJava.dependsOn(myDir)
+}
+
 task myDir {
     delete dirTo + "/Version.java"
 //    doLast {
@@ -95,7 +104,12 @@ task createVersion(type: Copy, dependsOn: myDir) {
     into(dirTo)
     rename(fileTemplate, 'Version.java')
     filter(ReplaceTokens, tokens: [version: version])
-//    expand project.properties
-//    filter(FixCrLfFilter)
-//    filter()
+}
+
+compileJava.dependsOn(createVersion)
+
+test {
+    useTestNG() {
+        suites 'src/test/resources/testng.xml'
+    }
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git