felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pde...@apache.org
Subject svn commit: r1652313 - /felix/sandbox/pderop/dependencymanager/release/build.gradle
Date Thu, 15 Jan 2015 23:49:52 GMT
Author: pderop
Date: Thu Jan 15 23:49:52 2015
New Revision: 1652313

URL: http://svn.apache.org/r1652313
Log:
Included NOTICE and LICENSE files in the -bin.zip file.
Excluded the integration tests from the -bin.zip (*.itest/generated/*.jar).
Using now Eclipse "Minimalist Gradle Editor" instead of Emacs groovy-mode and reindented some
tasks using Gradle editor.

Modified:
    felix/sandbox/pderop/dependencymanager/release/build.gradle

Modified: felix/sandbox/pderop/dependencymanager/release/build.gradle
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/release/build.gradle?rev=1652313&r1=1652312&r2=1652313&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager/release/build.gradle (original)
+++ felix/sandbox/pderop/dependencymanager/release/build.gradle Thu Jan 15 23:49:52 2015
@@ -76,30 +76,30 @@ task makeStaging << {
 
     def topdir="apache-felix-dependencymanager-" + dmVersion
     ant.zip(destfile: "staging/"+topdir+'-src.zip') {
-	zipfileset(dir: '../cnf', prefix: topdir+"-src/cnf", includes: ".project,.classpath,src/**,*.bnd,ext/**")
-	zipfileset(dir: '..', prefix: topdir+"-src", includes: '*.gradle,*.properties,README,NOTICE,LICENSE')
-	new File('.').eachFile { 
-	    if(new File(it, 'bnd.bnd').exists()) {
-    		def bndProject = workspace.getProject(it.name)
-    		if (! bndProject.isNoBundles()) {
-    		    zipfileset(dir: "../${bndProject.name}", prefix: topdir+"-src/${bndProject.name}",
-    			       includes: "*.gradle,.project,.classpath,.settings/**,src/**,test/**,*.bnd,*.bndrun,run-*/conf/**,resources/**")
-    		}
-	    }
-	}
+		zipfileset(dir: '../cnf', prefix: topdir+"-src/cnf", includes: ".project,.classpath,src/**,*.bnd,ext/**")
+		zipfileset(dir: '..', prefix: topdir+"-src", includes: '*.gradle,*.properties,README,NOTICE,LICENSE')
+		new File('.').eachFile { 
+	    	if(new File(it, 'bnd.bnd').exists()) {
+    			def bndProject = workspace.getProject(it.name)
+    			if (! bndProject.isNoBundles()) {
+    		    	zipfileset(dir: "../${bndProject.name}", prefix: topdir+"-src/${bndProject.name}",
+    			       		   includes: "*.gradle,.project,.classpath,.settings/**,src/**,test/**,*.bnd,*.bndrun,run-*/conf/**,resources/**")
+    			}
+	   		}
+		}
     }
 
     // Package binary dependencies, needed to build the source distributions.
     ant.zip(destfile: "staging/"+topdir+"-deps.zip") {
-	ant.zipfileset(dir: 'resources/deps', prefix: topdir+"-deps", includes: '*')
-	ant.zipfileset(dir: '../cnf', prefix: topdir+"-deps/cnf",
-		       includes: 'buildrepo/**,localrepo/**,releaserepo/**,plugins/**,gradle/**')
+		ant.zipfileset(dir: 'resources/deps', prefix: topdir+"-deps", includes: '*')
+		ant.zipfileset(dir: '../cnf', prefix: topdir+"-deps/cnf",
+		    		   includes: 'buildrepo/**,localrepo/**,releaserepo/**,plugins/**,gradle/**')
     }
 
     // Package binaries as a simple collection of bundles.
     ant.zip(destfile: "staging/"+topdir+"-bin.zip") {
         ant.mappedresources() {
-            ant.fileset(dir: '..', includes: '*/generated/*.jar')
+            ant.fileset(dir: '..', includes: '*/generated/*.jar,LICENSE,NOTICE', excludes:
'*.itest/generated/*.jar')
             ant.chainedmapper() {
                 ant.flattenmapper()
                 ant.globmapper(from: '*', to: topdir+'-bin/*')
@@ -111,26 +111,26 @@ task makeStaging << {
 // Sign staging directory 
 task signStaging << { 
     fileTree("staging").visit { FileVisitDetails details -> 
-	logger.lifecycle("    Signing " + details.file.path)
-	ant.exec(executable: 'gpg', dir: 'staging') { 
-	    ant.arg(line: '--armor')
-	    ant.arg(line: '--output')
-	    ant.arg(line: details.file.name + ".asc")
-	    ant.arg(line: "--detach-sig")
-	    ant.arg(line: details.file.name)
-	}
-
-	ant.exec(executable: 'gpg', dir: 'staging', output: "staging/" + details.file.name + ".md5")
{ 
-	    ant.arg(line: '--print-md')
-	    ant.arg(line: 'MD5')
-	    ant.arg(line: details.file.name)
-	}
-
-	ant.exec(executable: 'gpg', dir: 'staging', output: "staging/" + details.file.name + ".sha")
{
-	    ant.arg(line: '--print-md')
-	    ant.arg(line: 'SHA512')
-	    ant.arg(line: details.file.name)
-	}
+		logger.lifecycle("    Signing " + details.file.path)
+		ant.exec(executable: 'gpg', dir: 'staging') { 
+	    	ant.arg(line: '--armor')
+	    	ant.arg(line: '--output')
+	    	ant.arg(line: details.file.name + ".asc")
+	    	ant.arg(line: "--detach-sig")
+	    	ant.arg(line: details.file.name)
+		}
+
+		ant.exec(executable: 'gpg', dir: 'staging', output: "staging/" + details.file.name + ".md5")
{ 
+	    	ant.arg(line: '--print-md')
+	    	ant.arg(line: 'MD5')
+	    	ant.arg(line: details.file.name)
+		}
+
+		ant.exec(executable: 'gpg', dir: 'staging', output: "staging/" + details.file.name + ".sha")
{
+	    	ant.arg(line: '--print-md')
+	    	ant.arg(line: 'SHA512')
+	    	ant.arg(line: details.file.name)
+		}
     }
 }
 
@@ -140,8 +140,8 @@ task signStaging << {
 task commitToStaging << {
     getProject().exec { 
     	commandLine 'svn', '--username', svnUser, '--password', svnPassword, 
-	'import', 'staging', svnStagingPath + "/apache-felix-dependencymanager-" + dmVersion + "/",

-	'-m', "Staging Apache Felix Dependency Manager version " + dmVersion + "."
+		'import', 'staging', svnStagingPath + "/apache-felix-dependencymanager-" + dmVersion +
"/", 
+		'-m', "Staging Apache Felix Dependency Manager version " + dmVersion + "."
     }
 }
 
@@ -150,8 +150,8 @@ task commitToStaging << {
 task promoteToRelease << { 
     getProject().exec { 
     	commandLine 'svn', '--username', svnUser, '--password', svnPassword, 
-	'move', svnStagingPath+"/apache-felix-dependencymanager-" + dmVersion , svnReleasePath,

-	'-m', "Releasing Apache Felix Dependency Manager version " + dmVersion + "."
+		'move', svnStagingPath+"/apache-felix-dependencymanager-" + dmVersion , svnReleasePath,

+		'-m', "Releasing Apache Felix Dependency Manager version " + dmVersion + "."
     }
 }
 
@@ -160,8 +160,8 @@ task promoteToRelease << {
 task deleteFromStaging << { 
     getProject().exec { 
     	commandLine 'svn', '--username', svnUser, '--password', svnPassword, 
-	'delete', svnStagingPath+"/apache-felix-dependencymanager-" + dmVersion + "/",
-	"-m", "Removing Apache Felix Dependency Manager version " + dmVersion + " from staging."
+		'delete', svnStagingPath+"/apache-felix-dependencymanager-" + dmVersion + "/",
+		"-m", "Removing Apache Felix Dependency Manager version " + dmVersion + " from staging."
     }
 }
 



Mime
View raw message