[testng] 320/355: Build clean up.

[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 98fbd6d632235232e33efcc1c6222c0fe85a23fb
Author: Cedric Beust <beust at yahoo-inc.com>
Date:   Mon May 11 13:53:55 2015 -0700

    Build clean up.
---
 build.gradle | 35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/build.gradle b/build.gradle
index 821e64e..8a8bf08 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ plugins {
     id "com.jfrog.bintray" version "1.1"
 }
 
-version = '6.9.48-SNAPSHOT'
+version = '6.9.5-SNAPSHOT'
 
 apply plugin: 'java'
 apply from: 'gradle/publishing.gradle'
@@ -45,14 +45,20 @@ task sourceJar(type: Jar) {
 }
 
 artifacts {
-//    file('build/libs/klaxon.jar')
     sourceJar
 }
 
 import org.apache.tools.ant.filters.ReplaceTokens
 
+def generatedSourcesFolder = projectDir.toString() + '/src/generated/java'
+
+def dirFrom = projectDir.toString() + '/src/main/resources/org/testng/internal'
+def dirTo = generatedSourcesFolder + "/org/testng/internal"
+def fileFrom = 'VersionTemplateJava'
+def fileTo = 'Version.java'
+
 task removeVersion {
-    delete 'src/main/java/org/testng/internal/Version.java'
+    delete dirTo + fileTo
 }
 
 sourceSets {
@@ -73,36 +79,21 @@ sourceSets {
     }
 }
 
-sourceSets.each { s ->
-    println("Source set: ${s}")
-}
-
-def generatedSourcesFolder = projectDir.toString() + '/src/generated/java'
-
-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 {
-        println("@@@ MKDIR " + dirTo)
-        mkdir(dirTo)
-//    }
+    delete dirTo + "/" + fileTo
+    mkdir(dirTo)
 }
 
 task createVersion(type: Copy, dependsOn: myDir) {
     println("Creating Version file: ${version} in ${dirTo}")
-    println("FROM " + dirFrom + "/" + fileTemplate)
-    println("TO " + dirTo + "/Version.java")
     from dirFrom
-    include fileTemplate
+    include fileFrom
     into(dirTo)
-    rename(fileTemplate, 'Version.java')
+    rename(fileFrom, fileTo)
     filter(ReplaceTokens, tokens: [version: version])
 }
 

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