mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-09-09 12:17:13 +00:00
CARBON-183 and remove harful servlet-3.0 web-fragment.xml. Remove the dependency on buildr4osgi
This commit is contained in:
@@ -1,5 +1,3 @@
|
||||
require "buildr4osgi"
|
||||
|
||||
require File.join(File.dirname(__FILE__), "repositories.rb")
|
||||
require File.join(File.dirname(__FILE__), "dependencies.rb")
|
||||
|
||||
@@ -24,24 +22,32 @@ define "cappuccino" do
|
||||
file(_("target/Frameworks")).enhance do
|
||||
mkdir_p "target/Frameworks/Debug"
|
||||
system <<-BASH
|
||||
export BUILD_PATH="target/Build"
|
||||
jake debug release
|
||||
BASH
|
||||
export BUILD_PATH="target/Build"
|
||||
jake debug release
|
||||
BASH
|
||||
|
||||
cp_r "target/Build/Release/AppKit", "target/Frameworks/"
|
||||
cp_r "target/Build/Release/Foundation", "target/Frameworks/"
|
||||
cp_r "target/Build/Release/Objective-J", "target/Frameworks/"
|
||||
cp_r "target/Build/Debug/AppKit", "target/Frameworks/Debug/"
|
||||
cp_r "target/Build/Debug/Foundation", "target/Frameworks/Debug/"
|
||||
cp_r "target/Build/Debug/Objective-J", "target/Frameworks/Debug/"
|
||||
cp_r "target/Build/Release/AppKit", "target/Frameworks/"
|
||||
cp_r "target/Build/Release/Foundation", "target/Frameworks/"
|
||||
cp_r "target/Build/Release/Objective-J", "target/Frameworks/"
|
||||
cp_r "target/Build/Debug/AppKit", "target/Frameworks/Debug/"
|
||||
cp_r "target/Build/Debug/Foundation", "target/Frameworks/Debug/"
|
||||
cp_r "target/Build/Debug/Objective-J", "target/Frameworks/Debug/"
|
||||
end
|
||||
|
||||
# file(_("target/Build")).enhance do
|
||||
# end
|
||||
package(:bundle).include _("target/patch"), :as => "patch"
|
||||
package(:bundle).include _("target/Frameworks"), :as => "content/Frameworks"
|
||||
package(:bundle).include _("build.properties"), :as => "build.properties"
|
||||
package(:bundle).meta_inf << file('META-INF/web-fragment.xml')
|
||||
read_m = ::Buildr::Packaging::Java::Manifest.parse(File.read(_("META-INF/MANIFEST.MF"))).main
|
||||
read_m["Copyright"]="Intalio, Inc 2011"
|
||||
read_m["Bundle-Version"]=VERSION_NUMBER.gsub(/SNAPSHOT/, "#{Time.now.to_i}")
|
||||
read_m.delete("Jetty-WarFragmentFolderPath")
|
||||
read_m.delete("Jetty-WarPatchFragmentFolderPath")
|
||||
package(:jar).with :manifest => read_m
|
||||
#package(:jar).include _("target/patch"), :as => "patch"
|
||||
package(:jar).include _("target/Frameworks"), :as => "META-INF/resources/Frameworks"
|
||||
|
||||
#do not include those: they are at best not read harmful.
|
||||
#package(:bundle).include _("build.properties"), :as => "build.properties"
|
||||
#package(:bundle).meta_inf << file('META-INF/web-fragment.xml')
|
||||
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user