filament 0.2.3 → 0.3.0

data/plugins/02javame/lib/filament/javame/tasks/library_task.rb

@@ -0,0 +1,190 @@
+require 'rake'
+
+module Filament::JavaME::Tasks
+  class LibraryTask < Filament::Task
+    def initialize
+      @bootclasspath = []
+      @classpath = []
+      @cldc_version = nil
+      @defaultmidlet_class = nil
+      @is_suite = false
+      @jad_proc = Proc.new {}
+      @me_configuration = 'CLDC-1.0'
+      @me_profile = 'MIDP-2.0'
+      @midlets= []
+      @name = nil
+      @output_dir = nil
+      @proguard_proc = nil
+      @resources = []
+      @should_obfuscate = false # TODO should be based on $build_type
+      @srcs = []
+      @suite_icon = nil
+      @suite_name = nil
+      @suite_vendor = nil
+      @suite_version = nil
+      @task_deps = []
+      @working_dir = nil
+
+      instance_variables.each do |var_sym|
+        attr_name = var_sym.gsub(/^@/,'')
+
+        self.class.send(:define_method, attr_name.to_sym) do
+          instance_variable_get(var_sym)
+        end
+        
+        self.class.send(:define_method, "#{attr_name}=".to_sym) do |value|
+          instance_variable_set(var_sym, value)
+        end
+      end
+      
+      yield self if block_given?
+      
+      define
+    end
+    
+    def jar_path
+      return "#{output_dir}/#{@name}.jar"  
+    end
+    
+    def jad_path
+      return "#{output_dir}/#{name}.jad"
+    end
+    
+    def tasks
+      tasks = []
+      tasks << @jar_task
+      tasks << @jad_task if suite?
+      
+      return tasks
+    end
+    
+    def invoke
+      tasks.each{|t| t.invoke}
+    end
+    
+    def verify
+    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)
+      
+      unless @srcs.empty?
+        task compiled_dir => @task_deps + @srcs + @classpath + @bootclasspath do
+          # 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
+            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
+          end
+        end
+      end
+
+      task package_dir => [preverified_dir] + @resources do
+        package_files = FileList.new
+        
+        # package up verified classes
+        package_files.add("#{preverified_dir}/*")
+        
+        # package up resources
+        package_files.add(*@resources) unless @resources.empty?
+        package_files.each do |f|
+          p = Pathname.new(f)
+          
+          if p.extname == '.jar'
+            Filament::Java::Tools::Jar.extract(f, package_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'
+          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
+      end
+
+      @jad_task = file jad_path => [@jar_task, output_dir] do |t|
+    	  full_config = Proc.new do |d|
+    	    d.suite_version = @suite_version
+    	    d.suite_name = @suite_name
+    	    d.suite_icon = @suite_icon
+    	    d.suite_vendor = @suite_vendor
+    	    d.me_configuration = @me_configuration
+    	    d.me_profile = @me_profile
+
+    	    @midlets.each {|midlet| d.add_midlet(midlet)}
+
+    	    @jad_proc.call(d)
+        end
+
+        manifest_path = "#{working_dir}/MANIFEST.MF"
+        Filament::JavaME::Tools::write_manifest(manifest_path, &full_config)
+
+        Filament::Java::Tools::Jar.new(jar_path) do |jar|
+          jar.update = true
+          jar.manifest = manifest_path
+        end
+
+        Filament::JavaME::Tools::write_jad(jad_path, jar_path, &full_config)
+      end
+    end
+  
+    def suite?
+      return @is_suite
+    end
+
+    private
+
+    def obfuscate?
+      return @should_obfuscate
+    end
+  end
+end

data/plugins/02javame/lib/filament/javame/tools/emulator.rb

@@ -1,5 +1,5 @@
 require 'filament/javame/tools'
-require 'filament/javame/platform'
+require 'filament/javame/tools/platform'
 
 module Filament::JavaME::Tools
   class << self

data/plugins/02javame/lib/filament/javame/tools/external/mpp_sdk.rb

@@ -1,4 +1,3 @@
-require 'filament/javame/platform'
 require 'filament/javame/tools/emulator'
 
 module Filament::JavaME::Tools

data/plugins/02javame/lib/filament/javame/tools/external/wtk.rb

@@ -1,4 +1,3 @@
-require 'filament/javame/platform'
 require 'filament/javame/tools/emulator'
 require 'filament/javame/tools/preverifier'
 

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

@@ -7,23 +7,24 @@ module Filament::JavaME
     
     class << self
       def platform(model)
-        p = TARGET_PLATFORMS[model]
-        raise "Unknown target platform #{model}" if p.nil?
+        p = Filament::Platform.find(:name => model)
+        raise "Unknown target platform: #{model}" if p.nil? 
+        raise "Not a JavaME platform: #{p.inspect}, #{p.tags.inspect}" unless p.tags.include?(:javame)
         return p
       end
       
       def tags_for(model)
-        return platform(model)[:tags].clone
+        return platform(model).tags.clone
       end
       
       def cldc_version_for(model)
-        return platform(model)[:cldc_version]
+        return platform(model).javame_configuration_version
       end
 
       def classpath_for(model)
         cldc_version = cldc_version_for(model)
         
-        base_classpath = platform(model)[:classpath]
+        base_classpath = platform(model).classpath
 
         classpath = []
         classpath += base_classpath unless base_classpath.nil?

data/plugins/02javame/lib/filament/javame/tools/preverifier.rb

@@ -1,4 +1,4 @@
-require 'filament/javame/platform'
+require 'filament/javame/tools/platform'
 
 module Filament::JavaME::Tools
   class << self

data/plugins/02javame/lib/filament/javame/tools.rb

@@ -2,7 +2,7 @@ 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/lib/init.rb

@@ -1,27 +1,14 @@
 require 'pathname'
 
-require 'filament/platform'
+require 'filament/os'
 
-module Filament::JavaME
-  HOME = Pathname.new(__FILE__).parent.parent.realpath
-end
 require 'filament/javame/tools'
 require 'filament/javame/tasks'
 
-def default_emulator
-  return :MppSdk if darwin?
-  return :Wtk
-end
+include Filament::OS
 
-def default_preverifier
-  return :MppSdk if darwin?
-  return :Wtk
-end
+emulator = ENV['JAVAME_EMULATOR'] || :MppSdk
+Filament::JavaME::Tools::Emulator::set_type(emulator.to_sym)
 
-module Filament::JavaME
-  emulator = ENV['JAVAME_EMULATOR'] || default_emulator
-  Tools::Emulator::set_type(emulator.to_sym)
-
-  preverifier = ENV['JAVAME_PREVERIFIER'] || default_preverifier
-  Tools::Preverifier::set_type(preverifier.to_sym)
-end
+preverifier = ENV['JAVAME_PREVERIFIER'] || darwin? ? :MppSdk : :Wtk
+Filament::JavaME::Tools::Preverifier::set_type(preverifier.to_sym)

data/plugins/04spin/lib/filament/spin/sji.rb

@@ -0,0 +1,36 @@
+require 'yaml'
+require 'filament/java/mixins/classpath'
+require 'filament/spin/tasks/sji_task'
+
+module Filament::Spin
+  class SJI < Filament::Target
+    include Filament::Java::Mixins::Classpath
+    
+    attr_reader :srcs
+    attr_accessor2 :java_gen_package
+    
+    def init
+      @srcs = Filament::FileList2.new
+    end
+    
+    def define
+      @sji = Filament::Spin::Tasks::SJITask.new do |sji|
+        define_sji(sji)
+      end
+      
+      output :tag => :java, :output => @sji.java_files, :tasks => @sji.tasks
+      output :tag => :spin, :output => @sji.spin_files, :tasks => @sji.tasks
+      output :tag => :jad_proc do |d|
+        d.append_entries('spin.bindings' => @sji.bindings.collect {|binding| "#{binding.keys}: #{binding.values}"}.join(';'))
+      end
+    end
+    
+    def define_sji(sji)
+      sji.working_dir = working_dir
+      sji.srcs = srcs
+      sji.java_gen_package = @java_gen_package
+      sji.java_gen_dir = working_dir(:java_gen)
+      sji.spin_gen_dir = working_dir(:spin_gen)
+    end
+  end
+end

data/plugins/04spin/lib/filament/spin/tasks/sji_task.rb

@@ -0,0 +1,86 @@
+require 'filament/javame/tasks/library_task'
+require 'spin/sji'
+require 'rake'
+
+module Filament::Spin
+  module Tasks
+    class SJITask < Filament::Task
+      attr_accessor :java_gen_package, :working_dir, :java_gen_dir, :spin_gen_dir, :srcs
+
+      attr_reader :sji, :bindings
+    
+      def initialize
+        @srcs = []
+        @sji = nil
+        @working_dir = nil
+        
+        @java_gen_dir = nil
+        @spin_gen_dir = nil
+        
+        @java_gen_package = nil
+      
+        @bindings = []
+        
+        @spin_gen_dir = nil
+        @java_gen_dir = nil
+      
+        yield self if block_given?
+
+        define
+      end
+    
+      def verify
+        raise 'java_gen_package must be set' if @java_gen_package.nil?
+        
+        raise 'spin_gen_dir must be set' if @spin_gen_dir.nil?
+        raise 'java_gen_dir must be set' if @java_gen_dir.nil?
+        raise 'working_dir must be set' if @working_dir.nil?
+      
+        raise 'srcs must not be empty' if @srcs.empty?
+      end
+    
+      def tasks
+        return [@gen_spin_task, @gen_java_task]
+      end
+      
+      def java_files
+        return @gen_java_files
+      end
+      
+      def spin_files
+        return @gen_spin_files
+      end
+      
+      def define
+        verify
+      
+        @sji = Spin::SpinJavaInterface.new
+      
+        srcs.each do |src|
+          @sji.load(src)
+        end
+        
+        impls = []
+        
+        @sji.prototypes.each do |prototype| 
+          impls << s = Spin::JavaMethodImpl.new(prototype)
+          s.java_impl_package = @java_gen_package
+          @bindings << { (prototype.anonymous? ? '' : prototype.name) => s.full_class_name }
+        end
+
+        @gen_spin_files = impls.collect{|impl| impl.spin_file(spin_gen_dir)}
+        @gen_java_files = impls.collect{|impl| impl.java_file(java_gen_dir)}
+
+        directory spin_gen_dir
+        @gen_spin_task = task spin_gen_dir => srcs do
+          impls.each{|impl| impl.write_spin(spin_gen_dir)}
+        end
+      
+        directory java_gen_dir
+        @gen_java_task = task java_gen_dir => srcs do
+          impls.each{|impl| impl.write_java(java_gen_dir)}
+        end
+      end
+    end
+  end
+end

data/plugins/04spin/lib/init.rb

@@ -0,0 +1,4 @@
+require 'filament/spin/sji'
+
+module Filament::Spin
+end