polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From paulmer...@apache.org
Subject [45/50] [abbrv] polygene-java git commit: build: use the outer build wrapper to check the source dist by building from it
Date Tue, 16 May 2017 18:51:37 GMT
build: use the outer build wrapper to check the source dist by building from it


Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/955eaa98
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/955eaa98
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/955eaa98

Branch: refs/heads/master
Commit: 955eaa9832c189eaa6fe348d9f69a70c71762b93
Parents: a7de598
Author: Paul Merlin <paulmerlin@apache.org>
Authored: Mon May 15 19:29:39 2017 +0200
Committer: Paul Merlin <paulmerlin@apache.org>
Committed: Mon May 15 19:29:39 2017 +0200

----------------------------------------------------------------------
 .../gradle/structure/distributions/DistributionsPlugin.groovy    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/polygene-java/blob/955eaa98/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
----------------------------------------------------------------------
diff --git a/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
b/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
index c7b1958..753b1a4 100644
--- a/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
@@ -314,7 +314,9 @@ class DistributionsPlugin implements Plugin<Project>
       def workDir = project.file( "$project.buildDir/tmp/${ TaskNames.BUILD_SOURCE_DIST }"
)
       task.inputs.dir unpackedSrcDistDir
       task.workingDir = workDir
-      task.commandLine = [ './gradlew', 'build', '-u', '-s', /* '-g', workDir */ ]
+      def gradlew = new File( project.rootDir, 'gradlew' ).absolutePath
+      def settings = new File( workDir, 'settings.gradle' ).absolutePath
+      task.commandLine = [ gradlew, '-c', settings, 'build', '-u', '-s', /* '-g', workDir
*/ ]
       task.doFirst {
         project.copy { CopySpec spec ->
           spec.from unpackedSrcDistDir


Mime
View raw message