filament 0.3.0 → 0.4.0

data/plugins/{02javame/lib/filament/javame → 01java/lib/filament/java}/tasks/library_task.rb

@@ -1,22 +1,34 @@
 require 'rake'
 
-module Filament::JavaME::Tasks
+class Rake::Task
+  def phase_h
+    @phase_h ||= Hash.new
+    return @phase_h
+  end
+end
+
+
+module Filament::Java::Tasks
   class LibraryTask < Filament::Task
     def initialize
       @bootclasspath = []
       @classpath = []
       @cldc_version = nil
       @defaultmidlet_class = nil
+      @doc_dir = nil
       @is_suite = false
       @jad_proc = Proc.new {}
+      @jvm_source_version = nil
+      @jvm_target_version = nil
       @me_configuration = 'CLDC-1.0'
       @me_profile = 'MIDP-2.0'
-      @midlets= []
+      @midlets = []
       @name = nil
       @output_dir = nil
       @proguard_proc = nil
       @resources = []
       @should_obfuscate = false # TODO should be based on $build_type
+      @should_preverify = false
       @srcs = []
       @suite_icon = nil
       @suite_name = nil
@@ -42,6 +54,10 @@ module Filament::JavaME::Tasks
       define
     end
     
+    def javadoc_dir
+      return doc_dir
+    end
+    
     def jar_path
       return "#{output_dir}/#{@name}.jar"  
     end
@@ -54,7 +70,6 @@ module Filament::JavaME::Tasks
       tasks = []
       tasks << @jar_task
       tasks << @jad_task if suite?
-      
       return tasks
     end
     
@@ -65,41 +80,70 @@ module Filament::JavaME::Tasks
     def verify
     end
     
+    def phase(name, task_deps, &block)
+      dir = work(name).to_s
+      
+      t = task(task_deps) do |t|
+        block.call(t, dir, t.phase_h)
+        t.phase_h[:last_dir] = dir
+      end
+      
+      task(t => dir)
+      
+      return t
+    end
+    
+    
     def define
       verify
       
       directory output_dir
-      compiled_dir    = work(:compiled)
-      preverified_dir = work(:preverified)
-      package_dir     = work(:package)
-      proguard_dir    = work(:proguard)
-      proguard_preverified_dir = work(:proguard_preverified)
+      
+      @jar_task = file(jar_path => [output_dir] + @resources + @task_deps + @srcs + @classpath + @bootclasspath)
       
       unless @srcs.empty?
-        task compiled_dir => @task_deps + @srcs + @classpath + @bootclasspath do
+        phase :compile, jar_path do |t, dir, h|
           # compile to the unverified directory
-          Filament::Java::Tools::Compile.new(@srcs, compiled_dir) do |c|
-            c.source_version = 1.2
-            c.target_version = 1.1
+          Filament::Java::Tools::Compile.new(@srcs, dir) do |c|
+            c.source_version = @jvm_source_version
+            c.target_version = @jvm_target_version
             c.classpath = @classpath
             c.bootclasspath = @bootclasspath
           end
         end
       
-        task preverified_dir => [compiled_dir] + @bootclasspath + @classpath do
-          # preverify to the preverified directory
-          Filament::JavaME::Tools::preverify(compiled_dir, preverified_dir) do |j|
-            j.cldc_version = @cldc_version
-            j.classpath = @classpath + @bootclasspath
+        # obfuscate, if necessary
+        if obfuscate?
+          phase :obfuscate, jar_path do |t, dir, h|
+            Filament::Java::Tools::proguard(h[:last_dir], dir) do |o|
+              (@classpath + @bootclasspath).each { |j| o.libraryjars j }
+
+              @proguard_proc.call(o) unless @proguard_proc.nil?
+
+              o.defaultpackage ''
+              o.dontusemixedcaseclassnames
+              o.allowaccessmodification
+              o.keep 'public class * extends javax.microedition.midlet.MIDlet'
+            end
+          end
+        end
+
+        if preverify?
+          phase :preverify, jar_path do |t, dir, h|
+            # preverify to the preverified directory
+            Filament::JavaME::Tools::preverify(h[:last_dir], dir) do |j|
+              j.cldc_version = @cldc_version
+              j.classpath = @classpath + @bootclasspath
+            end
           end
         end
       end
 
-      task package_dir => [preverified_dir] + @resources do
+      phase :jar, jar_path do |t, dir, h|
         package_files = FileList.new
         
         # package up verified classes
-        package_files.add("#{preverified_dir}/*")
+        package_files.add("#{h[:last_dir]}/*") if h.key?(:last_dir)
         
         # package up resources
         package_files.add(*@resources) unless @resources.empty?
@@ -107,51 +151,16 @@ module Filament::JavaME::Tasks
           p = Pathname.new(f)
           
           if p.extname == '.jar'
-            Filament::Java::Tools::Jar.extract(f, package_dir)
+            Filament::Java::Tools::Jar.extract(f, dir)
           else
-            Filament::cp_r_if(f, package_dir) { |p| !(p =~ /\.svn$/) }
-          end
-        end
-      end
-      
-      # obfuscate, if necessary
-      if obfuscate?
-        task proguard_dir => [package_dir] + @classpath + @bootclasspath do
-          Filament::Java::Tools::proguard(package_dir, proguard_dir) do |o|
-            (@classpath + @bootclasspath).each do |libraryjar|
-              o.libraryjars libraryjar
-            end
-          
-            @proguard_proc.call(o) unless @proguard_proc.nil?
-            
-            o.defaultpackage "''"
-            o.dontusemixedcaseclassnames
-            o.allowaccessmodification
-            o.keep 'public class * extends javax.microedition.midlet.MIDlet'
+            Filament::cp_r_if(f, dir) { |p| !(p =~ /\.svn$/) }
           end
         end
         
-        task proguard_preverified_dir => [proguard_dir] + @classpath + @bootclasspath do
-          FileList.new("#{proguard_dir}/*").each do |f|
-            cp_r_if(f, proguard_preverified_dir) { |p| !(p =~ /\.class$/) }
-          end
-        
-          Filament::JavaME::Tools::preverify(proguard_dir, proguard_preverified_dir) do |j|
-            j.cldc_version = @cldc_version
-            j.classpath = @classpath + @bootclasspath
-          end
-        end
-
-        @jar_task = file jar_path => [proguard_preverified_dir, output_dir] do |t|
-          Filament::Java::Tools::Jar.new(jar_path, FileList.new(proguard_preverified_dir))
-        end
-      else
-        @jar_task = file jar_path => [package_dir, output_dir] do |t|
-          Filament::Java::Tools::Jar.new(jar_path, FileList.new(package_dir))
-        end
+        Filament::Java::Tools::Jar.new(jar_path, FileList.new(dir))
       end
-
-      @jad_task = file jad_path => [@jar_task, output_dir] do |t|
+      
+      @jad_task = file jad_path => [jar_path, output_dir] do |t|
     	  full_config = Proc.new do |d|
     	    d.suite_version = @suite_version
     	    d.suite_name = @suite_name
@@ -182,9 +191,23 @@ module Filament::JavaME::Tasks
     end
 
     private
-
-    def obfuscate?
-      return @should_obfuscate
-    end
+    def preverify?; return @should_preverify; end
+    
+    def obfuscate?; return @should_obfuscate; end
   end
 end
+
+#         task javadoc_dir do
+#           Filament::Java::Tools::Javadoc.new do |d|
+#             d.windowtitle 'some window title'
+#             d.doctitle 'some doc title'
+#             d.bottom 'some footer text'
+#             d.sourcepath 'dir with sources'
+#             d.overview '/../../overview.html'
+#             d.d javadoc_dir
+#             d.use
+#             d.splitindex
+#           end
+#         end      
+#        # this sort of thing should be done for all major tasks, instead of using commands
+#         task :doc => javadoc_dir

data/plugins/01java/lib/filament/java/tools.rb

@@ -23,6 +23,7 @@ module Filament
 end
 
 require 'filament/java/tools/jar'
+require 'filament/java/tools/javadoc'
 require 'filament/java/tools/execute'
 require 'filament/java/tools/compile'
 require 'filament/java/tools/proguard'

data/plugins/01java/lib/filament/java/tools/compile.rb

@@ -8,7 +8,7 @@ module Filament::Java::Tools
      def initialize(sources=[], output_dir=nil)
 	    init(sources, output_dir)
       yield self if block_given?
-  	    compile unless @sources.empty? or @output_dir.nil?
+	    compile unless @sources.empty? or @output_dir.nil?
     end
       
 	  # loads initial, default values
@@ -32,7 +32,7 @@ module Filament::Java::Tools
 	    c << " -bootclasspath #{bootclasspath}" unless @bootclasspath.empty?
 	    c << " -source #{@source_version}" unless @source_version.nil?
 	    c << " -target #{@target_version}" unless @target_version.nil?
-  
+      c << " -Xlint:unchecked" if $verbose
 	    c << " -d #{output_dir}"
 	    c << " #{sources}"
 			

data/plugins/01java/lib/filament/java/tools/execute.rb

@@ -2,24 +2,29 @@ module Filament::Java::Tools
 	class Execute
 	  include Filament::Java::Tools
 	  
-	  attr_writer :classpath, :properties, :mainclass, :args, :jar
+	  attr_writer :classpath, :properties, :main_class, :args, :jar
 	  
-	  def initialize(mainclass=nil)
-	    @mainclass = mainclass
+	  def initialize(main_class=nil)
+	    @main_class = main_class
 	    @jar = nil
 	    @properties = {}
 	    @classpath = []
 	    @args = []
 
 	    yield self if block_given?
-	    execute unless @mainclass.nil? and @jar.nil?
+	    execute unless @main_class.nil? and @jar.nil?
 	  end
 	  
 	  def execute
 	    c = "#{java_bin('java')} "
 	    
-	    classpath = join_paths(@classpath)
-	    c << "-cp #{classpath} " unless @classpath.nil? or @classpath.empty?
+	    classpath = @classpath
+	    unless @main_class.nil?
+	      classpath << @jar
+	    end
+	    classpath = join_paths(classpath)	    
+	    
+	    c << "-cp #{classpath} " unless classpath.nil? or classpath.empty?
 	    
 	    unless @properties.nil?
 	      @properties.each do |k,v|
@@ -27,9 +32,11 @@ module Filament::Java::Tools
 	      end
 	    end
 	    
-	    c << "-jar #{@jar} " unless @jar.nil?
-	    
-	    c << @mainclass << " " unless @mainclass.nil?
+	    if @main_class.nil?
+  	      c << "-jar #{fix_paths(@jar)} " unless @jar.nil?  	    
+ 	    else 	    
+	      c << @main_class << " " 
+        end
 	    
 	    c << @args.to_a.join(' ')
 	    

data/plugins/01java/lib/filament/java/tools/jar.rb

@@ -46,7 +46,7 @@ module Filament::Java::Tools
     class << self
       def extract(jar_file, output_dir)
         cd output_dir do |dir|
-          if windows?
+          if not cygwin? and windows?
             # using jar is too slow
             c = "#{Filament::Java::Tools::java_bin('jar')} xf #{fix_paths(jar_file)}"
             sys c

data/plugins/01java/lib/filament/java/tools/javadoc.rb

@@ -0,0 +1,22 @@
+module Filament::Java::Tools
+  class Javadoc
+    include Filament::Java::Tools
+    
+    def initialize()
+      @options = []
+      
+      yield self if block_given?
+      
+      javadoc
+    end
+    
+    def javadoc
+      system "#{java_bin('javadoc')} #{@options.join(' ')}"
+    end
+    
+    def method_missing(msg, *args)
+      option = msg.to_s.gsub(/=/, '')
+      @options << "-#{option} #{args}"
+    end
+  end
+end

data/plugins/01java/lib/filament/java/tools/proguard.rb

@@ -37,6 +37,7 @@ module Filament::Java::Tools
     
     def method_missing(msg, *args)
       option = msg.to_s.gsub(/=/, '')
+      args = ["''"] if args == ['']
       @options << "-#{option} #{args}"
     end
   end

data/plugins/{02javame → 01java}/lib/filament/javame/suite.rb

@@ -1,7 +1,7 @@
-require 'filament/javame/library'
+require 'filament/java/library'
 
 module Filament::JavaME
-  class Suite < Library
+  class Suite < Filament::Java::Library
     attr_accessor2 :defaultmidlet_class, 
                    :suite_version, :suite_name, :suite_icon, :suite_vendor,
                    :me_configuration, :me_profile
@@ -23,23 +23,23 @@ module Filament::JavaME
 
     def init
       super
+      
       @jad_proc = Proc.new {}
       @should_package_deps = true
       @should_obfuscate = false # TODO should be based on $build_type 
       @midlets = []
-    end
     
-    def define
-      super
+      on_define do
+        assert_tag :javame
       
-      output :tag => :jad, 
-             :output => @library.jad_path, 
-             :deployable => true, 
-             :tasks => @library.tasks
-             
-      output :tag => :execute, 
-             :tasks => @library.tasks do
-        emulate
+        task :execute => :build do
+          emulate
+        end
+    
+        output :tag => :jad, 
+               :output => @library.jad_path, 
+               :deployable => true, 
+               :tasks => @library.tasks
       end
     end
 
@@ -55,7 +55,13 @@ module Filament::JavaME
       l.is_suite = true
       
       l.jad_proc = Proc.new do |d|
-        all_jad_procs.each {|p| p.call(d)}
+        collect_outputs(:append_entries).each do |h|
+          d.append_entries(h)
+        end
+        
+        collect_outputs(:custom_entries).each do |h|
+          d.custom_entries(h)
+        end
       end
     end
     
@@ -63,13 +69,5 @@ module Filament::JavaME
     def emulate(midletclass=@defaultmidlet_class)
       Filament::JavaME::Tools::emulate(@library.jad_path, midletclass)
     end
-    
-    def all_jad_procs
-      configs = flattened_deps.collect{|dep| dep[:jad_proc]}
-  	  configs << self[:jad_proc]
-  	  configs << @jad_proc
-  	  # create a list for imported jad configs
-  	  return configs.compact
-    end
   end
 end

data/plugins/{02javame → 01java}/lib/filament/javame/tasks.rb

@@ -2,5 +2,4 @@ require 'pathname'
 require 'filament/java/tools'
 
 require 'filament/javame/tools'
-require 'filament/javame/library'
 require 'filament/javame/suite'

data/plugins/{02javame → 01java}/lib/filament/javame/tools.rb

@@ -2,7 +2,6 @@ module Filament::JavaME
   module Tools; end
 end
 
-require 'filament/javame/tools/platform'
 require 'filament/javame/tools/descriptor'
 require 'filament/javame/tools/external/wtk'
 require 'filament/javame/tools/external/mpp_sdk'

data/plugins/{02javame → 01java}/lib/filament/javame/tools/descriptor.rb

@@ -56,8 +56,8 @@ module Filament::JavaME::Tools
     end
     
     def to_s(h = {})
-      raise "me_profile must be set!" if self.me_profile.nil?
-      raise "me_configuration must be set!" if self.me_configuration.nil?
+#      raise "me_profile must be set!" if self.me_profile.nil?
+#      raise "me_configuration must be set!" if self.me_configuration.nil?
 
       s = ""
       
@@ -88,19 +88,24 @@ module Filament::JavaME::Tools
     end
     
     def append_entries(h)
-      delim = h[:delim] || ', '
+      delim = h.delete(:delim) || ', '
+      
+      h2 = {}
       h.keys.each do |key|
         value = h[key]
+        
         if value.is_a?(Array)
           value = value.join(delim)
         end
+
+        key = key.to_sym
         if @entries.key?(key)
-          h[key] = @entries[key] + delim + value 
+          h2[key] = @entries[key] + delim + value 
         else
-          h[key] = value
+          h2[key] = value
         end          
       end
-      custom_entries(h)
+      custom_entries(h2)
     end
     
     def custom(name, value=nil, symbol=nil)
@@ -124,7 +129,7 @@ module Filament::JavaME::Tools
     end
   end
 
-  class << self    
+  class << self
     def write_jad(*args, &block)
       Descriptor.new(*args) do |d|
         block.call(d)
@@ -132,6 +137,13 @@ module Filament::JavaME::Tools
       end
     end
     
+    def write_properties(*args, &block)
+      Descriptor.new(*args) do |d|
+        block.call(d)
+        d.write
+      end
+    end
+    
     def write_manifest(*args, &block)
       Descriptor.new(*args) do |d|
         block.call(d)