filament 0.1.0 → 0.1.1

data/lib/filament.rb

@@ -20,6 +20,22 @@ require 'filament/artifact'
 require 'filament/util/filelist2'
 require 'filament/util/fileutils'
 
+class Module
+  def attr_accessor2(*symbols)
+#    attr_writer(*symbols)
+    symbols.each do |sym|
+      attr_sym = "@#{sym.to_s}".to_sym
+      define_method(sym) do |*val|
+        if val.empty?
+          return instance_variable_get(attr_sym)
+        else
+          return instance_variable_set(attr_sym, val.first)
+        end
+      end
+    end
+  end
+end
+
 module Filament
   def log(msg)
     puts msg if $verbose

data/lib/filament/package.rb

@@ -17,6 +17,10 @@ module Filament
   end
   
   class Package
+    def target(name, klass, &block)
+      klass.new(name, &block)
+    end
+    
     attr_reader :parent, :name, :realpath, :workspace, :package_resolver, :target_resolver, :build_context
     alias :pathname :realpath
     
@@ -183,7 +187,9 @@ module Filament
     def subpackages(include_disabled = false)
       return [] unless parent?
 
-      children = @realpath.children.reject { |child| !child.directory? }
+      children = @realpath.children.reject do |child| 
+        not child.directory? or child.basename.to_s =~ /^\./
+      end
 
       children.collect! do |child|
         subpackage(child.basename.to_s)
@@ -268,7 +274,7 @@ module Filament
     end
   
     def descriptor
-      return "#{@realpath}/rakefile.rb"
+      return "#{@realpath}/package.rb"
     end
   
     def << (target)
@@ -286,7 +292,7 @@ module Filament
         raise "package descriptor for #{@realpath} does not exist '#{pn}'"
       end
       
-      @execution_context.wrap(pn.read, pn.realpath)
+      @execution_context.execute { instance_eval(pn.read, pn.realpath) }
     end
   
     def target_dir(subdir=nil)
@@ -296,8 +302,8 @@ module Filament
         pn += "#{subdir}/#{$build_dir_prefix}" 
       end
       
-      mkdir_p(pn) unless pn.exist?
-      return pn.realpath
+#       mkdir_p(pn) unless pn.exist?
+      return pn.to_s
     end
     
     def working_dir

data/lib/filament/target.rb

@@ -104,11 +104,10 @@ module Filament
       return if done?
       @invoked = true
       
-      puts ">>> BUILDING #{uri} (#{package.pathname}, #{self})"
-
       @package.execute do
         @weak_deps.each {|t| t.invoke}
         @deps.each {|t| t.invoke}
+        puts ">>> BUILDING #{uri} (#{@package.pathname}, #{self})"
         instance_eval(&@block)
       end
     end

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

@@ -25,4 +25,4 @@ end
 require 'filament/java/tools/jar'
 require 'filament/java/tools/execute'
 require 'filament/java/tools/compile'
-
+require 'filament/java/tools/proguard'

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

@@ -27,8 +27,7 @@ module Filament::Java::Tools
 	    sources = fix_paths(@sources).join(' ')
 	    c = "#{JAVAC}"
 	    c << " -classpath #{classpath}" unless @classpath.empty?
-	    c << " -bootclasspath #{bootclasspath}" \
-	      unless @bootclasspath.empty?
+	    c << " -bootclasspath #{bootclasspath}" unless @bootclasspath.empty?
 	    c << " -source #{@source_version}" unless @source_version.nil?
 	    c << " -target #{@target_version}" unless @target_version.nil?
   

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

@@ -1,25 +1,23 @@
 module Filament::Java::Tools
 	class Execute
-	  attr_writer :classpath, :properties, :mainclass, :args
+	  attr_writer :classpath, :properties, :mainclass, :args, :jar
 	  
 	  def initialize(mainclass=nil)
-	    init(mainclass)
-	    yield self if block_given?
-	    execute unless @mainclass.nil?
-	  end
-	  
-	  def init(mainclass)
 	    @mainclass = mainclass
+	    @jar = nil
 	    @properties = {}
 	    @classpath = []
 	    @args = []
+
+	    yield self if block_given?
+	    execute unless @mainclass.nil? and @jar.nil?
 	  end
 	  
 	  def execute
 	    c = "#{JAVA} "
 	    
 	    classpath = join_paths(@classpath)
-	    c << "-cp #{classpath} " unless classpath.nil?
+	    c << "-cp #{classpath} " unless @classpath.nil? or @classpath.empty?
 	    
 	    unless @properties.nil?
 	      @properties.each do |k,v|
@@ -27,11 +25,13 @@ module Filament::Java::Tools
 	      end
 	    end
 	    
-	    c << @mainclass << " "
+	    c << "-jar #{@jar} " unless @jar.nil?
+	    
+	    c << @mainclass << " " unless @mainclass.nil?
 	    
-	    c << @args.to_a.join
+	    c << @args.to_a.join(' ')
 	    
-	    sys c       
+	    sys c
 	  end
 	end
 end

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

@@ -0,0 +1,41 @@
+require 'tempfile'
+
+module Filament::Java::Tools
+  class << self
+    def proguard(injars=nil, outjars=nil, &block)
+      Proguard.new(injars, outjars, &block)
+    end
+  end
+  
+  class Proguard
+    def initialize(injars=nil, outjars=nil)
+      @options = []
+      
+      self.injars(injars) unless injars.nil?
+      self.outjars(outjars) unless outjars.nil?
+      
+      yield self if block_given?
+      
+      p self
+      obfuscate
+    end
+    
+    def obfuscate
+      tmp = Tempfile.open('options.pro')
+      @options.each do |option|
+        tmp.puts(option)
+      end
+      tmp.close
+
+      Execute.new do |e|
+        e.jar  = ENV['PROGUARD_HOME'] + '/lib/proguard.jar'
+        e.args = "@#{tmp.path}"
+      end
+    end
+    
+    def method_missing(msg, *args)
+      option = msg.to_s.gsub(/=/, '')
+      @options << "-#{option} #{args}"
+    end
+  end
+end

data/plugins/02javame/lib/filament/javame/mixins/library_mixin.rb

@@ -4,19 +4,18 @@ module Filament::JavaME::Mixins
   module LibraryMixin
     include Java::Mixins::JavaMixin
     
+    attr_accessor2 :obfuscate
+    
     attr_writer :package_deps
     attr_reader :srcs, :resources, :manifest, :platform, :cldc_version
     
-    def jar_path
-      return "#{output_dir}/#{@name}.jar"
-    end
-    
     def init_library
       init_java
       @srcs = FileList2.new
       @resources = FileList2.new
       @manifest = nil
       @package_deps = false
+      @obfuscate = false
       @platform = JavaME::Tools.tags_for($target_platform)
       @cldc_version = JavaME::Tools.cldc_version_for($target_platform)
       @bootclasspath = JavaME::Tools.classpath_for($target_platform)
@@ -51,10 +50,17 @@ module Filament::JavaME::Mixins
       end
     end
 
+    def jar_path
+      return "#{output_dir}/#{@name}.jar"
+    end
+    
     def define_library(target)
       compiled_dir = directory(:compiled)
+      obfuscated_dir = directory(:obfuscated)
       preverified_dir = directory(:preverified)
       package_dir = directory(:package)
+      proguard_dir = directory(:proguard)
+      proguard_preverified_dir = directory(:proguard_preverified)
       
       cp = classpath(target)
       # prune empty entries from src
@@ -92,7 +98,7 @@ module Filament::JavaME::Mixins
           end
           
           # preverify to the preverified directory
-          JavaME::Tools.preverify(compiled_dir, preverified_dir) do |j|
+          JavaME::Tools::preverify(compiled_dir, preverified_dir) do |j|
             j.cldc_version = @cldc_version
             j.classpath = cp + @bootclasspath
           end
@@ -106,7 +112,7 @@ module Filament::JavaME::Mixins
         package_files.each do |f|
           p = Pathname.new(f)
           
-          if p.extname == ".jar"
+          if p.extname == '.jar'
             Java::Tools::Jar.extract(f, package_dir)
           else
             cp_r_if(f, package_dir) { |p| !(p =~ /\.svn$/) }
@@ -117,14 +123,45 @@ module Filament::JavaME::Mixins
         exclude_files = FileList.new
         exclude_files.clear_exclude
         exclude_files.add("#{package_dir}/META-INF")
-        exclude_files.add("#{package_dir}/**/.svn")
         
         exclude_files.each do |file|
           rm_rf(file)
         end
         
-        Java::Tools::Jar.new(jar_path, FileList.new(package_dir)) do |jar|
-          jar.manifest = @manifest
+        # obfuscate, if necessary
+        if @obfuscate
+          Java::Tools::proguard(package_dir, proguard_dir) do |o|
+            (@classpath + @bootclasspath).each do |libraryjar|
+              o.libraryjars libraryjar
+            end
+            
+            target.flattened_deps.each do |dep|
+              b = dep[:proguard]
+              b.call(o) unless b.nil?
+            end
+            
+            o.defaultpackage "''"
+            o.dontusemixedcaseclassnames
+            o.allowaccessmodification
+            o.keep 'public class * extends javax.microedition.midlet.MIDlet'
+          end
+          
+          FileList.new("#{proguard_dir}/*").each do |f|
+            cp_r_if(f, proguard_preverified_dir) { |p| !(p =~ /\.class$/) }
+          end
+          
+          JavaME::Tools::preverify(proguard_dir, proguard_preverified_dir) do |j|
+            j.cldc_version = @cldc_version
+            j.classpath = cp + @bootclasspath
+          end
+
+          Java::Tools::Jar.new(jar_path, FileList.new(proguard_preverified_dir)) do |jar|
+            jar.manifest = @manifest
+          end
+        else
+          Java::Tools::Jar.new(jar_path, FileList.new(package_dir)) do |jar|
+            jar.manifest = @manifest
+          end
         end
       end
       

data/plugins/02javame/lib/filament/javame/mixins/suite_mixin.rb

@@ -1,22 +1,5 @@
 require 'filament/javame/mixins/library_mixin'
 
-class Module
-  def attr_accessor2(*symbols)
-#    attr_writer(*symbols)
-    symbols.each do |sym|
-      attr_sym = "@#{sym.to_s}".to_sym
-      define_method(sym) do |*val|
-        if val.empty?
-          return instance_variable_get(attr_sym)
-        else
-          return instance_variable_set(attr_sym, val.first)
-        end
-      end
-    end
-  end
-end
-
-
 module Filament::JavaME::Mixins
   module SuiteMixin
     include JavaME::Mixins::LibraryMixin
@@ -40,6 +23,7 @@ module Filament::JavaME::Mixins
       init_library
       @descriptor_config = Proc.new {}
       @package_deps = true
+      @obfuscate = true # TODO should be based on $build_type 
       @defaultmidlet_class = nil
       @midlets = []
       
@@ -63,10 +47,15 @@ module Filament::JavaME::Mixins
     def define_jad(target)
     	  # create a list for imported jad configs
     	  configs = []
+    	  
+    	  # start with this target
+    	  config = target[:jad_config] 
+    	  configs << config unless config.nil?
+    	  
     	  target.flattened_deps.each do |dep|
     	    # ask each dep for its contribution
-      	config = dep[:jad_config]
-      	configs << config unless config.nil?
+        	config = dep[:jad_config]
+        	configs << config unless config.nil?
     	  end
     	  
     	  full_config = Proc.new do |d|

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

@@ -6,6 +6,7 @@ module Filament::JavaME
 
     def init
       init_suite
+      @obfuscate = true # TODO should be based on $build_type 
     end
       
     def build_artifact

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

@@ -3,20 +3,9 @@ require 'filament/javame/tools/emulator'
 
 module Filament::JavaME::Tools
   module MppSdk
-    def self.home
-      mpp_home_env = ENV['MPP_SDK_HOME']
-      
-      return mpp_home_env unless mpp_home_env.nil?
-      
-      base_dir = "#{$workspace.realpath}/vendor/applications/mpp-sdk"
-      version = Pathname.new("#{base_dir}/VERSION").read.chomp
-      
-      return "#{base_dir}/#{version}"
-    end
-  
     class MppSdkEmulator < Emulator
       def run
-        cd MppSdk::home do |d|
+        cd ENV['MPP_SDK_HOME'] do |d|
           c = "java -jar player.jar #{@jad_path}"
           sys c
         end
@@ -27,7 +16,7 @@ module Filament::JavaME::Tools
     		def preverify
     			raise "MppSdkPreverifier only works on darwin" unless darwin?
     			
-    			c = "#{MppSdk::home}/osx/preverify/preverify"
+    			c = ENV['MPP_SDK_HOME'] + "/osx/preverify/preverify"
     			c << " -classpath #{join_paths(@classpath)}" unless @classpath.empty?
     			c << " -d #{fix_paths(@output_dir)}"
     			c << " -cldc1.0" if @cldc_version == 1.0

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

@@ -4,19 +4,8 @@ require 'filament/javame/tools/preverifier'
 
 module Filament::JavaME::Tools
   module Wtk
-    def self.home
-      wtk_home_env = ENV['WTK_HOME']
-      
-      return wtk_home_env unless wtk_home_env.nil?
-      
-      wtk_base = "#{$workspace.realpath}/vendor/applications/wtk"
-      
-      return "#{wtk_base}/windows/2.3" if windows?
-      return "#{wtk_base}/linux/2.2"
-    end
-    
     def self.bin(path=nil)
-      wtk_bin = home + '/bin'
+      wtk_bin = ENV['WTK_HOME'] + '/bin'
       return wtk_bin if path.nil?        
       return to_exec_path("#{wtk_bin}/#{path}")
     end
@@ -57,4 +46,4 @@ module Filament::JavaME::Tools
       end
     end
   end
-end
+end

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

@@ -38,6 +38,5 @@ module Filament::JavaME::Tools
 
       preverify unless @classes.nil? or @output_dir.nil?
     end
-
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: filament
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2006-03-14 00:00:00 -05:00
+  version: 0.1.1
+date: 2006-03-16 00:00:00 -05:00
 summary: A flexible dependency-based build platform based on Rake
 require_paths: 
 - lib
@@ -81,6 +81,7 @@ files:
 - plugins/01java/lib/filament/java/tools/compile.rb
 - plugins/01java/lib/filament/java/tools/execute.rb
 - plugins/01java/lib/filament/java/tools/jar.rb
+- plugins/01java/lib/filament/java/tools/proguard.rb
 - plugins/02javame/lib
 - plugins/02javame/lib/filament
 - plugins/02javame/lib/init.rb