Author: assaf
Date: Wed Mar 7 22:55:07 2007
New Revision: 515945
URL: http://svn.apache.org/viewvc?view=rev&rev=515945
Log:
Minor fixes for empty builds and fix circular dependency in distro-axis2
Modified:
incubator/ode/trunk/Rakefile
Modified: incubator/ode/trunk/Rakefile
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/Rakefile?view=diff&rev=515945&r1=515944&r2=515945
==============================================================================
--- incubator/ode/trunk/Rakefile (original)
+++ incubator/ode/trunk/Rakefile Wed Mar 7 22:55:07 2007
@@ -112,8 +112,10 @@
XALAN, XERCES
resources do |task|
- unzip(artifact("#{group}:ode-dao-jpa-ojpa-derby:zip:#{version}")).
- into(path_to(:target_dir, "resources")).invoke
+ if compile.compiled?
+ unzip(artifact("#{group}:ode-dao-jpa-ojpa-derby:zip:#{version}")).
+ into(path_to(:target_dir, "resources")).invoke
+ end
#untar(artifact("#{group}:ode-dao-hibernate-db-derby:tar:#{version}")).
# into(path_to(:target_dir, "resources")),
end
@@ -201,7 +203,9 @@
tests.resources do |task|
#rm_rf path_to(:test_target_dir, "derby-db")
-
unzip(artifact("#{group}:ode-dao-jpa-ojpa-derby:zip:#{version}")).into(path_to(:test_target_dir,
"derby-db")).invoke
+ if tests.compile.compiled?
+
unzip(artifact("#{group}:ode-dao-jpa-ojpa-derby:zip:#{version}")).into(path_to(:test_target_dir,
"derby-db")).invoke
+ end
end
tests.compile.with *compile.classpath
tests.compile.with project("ode:bpel-scheduler-quartz"),
@@ -305,7 +309,6 @@
cmd << "-cp" << artifacts(DERBY, DERBY_TOOLS).join(File::PATH_SEPARATOR)
cmd << "org.apache.derby.tools.ij"
Open3.popen3(*cmd) do |stdin, stdout, stderr|
- puts "INSIDE"
# Shutdown so if a database already exists, we can remove it.
stdin.puts "connect 'jdbc:derby:;shutdown=true';"
rm_rf path_to(:target, "derby") rescue nil
@@ -314,9 +317,7 @@
stdin.puts "set schema sa"
stdin.puts "autocommit on;"
#puts "Going to write prereqs: #{prereq.to_s}"
- puts "before"
task.prerequisites.each { |prereq| stdin.write File.read(prereq.to_s) }
- puts "after"
# Exiting will shutdown the database so we can copy the files around.
stdin.puts "exit"
stdin.close
@@ -336,16 +337,11 @@
define "distro-axis2" do
resources(
- filter(["LICENSE", "NOTICE", "DISCLAIMER"].map { |f| path_to("..", f)
}).into(path_to(:target_dir)),
- filter(path_to(:src_dir, "examples")).into(path_to(:target_dir))
+ filter(["LICENSE", "NOTICE", "DISCLAIMER"].map { |f| path_to("..", f)
}).into(path_to(:target_dir, "stage")),
+ filter(path_to(:src_dir, "examples")).into(path_to(:target_dir, "stage"))
)
- resources do
-
#unzip("#{group}:ode-tools-bin:zip:#{version}").into(path_to(:target_dir)).invoke
- # TODO: how do we limit this to files from bins ZIP?
- #chmod 0755, FileList[task.name + "/*"].collect.exclude("**/*.bat"),
:verbose=>false
- end
- package(:zip).include(path_to(:target_dir, "*"))
+ package(:zip).include(path_to(:target_dir, "stage/*"))
package(:zip).include(COMMONS.logging, COMMONS.codec, COMMONS.httpclient,
COMMONS.pool, COMMONS.collections, JAXEN,
SAXON, LOG4J, WSDL4J, :path=>"lib")
