filament 0.2.3 → 0.3.0

data/lib/filament.rb

@@ -1,7 +1,6 @@
 require 'pathname'
 require 'set'
 
-
 # rake stuff
 begin
   require 'rake'
@@ -19,16 +18,11 @@ end
 
 require 'rake/clean'
 
-require 'filament/workspace'
-require 'filament/platform'
-require 'filament/package'
-require 'filament/target'
-require 'filament/artifact'
-
-require 'filament/util/filelist2'
-require 'filament/util/fileutils'
-
 class Module
+  # creates a reader and a writer for the given attributes.
+  # both reader and writer are the same method. if the method
+  # is called without arguments, the current value is returned
+  # if it is called with a single arguemnt, the value is set.
   def attr_accessor2(*symbols)
 #    attr_writer(*symbols)
     symbols.each do |sym|
@@ -37,23 +31,57 @@ class Module
         if val.empty?
           return instance_variable_get(attr_sym)
         else
-          return instance_variable_set(attr_sym, val.first)
+          val = val.first if val.size == 1
+          return instance_variable_set(attr_sym, val)
         end
       end
     end
   end
+  
+  # temporarily intercepts a given method, evaluating the 
+  # given block
+  def intercept_method(method, temporary_result)
+    original_method = "#{Time.now.to_i}_#{method}"
+    alias_method original_method, method
+
+    # Not enough room for a ternary ;_;
+    t = if temporary_result.respond_to?(:to_proc)
+      temporary_result.to_proc
+    else
+      Proc.new { temporary_result }
+    end
+
+    define_method(method, t)
+    yield
+    alias_method method, original_method
+  end
+end
+
+require 'filament/workspace'
+require 'filament/os'
+require 'filament/package'
+require 'filament/target'
+
+require 'filament/util/filelist2'
+require 'filament/util/fileutils'
+
+def log(msg)
+  puts msg if $verbose
+end
+
+def verbose(on)
+  RakeFileUtils.verbose(false)
+  $verbose = on
 end
 
 module Filament
-  def log(msg)
-    puts msg if $verbose
-  end
-  
-  def verbose(on)
-    RakeFileUtils.verbose(false)
-    $verbose = on
+  class Task
+    def work(s)
+      d = @working_dir + '/' + s.to_s
+      directory d
+      return d
+    end
   end
-  
   class Application
     @@plugins = [] 
 
@@ -64,7 +92,7 @@ module Filament
     def initialize
       @cmd = CmdParse::CommandParser.new(true)
       @cmd.program_name = "filament"
-      @cmd.program_version = [0, 2, 3]
+      @cmd.program_version = [0, 3, 0]
       @cmd.add_command(CmdParse::HelpCommand.new)
       @cmd.add_command(CmdParse::VersionCommand.new)
       @cmd.options = CmdParse::OptionParserWrapper.new do |opt|
@@ -185,7 +213,3 @@ module Filament
     end
   end
 end
-
-include Filament::Platform
-include Filament
-

data/plugins/00util/lib/filament/plugins/util.rb

@@ -2,20 +2,20 @@ require 'cmdparse'
 require 'filament/plugin'
 
 module Filament::Plugins
-  class Util < Plugin
+  class Util < Filament::Plugin
     def initialize(app)
       app.subcommand('build', "Build the given targets") do |args|
-        targets = TargetList.new(*args)
+        targets = Filament::TargetList.new(*args)
         targets.each { |target| target.build }
       end
 
       app.subcommand('clobber', "Clobber the generated files for the given packages") do |args|
-        packages = PackageList.new(*args)
+        packages = Filament::PackageList.new(*args)
         packages.each { |package| package.clobber }
       end
 
       app.subcommand('execute', "Executes the target, if it is executable") do |args|
-        targets = TargetList.new(*args)
+        targets = Filament::TargetList.new(*args)
         targets.each do |target|
           target.build do
             block = target[:execute]
@@ -25,7 +25,7 @@ module Filament::Plugins
       end
       
       app.subcommand('targets', "Shows targets of given package") do |args|
-        packages =  PackageList.new(*args)
+        packages = Filament::PackageList.new(*args)
         packages.each do |package|
           puts "  #{package.full_name}"
           package.targets.each do |target|
@@ -35,7 +35,7 @@ module Filament::Plugins
       end
 
       app.subcommand('prereqs', "Shows prerequisites of given packages") do |args|
-        targets = TargetList.new(*args)
+        targets = Filament::TargetList.new(*args)
         targets.each do |target|
           puts "    #{target.uri}"
           target.deps.each do |dep|
@@ -45,7 +45,7 @@ module Filament::Plugins
       end
       
       app.subcommand('list', "Lists subpackages of given packages") do |args|
-        packages = PackageList.new(*args)
+        packages = Filament::PackageList.new(*args)
         packages.each do |package|
           package.list
         end

data/plugins/01java/lib/filament/java/mixins/classpath.rb

@@ -0,0 +1,11 @@
+module Filament::Java::Mixins
+  module Classpath
+    def flattened_deps_jars(include_weak=false)
+      return flattened_deps(include_weak).collect{|dep| dep[:jar]}.compact
+    end
+    
+  	def classpath
+  	  return @custom_classpath + flattened_deps_jars(true)
+    end
+  end
+end

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

@@ -1,5 +1,7 @@
 module Filament::Java::Tools
 	class Compile
+	  include Filament::Java::Tools
+	  
 		attr_writer :sources, :output_dir, :source_version, :target_version,
  			          :classpath, :bootclasspath
 
@@ -25,7 +27,7 @@ module Filament::Java::Tools
 	    bootclasspath = join_paths(@bootclasspath)
 	    output_dir = fix_paths(@output_dir)
 	    sources = fix_paths(@sources).join(' ')
-	    c = "#{JAVAC}"
+	    c = "#{java_bin('javac')}"
 	    c << " -classpath #{classpath}" unless @classpath.empty?
 	    c << " -bootclasspath #{bootclasspath}" unless @bootclasspath.empty?
 	    c << " -source #{@source_version}" unless @source_version.nil?

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

@@ -1,5 +1,7 @@
 module Filament::Java::Tools
 	class Execute
+	  include Filament::Java::Tools
+	  
 	  attr_writer :classpath, :properties, :mainclass, :args, :jar
 	  
 	  def initialize(mainclass=nil)
@@ -14,7 +16,7 @@ module Filament::Java::Tools
 	  end
 	  
 	  def execute
-	    c = "#{JAVA} "
+	    c = "#{java_bin('java')} "
 	    
 	    classpath = join_paths(@classpath)
 	    c << "-cp #{classpath} " unless @classpath.nil? or @classpath.empty?

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

@@ -1,5 +1,7 @@
 module Filament::Java::Tools
   class Jar
+    include Filament::Java::Tools
+	  
     attr_writer :jar_file, :base_dir, :manifest, :index, :update
     attr_accessor :package_files
     
@@ -19,7 +21,7 @@ module Filament::Java::Tools
     end
     
     def jar
-      c = "#{JAR} "
+      c = "#{java_bin('jar')} "
       c << 'v' if $verbose
       c << 'f'
       if @update
@@ -41,17 +43,19 @@ module Filament::Java::Tools
       end
     end
     
-    def self.extract(jar_file, output_dir)
-      cd output_dir do |dir|
-        if windows?
-          # using jar is too slow
-          c = "#{JAR} xf #{fix_paths(jar_file)}"
-          sys c
-        else
-          c = 'unzip '
-          c << '-q ' unless $verbose
-          c << "-o #{fix_paths(jar_file)}"
-          sys c
+    class << self
+      def extract(jar_file, output_dir)
+        cd output_dir do |dir|
+          if windows?
+            # using jar is too slow
+            c = "#{Filament::Java::Tools::java_bin('jar')} xf #{fix_paths(jar_file)}"
+            sys c
+          else
+            c = 'unzip '
+            c << '-q ' unless $verbose
+            c << "-o #{fix_paths(jar_file)}"
+            sys c
+          end
         end
       end
     end

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

@@ -8,6 +8,8 @@ module Filament::Java::Tools
   end
   
   class Proguard
+    include Filament::Java::Tools
+	  
     def initialize(injars=nil, outjars=nil)
       @options = []
       

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

@@ -2,24 +2,24 @@ require 'filament/platform'
 
 module Filament
   module Java
-	  module Tools
-		  def self.bin(path=nil)
-		    java_home_env = ENV['JAVA_HOME']
-		    unless java_home_env.nil?
-		      java_bin = "#{java_home_env}/bin"  
-		      return java_bin if path.nil?
-		      return Filament::Platform.to_exec_path("#{java_bin}/#{path}")
-		    else
-		      # assume it's in the path
-		      return path
-		    end
-		  end
-
-			JAVAC = Tools.bin('javac')
-			JAVA  = Tools.bin('java')
-			JAR   = Tools.bin('jar')
-		end  
-	end
+    module Tools
+      include Filament::OS
+      
+      def java_bin(path=nil)
+        java_home_env = ENV['JAVA_HOME']
+        unless java_home_env.nil?
+          java_bin = "#{java_home_env}/bin"  
+        return java_bin if path.nil?
+          return to_exec_path("#{java_bin}/#{path}")
+        else
+          # assume it's in the path
+          return path
+        end
+      end
+      
+      extend self
+    end
+  end
 end
 
 require 'filament/java/tools/jar'

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

@@ -1,7 +1,7 @@
 require 'filament/plugin'
 
 module Filament::Plugins
-  class Java < Plugin
+  class Java < Filament::Plugin
     def initialize(app)
       
     end

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

@@ -1,16 +1,79 @@
-require 'filament/javame/mixins/library_mixin'
-
-module Filament::JavaME
-  class Library < Filament::Artifact
-    include JavaME::Mixins::LibraryMixin
-    
-    def init
-      init_library
-    end
-    
-    def build_artifact
-      define_library(self)
-      invoke_tasks
-    end
-  end
-end
+require 'filament/java/mixins/classpath'
+require 'filament/javame/tasks/library_task'
+
+module Filament::JavaME
+  class Library < Filament::Target
+    include Filament::Java::Mixins::Classpath
+    
+    attr_accessor2 :obfuscate
+    
+    attr_writer :should_package_deps
+    attr_reader :srcs, :resources, :platform, :cldc_version
+    
+    def custom_entries(h)
+      @custom_entries.merge!(h)
+    end
+    
+    def append_entries(h)
+      h.keys.each do |key|
+        @append_entries[key] ||= []
+        entry = h[key]
+        if entry.is_a?(Array)
+          @append_entries[key] += entry
+        else
+          @append_entries[key] << entry
+        end
+      end
+    end
+
+    def init
+      @srcs = Filament::FileList2.new
+      @srcs.tag = :java
+      
+      @resources = Filament::FileList2.new
+      @should_package_deps = false
+      
+      @platform = Filament::JavaME::Tools.tags_for($target_platform)
+      @cldc_version = Filament::JavaME::Tools.cldc_version_for($target_platform)
+      @bootclasspath = Filament::JavaME::Tools.classpath_for($target_platform)
+      
+      @custom_classpath = []
+
+      @append_entries = {}
+      @custom_entries = {}
+    end
+    
+    def define
+      @library = Filament::JavaME::Tasks::LibraryTask.new do |l| 
+        define_library(l)
+      end
+      
+      output :tag => [:default, :jar], 
+       :output => @library.jar_path,
+       :deployable => true,
+       :tasks => @library.tasks
+             
+      output :tag => :jad_proc do |d|
+        d.append_entries(@append_entries)
+        d.custom_entries(@custom_entries)
+      end
+    end
+    
+    def define_library(l)
+      l.working_dir = working_dir
+      l.output_dir = output_dir
+      l.name = name
+      l.classpath = classpath
+      l.bootclasspath = @bootclasspath
+      l.srcs = @srcs
+      
+      l.resources = @resources + (@should_package_deps ? flattened_deps_jars : [])
+
+      l.task_deps << package.descriptor
+      
+      l.proguard_proc = Proc.new do |o|
+        flattened_deps.collect{|dep| dep[:proguard_proc]}.compact.each{|p| p.call(o)}
+      end
+    end
+  end
+end

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

@@ -1,16 +1,75 @@
-require 'filament/javame/mixins/suite_mixin'
-
-module Filament::JavaME
-  class Suite < Filament::Artifact
-    include JavaME::Mixins::SuiteMixin
-
-    def init
-      init_suite
-    end
-      
-    def build_artifact
-      define_suite(self)
-      invoke_tasks
-    end
-  end
-end
+require 'filament/javame/library'
+
+module Filament::JavaME
+  class Suite < Library
+    attr_accessor2 :defaultmidlet_class, 
+                   :suite_version, :suite_name, :suite_icon, :suite_vendor,
+                   :me_configuration, :me_profile
+    
+    # adds a midlet hash with keys :icon, :classname, and :name
+    def add_midlet(midlet)
+      if midlet == :default
+        midlet = { :classname => defaultmidlet_class,
+                   :icon => suite_icon,
+                   :name => suite_name }
+      end
+      
+      @midlets << midlet
+    end
+
+    def jad_proc(&block)
+      @jad_proc = block
+    end
+
+    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
+      
+      output :tag => :jad, 
+             :output => @library.jad_path, 
+             :deployable => true, 
+             :tasks => @library.tasks
+             
+      output :tag => :execute, 
+             :tasks => @library.tasks do
+        emulate
+      end
+    end
+
+    def define_library(l)
+      super(l)
+      
+      l.suite_version = @suite_version
+      l.suite_name = @suite_name
+      l.suite_icon = @suite_icon
+      l.suite_vendor = @suite_vendor
+      l.should_obfuscate = @should_obfuscate
+      l.midlets = @midlets
+      l.is_suite = true
+      
+      l.jad_proc = Proc.new do |d|
+        all_jad_procs.each {|p| p.call(d)}
+      end
+    end
+    
+    private
+    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