svn commit: r1043789 - in /ode/trunk: Rakefile tasks/gpg.rake

[va...@apache.org]

Author: vanto
Date: Thu Dec  9 00:10:31 2010
New Revision: 1043789

URL: http://svn.apache.org/viewvc?rev=1043789&view=rev
Log:
gpg signing tweaks, source packaging works now with git.

Modified:
    ode/trunk/Rakefile
    ode/trunk/tasks/gpg.rake

Modified: ode/trunk/Rakefile
URL: http://svn.apache.org/viewvc/ode/trunk/Rakefile?rev=1043789&r1=1043788&r2=1043789&view=diff
==============================================================================
--- ode/trunk/Rakefile (original)
+++ ode/trunk/Rakefile Thu Dec  9 00:10:31 2010
@@ -541,9 +541,8 @@ define "ode" do
   package_with_sources
   package_with_javadoc unless ENV["JAVADOC"] =~ /^(no|off|false|skip)$/i
 
-  # sign artifacts
-  projects.each { |pr| pr.packages.each { |pkg| GPG.sign_and_upload(pkg) } }
-
+  GPG.sign_before_upload(self)
+  
   task :pmd do
     pmd_classpath = transitive('pmd:pmd:jar:4.2.5').each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
     mkdir_p _(:reports)
@@ -641,6 +640,8 @@ define "apache-ode" do
       `svn status -v`.reject { |l| l[0] == ?? || l[0] == ?D || l.strip.empty? || l[0...3] == "---"}.
         map { |l| l.split.last }.reject { |f| File.directory?(f) }.
         each { |f| zip.include f, :as=>f.gsub("\\", "/") }
+    elsif File.exist? '.git/config'
+      `git ls-files`.split("\n").each { |f| zip.include f, :as=>f.gsub("\\", "/") }
     else
       zip.include Dir.pwd, :as=>"."
     end
@@ -649,9 +650,7 @@ define "apache-ode" do
   package(:zip, :id=>"#{id}-docs").include(doc.from(project("ode").projects).
     using(:javadoc, :windowtitle=>"Apache ODE #{project.version}").target, :as=>"#{id}-docs-#{version}") unless ENV["JAVADOC"] =~ /^(no|off|false|skip)$/i
     
-  # sign disto packages
-  projects.each { |pr| pr.packages.each { |pkg| GPG.sign_and_upload(pkg) } }
-  # sign source and javadoc artifacts
-  packages.each { |pkg| GPG.sign_and_upload(pkg) }
+  # sign packages
+  GPG.sign_before_upload(self)
 
 end

Modified: ode/trunk/tasks/gpg.rake
URL: http://svn.apache.org/viewvc/ode/trunk/tasks/gpg.rake?rev=1043789&r1=1043788&r2=1043789&view=diff
==============================================================================
--- ode/trunk/tasks/gpg.rake (original)
+++ ode/trunk/tasks/gpg.rake Thu Dec  9 00:10:31 2010
@@ -38,4 +38,14 @@ module GPG
     artifact.from sign_task(pkg)
     task(:upload).enhance [artifact.upload_task]
   end
+  
+  def sign_before_upload(root)
+    root.enhance do 
+      [root, root.projects].flatten.each { |prj|
+        prj.packages.each { |pkg| sign_and_upload(pkg) }
+        prj.packages.map {|pkg| pkg.pom }.uniq.each { |pom| sign_and_upload(pom) }
+      }
+    end
+  end
+
 end