buildr4osgi 0.9.2 → 0.9.3

data/buildr4osgi.gemspec

@@ -16,7 +16,7 @@
 
 Gem::Specification.new do |spec|
   spec.name           = 'buildr4osgi'
-  spec.version        = '0.9.2'
+  spec.version        = '0.9.3'
   spec.author         = 'Antoine Toulme'
   spec.email          = "atoulme@intalio.com"
   spec.homepage       = "http://buildr.apache.org/"
@@ -36,5 +36,5 @@ TEXT
   spec.rdoc_options     = '--title', 'Buildr4osgi', '--main', 'README.rdoc',
                           '--webcvs', 'http://github.com/intalio/buildr4osgi'
   spec.post_install_message = "To get started run buildr --help"
-  spec.add_dependency("manifest", "= 0.0.7")
+  spec.add_dependency("manifest", "= 0.0.8")
 end

data/lib/buildr4osgi.rb

@@ -20,8 +20,10 @@ require 'buildr4osgi/compile'
 # Methods defined in Buildr4OSGi are both instance methods (e.g. when included in Project)
 # and class methods when invoked like Buildr4OSGi.project_library(SLF4J, "group", "foo", "1.0.0").
 module Buildr4OSGi ; extend self ; end
+module OSGi ; extend self ; end
 # The Buildfile object (self) has access to all the Buildr4OSGi methods and constants.
 class << self ; include Buildr4OSGi ; end
+class << self ; include OSGi ; end
 class Object #:nodoc:
   Buildr4OSGi.constants.each do |name|
     const = Buildr4OSGi.const_get(name)

data/lib/buildr4osgi/compile.rb

@@ -13,4 +13,5 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'buildr4osgi/compile/compiler'
+require 'buildr4osgi/compile/compiler'
+require 'buildr4osgi/compile/external'

data/lib/buildr4osgi/compile/compiler.rb

@@ -27,8 +27,6 @@ module Buildr4OSGi
       def compile(sources, target, dependencies) #:nodoc:
         check_options options, OPTIONS
         cmd_args = []
-        # tools.jar contains the Java compiler.
-        dependencies << Java.tools_jar if Java.tools_jar
         cmd_args << '-classpath' << dependencies.join(File::PATH_SEPARATOR) unless dependencies.empty?
         source_paths = sources.select { |source| File.directory?(source) }
         cmd_args << '-sourcepath' << source_paths.join(File::PATH_SEPARATOR) unless source_paths.empty?
@@ -36,7 +34,7 @@ module Buildr4OSGi
         cmd_args += osgic_args
         cmd_args += files_from_sources(sources)
         unless Buildr.application.options.dryrun
-          trace((%w[javac -classpath org.eclipse.jdt.internal.compiler.batch.Main] + cmd_args).join(' '))
+          trace((%w[java -classpath org.eclipse.jdt.internal.compiler.batch.Main] + cmd_args).join(' '))
           Java.load
           Java.org.eclipse.jdt.internal.compiler.batch.Main.compile(cmd_args.join(" ")) or
               fail 'Failed to compile, see errors above'

data/lib/buildr4osgi/compile/external.rb

@@ -0,0 +1,71 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+# We use an external compiler defined by ENV['EXTERNAL_COMPILER']
+module Buildr4OSGi
+  module CompilerSupport
+    class ExternalC < Buildr::Compiler::Javac
+      
+      OPTIONS = [:warnings, :debug, :deprecation, :source, :target, :lint, :other]
+    
+      specify :language=>:java, :sources => 'java', :source_ext => 'java',
+              :target=>'classes', :target_ext=>'class', :packaging=>:jar
+              
+              
+      def compile(sources, target, dependencies) #:nodoc:
+        check_options options, OPTIONS
+        cmd_args = []
+        cmd_args << '-classpath' << dependencies.join(File::PATH_SEPARATOR) unless dependencies.empty?
+        source_paths = sources.select { |source| File.directory?(source) }
+        cmd_args << '-sourcepath' << source_paths.join(File::PATH_SEPARATOR) unless source_paths.empty?
+        cmd_args << '-d' << File.expand_path(target)
+        cmd_args += externalc_args
+        cmd_args += files_from_sources(sources)
+        unless Buildr.application.options.dryrun
+          fail "ENV['EXTERNAL_COMPILER'] is not defined" if ENV['EXTERNAL_COMPILER'].nil?
+          javac_path = "#{ENV['EXTERNAL_COMPILER']}#{File::SEPARATOR}bin#{File::SEPARATOR}java"
+          ecj_path = File.expand_path(File.join(File.dirname(__FILE__), "ecj-#{Buildr4OSGi::CompilerSupport::OSGiC::CURRENT_JDT_COMPILER}.jar"))
+          final_args = ([javac_path,"-classpath", ecj_path, "org.eclipse.jdt.internal.compiler.batch.Main"] + cmd_args).join(' ')
+          trace(final_args)
+          info %x[#{final_args}]
+          fail 'Failed to compile, see errors above' unless $?.success?
+        end
+      end
+
+      private
+      
+      # See arg list here: http://publib.boulder.ibm.com/infocenter/rsahelp/v7r0m0/index.jsp?topic=/org.eclipse.jdt.doc.isv/guide/jdt_api_compile.htm
+      def externalc_args #:nodoc:
+        args = []  
+        args << '-warn:none' unless options[:warnings]
+        args << '-verbose' if Buildr.application.options.trace
+        args << '-g' if options[:debug]
+        args << '-deprecation' if options[:deprecation]
+        args << '-source' << options[:source].to_s if options[:source]
+        args << '-target' << options[:target].to_s if options[:target]
+        case options[:lint]
+        when Array  then args << "-Xlint:#{options[:lint].join(',')}"
+        when String then args << "-Xlint:#{options[:lint]}"
+        when true   then args << '-Xlint'
+        end
+        args + Array(options[:other])
+      end
+      
+    end
+    
+  end
+end
+
+Buildr::Compiler.compilers << Buildr4OSGi::CompilerSupport::ExternalC

data/lib/buildr4osgi/eclipse.rb

@@ -14,4 +14,6 @@
 # the License.
 
 require 'buildr4osgi/eclipse/plugin'
-require 'buildr4osgi/eclipse/feature'
+require 'buildr4osgi/eclipse/feature'
+require 'buildr4osgi/eclipse/site'
+require 'buildr4osgi/eclipse/p2'

data/lib/buildr4osgi/eclipse/feature.rb

@@ -35,7 +35,7 @@ module Buildr4OSGi
     # Writes an Eclipse feature with this format:
     #<feature id="com.acme.MyFeature" label="%feature.name"
     #	 version="5.0.100" provider-name="%provider.name"
-    #	 plugin="myPlugin.id">
+    #	 plugin="myPlugin.id" image="some_icon.gif">
     #
     #   <description url="%changesURL">
     #      %description
@@ -69,7 +69,7 @@ module Buildr4OSGi
       feature_properties = {"id" => feature_id, "label" => externalize_strings ? "%feature.name" : label, 
         "version" => version, "provider-name" => externalize_strings ? "%provider.name" : provider}
       feature_properties.merge!("plugin" => branding_plugin) if branding_plugin
-      feature_properties.merge!("plugin" => image) if image
+      feature_properties.merge!("image" => image) if image
       x.feature(feature_properties) {
         x.description( "%description", "url" => externalize_strings ? "%changesURL" : changesURL)
         x.copyright(copyright)
@@ -371,21 +371,26 @@ PROPERTIES
     
     def package_as_SDK_feature(file_name) #:nodoc:
       return package_as_sources_before_SDK_feature(file_name) unless is_packaging_feature
-      featurePackage = packages.select {|package| package.is_a?(::Buildr4OSGi::FeaturePackaging)}.first.dup
+      
       sdkPackage = FeatureTask.define_task(file_name)
-      sdkPackage.enhance do |featureTask|
-        featureTask.generateFeature(project)
-      end
       sdkPackage.extend FeatureWriter
       sdkPackage.extend SDKFeatureEnabler
+      sdkPackage.enhance do |sdkTask|
+        featurePackage = packages.select {|package| package.is_a?(::Buildr4OSGi::FeaturePackaging)}.first
+        raise "Cannot use same feature.xml file for both binary and source features packaging" if (!featurePackage.feature_xml.nil?) && featurePackage.feature_xml == sdkTask.feature_xml
+        sdkTask.label += " - Sources" if featurePackage.label == sdkTask.label
+        sdkTask.description = "Sources for " + sdkTask.description if featurePackage.description == sdkTask.description
+        sdkTask.feature_id += ".sources" if featurePackage.feature_id == sdkTask.feature_id
+        sdkTask.generateFeature(project)
+      end
       
+      featurePackage = packages.select {|package| package.is_a?(::Buildr4OSGi::FeaturePackaging)}.first
       FeatureWriter::VARS.each do |ivar|
         value = featurePackage.instance_variable_get("@#{ivar}")
         new_value = value.clone rescue value
         sdkPackage.instance_variable_set("@#{ivar}", new_value)
       end
       
-      sdkPackage.feature_id += ".sources"
       sdkPackage
     end
     

data/lib/buildr4osgi/eclipse/p2.rb

@@ -0,0 +1,137 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+module Buildr4OSGi
+
+  module P2
+
+    include Extension
+
+    def package_as_p2_from_site(file_name)
+      task = UpdateSitePublisherTask.define_task(file_name)
+      task.send :associate_with, self
+      return task
+    end
+    
+    def package_as_p2_from_site_spec(spec)
+      spec.merge(:type => :zip, :classifier => "p2", :id => name.split(":").last)
+    end
+
+    class UpdateSitePublisherTask < ::Buildr::Packaging::Java::JarTask
+
+      attr_accessor :site
+      attr_reader :project
+
+      def initialize(*args) #:nodoc:
+        super
+        enhance do
+#          Buildr.ant('org.eclipse.equinox.p2.publisher.UpdateSitePublisher') do |ant|
+#            work_dir = File.join(project.base_dir, "target", "generated", "update-site")
+#            ant.java :fork => true, :failonerror => true, :classname=>'org.eclipse.equinox.p2.publisher.UpdateSitePublisher' do
+#              ant.arg :value => "metadataRepository" 
+#              ant.arg :value => work_dir
+#              ant.arg :value => "artifactRepository"
+#              ant.arg :value => work_dir
+#              ant.arg :value => "compress"
+#              ant.arg :value => "publishArtifacts"
+#            end
+#          end
+# http://wiki.eclipse.org/Equinox/p2/Publisher
+#the p2.installer and the p2.agent don't work. currently debugging with a local eclipse sdk.
+# download the app here: "org.eclipse.equinox.p2:installer:3.6M2-linux.gtk.x86:tgz"
+# unzip it wherever it is.
+# then invoke it on the cmd line `java -jar #{launcherLocation} -application ... -source #{siteLocation}`
+#we need to give the ability to define an eclipse home that could be invoked as a replacement to this.
+#          p2installer = Buildr::artifact("org.eclipse.platform:eclipse-platform:tgz:3.6M3-linux-gtk")
+#          p2installer.invoke
+#          p2installerHome = File.join(project.base_dir, "target", "p2installer")
+#          Buildr::unzip(p2installerHome => p2installer).extract
+#          p2installerHome = File.join(p2installerHome, "eclipse")
+          
+          #add the missing publisher plugin:
+#          p2publisher = Buildr::artifact("org.eclipse.equinox.p2:org.eclipse.equinox.p2.publisher:jar:1.1.0.v20090831")
+#          p2publisher.invoke
+#          cp p2publisher.to_s, File.join(p2installerHome, "plugins/#{p2publisher.id}_#{p2publisher.version}.jar")
+
+          siteWithoutP2 = project.package(:site)
+          siteWithoutP2.invoke
+
+          targetDir = File.join(project.base_dir, "target")
+          targetP2Repo = File.join(project.base_dir, "target", "p2repository");
+          mkpath targetP2Repo
+          Buildr::unzip(targetP2Repo=>siteWithoutP2.to_s).extract
+          eclipseSDK = Buildr::artifact("org.eclipse:eclipse-SDK:zip:3.6M3-win32")
+          eclipseSDK.invoke
+          p2installerHome = File.dirname eclipseSDK.to_s#"~/proj/eclipses/eclipse-SDK-3.6M3"
+          Buildr::unzip( p2installerHome => eclipseSDK.to_s ).extract
+          p2installerHome += "/eclipse"
+          launcherPlugin = Dir.glob("#{p2installerHome}/plugins/org.eclipse.equinox.launcher_*")[0]
+          
+          application = "org.eclipse.equinox.p2.publisher.UpdateSitePublisher"
+          #this is where the artifacts are published.
+          metadataRepository_url = "file:#{targetP2Repo}"
+          artifactRepository_url = metadataRepository_url
+          metadataRepository_name = project.id + "_" + project.version
+          artifactRepository_name = project.id + "_" + project.version
+          source_absolutePath = targetP2Repo
+          
+          cmdline = "java -jar #{launcherPlugin} -application #{application} \
+-metadataRepository #{metadataRepository_url} \
+-artifactRepository #{artifactRepository_url} \
+-metadataRepositoryName #{metadataRepository_name} \
+-artifactRepositoryName #{artifactRepository_name} \
+-source #{source_absolutePath} \
+-configs gtk.linux.x86 \
+-publishArtifacts \
+-clean -consoleLog"
+          puts "Invoking P2's metadata generation: #{cmdline}"
+          result = `#{cmdline}`
+          puts result
+          
+          include targetP2Repo, :as=>"."
+          
+        end
+      end
+
+      # :call-seq:
+      #   with(options) => self
+      #
+      # Passes options to the task and returns self. 
+      #
+      def with(options)
+        options.each do |key, value|
+          begin
+            send "#{key}=", value
+          rescue NoMethodError
+            raise ArgumentError, "#{self.class.name} does not support the option #{key}"
+          end
+        end
+        self
+      end
+
+      private 
+
+      def associate_with(project)
+        @project = project
+      end
+
+    end
+  end
+end
+
+class Buildr::Project
+  include Buildr4OSGi::P2
+end
+

data/lib/buildr4osgi/eclipse/site.rb

@@ -0,0 +1,207 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+module Buildr4OSGi
+
+  class Category
+
+    attr_accessor :features, :name, :label, :description 
+
+    def initialize()
+      @features = []
+    end
+
+  end
+
+  module SiteWriter
+
+    attr_accessor :description, :description_url, :categories
+
+    # :nodoc:
+    # When this module extends an object
+    # the categories are initialized as empty arrays.
+    #
+    def SiteWriter.extend_object(obj)
+      super(obj)
+      obj.categories = []
+    end
+
+    #
+    # http://help.eclipse.org/ganymede/index.jsp?topic=/org.eclipse.platform.doc.isv/reference/misc/update_sitemap.html
+    #
+    #<site pack200="false">
+    #  <description url="http://www.example.com/DescriptionOfSite">Some description</description>
+    #  <category-def name="some.id" label="Human readable label">
+    #    <description>Some description</description>
+    #  </category-def>
+    #  <feature id="feature.id" version="2.0.3" url="features/myfeature.jar" patch="false">
+    #    <category name="some.id"/>
+    #  </feature>
+    #</site>
+    #
+    def writeSiteXml(feature_info)
+      x = Builder::XmlMarkup.new(:target => out = "", :indent => 1)
+      x.instruct!
+      x.site(:pack200 => "false") {
+        x.description(description, :url => description_url) if (description || description_url)
+        for category in categories
+          x.tag!("category-def", :name => category.name, :label => category.label) {
+            x.description category.description if category.description
+          }
+        end
+
+        
+        f2c = feature_categories_map()
+        f2c.each_pair { |feature, categories|
+          info = feature_info[feature.to_s]
+          x.feature(:id => info[:id], :version => info[:version], :url => "features/#{info[:id]}_#{info[:version]}.jar", :patch => false) {
+            for category in categories
+              x.category(:name => category.name)
+            end
+          }
+        }
+      }
+    end  
+    
+    def feature_categories_map()
+      f2c = {}
+      categories.each do |category|
+        category.features.collect {|f| adapt_feature(f)}.flatten.each do |f|
+          f2c[f] ||= []
+          f2c[f] << category
+        end
+      end
+      f2c
+    end
+    
+    def adapt_feature(obj)
+      artifact = case 
+        when obj.is_a?(String)
+          Buildr::artifact(obj)
+        when obj.is_a?(Buildr::Project)
+          [Buildr::artifact(obj.package(:feature)), Buildr::artifact(obj.package(:sources))]
+        else 
+          obj
+        end
+      artifact
+    end
+    
+  end
+
+  #Marker module common to all sites packaging tasks.
+  #Tasks including this module are recognized internally as tasks packaging sites.
+  module SitePackaging
+
+  end
+
+  class SiteTask < ::Buildr::Packaging::Java::JarTask
+    include SitePackaging
+    
+    attr_accessor :site_xml
+    
+    def initialize(*args) #:nodoc:
+      super
+    end
+    
+    def generateSite(project)
+      mkpath File.join(project.base_dir, 'target')
+      feature_files = find_feature_files()
+      info = {}
+      for feature in feature_files
+        dir = File.join(project.base_dir, 'target', File.basename(feature.to_s, ".*"))
+        
+        feature_xml = nil
+        feature_info = {}
+        info[feature.to_s] = feature_info
+        Zip::ZipFile.open(feature.to_s) do |zip|
+          
+          feature_xml = zip.read(zip.entries.select {|entry| entry.name.to_s.match(".*/feature\.xml")}.first)
+          doc = REXML::Document.new(feature_xml)
+          feature_info[:id] = REXML::XPath.first(doc, "/feature/@id")
+          feature_info[:version] = REXML::XPath.first(doc, "/feature/@version")
+        end
+        unzip = Buildr::unzip(dir => feature.to_s)
+        
+        unzip.target.invoke
+        include(File.join(dir, "eclipse", "plugins", "*"), :path => "plugins")
+        
+        Dir.glob(File.join(dir, "eclipse", "features", "*")).each do |feature_dir|
+          Buildr::zip(File.join(dir, "features", "#{File.basename(feature_dir)}.jar")).include(File.join(feature_dir, "*")).invoke
+          path("features").include File.join(dir, "features", "#{File.basename(feature_dir)}.jar")
+        end
+      end
+      if site_xml
+        path("").include site_xml
+      else
+        File.open(File.join(project.base_dir, 'target', 'site.xml'), 'w') do |f|
+          f.write(writeSiteXml(info))
+        end
+        path("").include File.join(project.base_dir, 'target', 'site.xml')
+      end
+
+    end
+    
+    protected
+    
+    def find_feature_files
+      feature_files = []
+      unless @categories.nil? || @categories.empty?
+        feature_categories_map.keys.uniq.each do |feature|
+          [adapt_feature(feature)].flatten.each do |artifact|
+            artifact.invoke
+            feature_files << artifact
+          end
+        end
+      end
+      feature_files
+    end
+      
+  end
+
+  # Methods added to project to package a project as a site
+  #
+  module ActAsSite
+    include Extension
+
+    protected
+
+    # returns true if the project defines at least one site packaging.
+    # We keep this method protected and we will call it using send.
+    def is_packaging_site()
+      packages.each {|package| return true if package.is_a?(::Buildr4OSGi::SitePackaging)}
+      false
+    end
+
+    def package_as_site(file_name)
+      task = SiteTask.define_task(file_name)
+      task.extend SiteWriter
+      task.enhance do |siteTask|
+        siteTask.generateSite(project)
+      end
+      task
+    end
+
+    def package_as_site_spec(spec) #:nodoc:
+      spec.merge(:type=>:zip, :id => name.split(":").last)
+    end
+  end
+end
+
+module Buildr #:nodoc:
+  class Project #:nodoc:
+    include Buildr4OSGi::ActAsSite
+    
+  end
+end