svn commit: r566260 - in /ode/trunk: Rakefile tools-bin/

[mr...@apache.org]

Author: mriou
Date: Wed Aug 15 09:51:43 2007
New Revision: 566260

URL: http://svn.apache.org/viewvc?view=rev&rev=566260
Log:
Removing the tools-bin module and moving its content to the distro. Verified that distro scripts are executable (ODE-175).

Removed:
    ode/trunk/tools-bin/
Modified:
    ode/trunk/Rakefile

Modified: ode/trunk/Rakefile
URL: http://svn.apache.org/viewvc/ode/trunk/Rakefile?view=diff&rev=566260&r1=566259&r2=566260
==============================================================================
--- ode/trunk/Rakefile (original)
+++ ode/trunk/Rakefile Wed Aug 15 09:51:43 2007
@@ -445,19 +445,6 @@
     package :jar
   end
 
-  desc "ODE Tools Binaries"
-  define "tools-bin" do
-    # Copy binary files over, set permissions on Linux files.
-    bins = file("target/bin"=>FileList[_("src/main/dist/bin/*")]) do |task|
-      mkpath task.name
-      cp task.prerequisites, task.name
-      chmod 0755, FileList[task.name + "/*.sh"], :verbose=>false
-    end
-
-    build bins # , docs
-    package(:zip).include bins # , docs
-  end
-
   desc "ODE Utils"
   define "utils" do
     compile.with COMMONS.logging, COMMONS.pool, LOG4J, XERCES, JAVAX.stream
@@ -475,22 +462,32 @@
     project.package(:zip, :id=>id).path("#{id}-#{version}").tap do |zip|
       zip.include meta_inf + ["RELEASE_NOTES", "README"].map { |f| path_to(f) }
       zip.path("examples").include project.path_to("src/examples"+postfix), :as=>"."
+
       # Libraries
-      zip.merge project("ode:tools-bin").package(:zip)
       zip.path("lib").include artifacts(COMMONS.logging, COMMONS.codec, COMMONS.httpclient,
-        COMMONS.pool, COMMONS.collections, JAXEN,
-        SAXON, LOG4J, WSDL4J, XALAN, XERCES)
+        COMMONS.pool, COMMONS.collections, JAXEN, SAXON, LOG4J, WSDL4J, XALAN, XERCES)
       project("ode").projects("utils", "tools", "bpel-compiler", "bpel-api", "bpel-obj", "bpel-schemas").
         map(&:packages).flatten.each do |pkg|
         zip.include(pkg.to_s, :as=>"#{pkg.id}.#{pkg.type}", :path=>"lib")
       end
+
       # Including third party licenses
       Dir["#{project.path_to("license")}/*LICENSE"].each { |l| zip.include(l, :path=>"lib") }
       zip.include(project.path_to("target/LICENSE"))
+
       # Include supported database schemas
       Dir["#{project("ode:dao-jpa-ojpa-derby").path_to("target")}/*.sql"].each do |f|
         zip.include(f, :path=>"sql") unless f =~ /partial/
       end
+
+      # Tools scripts (like bpelc and sendsoap)
+      bins = file(project.path_to("target/bin")=>FileList[project.path_to("src/bin/*")]) do |task|
+        mkpath task.name
+        cp task.prerequisites, task.name
+        chmod 0755, FileList[task.name + "/*"], :verbose=>false
+      end
+      zip.include(bins)
+
       yield zip
       # For some reason this always fails on a clean build, commenting until I have time to inquire
       # project.check zip, "should contain mysql.sql" do