buildr-as3 0.1.7 → 0.1.8

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/buildr-as3.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{buildr-as3}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dominic Graefen"]
-  s.date = %q{2011-01-27}
+  s.date = %q{2011-02-01}
   s.description = %q{Build like you code - now supporting ActionScript 3 & Flex}
   s.email = %q{dominic @nospam@ devboy.org}
   s.extra_rdoc_files = [
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "buildr-as3.gemspec",
     "lib/buildr/as3.rb",
-    "lib/buildr/as3/alchemytk.rb",
+    "lib/buildr/as3/alchemy.rb",
     "lib/buildr/as3/apparat.rb",
     "lib/buildr/as3/compiler.rb",
     "lib/buildr/as3/doc.rb",

data/lib/buildr/as3.rb

@@ -23,5 +23,5 @@ require "#{File.dirname(__FILE__)}/as3/compiler"
 require "#{File.dirname(__FILE__)}/as3/packaging"
 require "#{File.dirname(__FILE__)}/as3/flexsdk"
 require "#{File.dirname(__FILE__)}/as3/doc"
-require "#{File.dirname(__FILE__)}/as3/alchemytk"
+require "#{File.dirname(__FILE__)}/as3/alchemy"
 require "#{File.dirname(__FILE__)}/as3/apparat"

data/lib/buildr/as3/{alchemytk.rb → alchemy.rb}

@@ -20,7 +20,7 @@
 # THE SOFTWARE.
 #
 module Buildr
-  module Compiler
+  module AS3
     class AlchemyToolkit
       
       attr_reader :home, :achacks, :gcc, :flex_sdk, :alchemy_setup, :bin
@@ -60,5 +60,59 @@ module Buildr
 
       end
     end
+
+    module Compiler
+      class AlcGcc < Buildr::Compiler::Base
+      specify :language => :c,
+              :sources => :c, :source_ext => :c,
+              :target => "bin", :target_ext => "swc",
+              :packaging => :swc
+
+      attr_reader :project
+
+      def initialize(project, options)
+        super
+        @project = project
+      end
+
+      include CompilerUtils
+
+      def compile(sources, target, dependencies)
+        alchemy_tk = options[:alchemytk]
+        flex_sdk = alchemy_tk.flex_sdk
+        output =  CompilerUtils::get_output(project,target,:swc,options)
+
+        # gcc stringecho.c -O3 -Wall -swc -o stringecho.swc
+        cmd_args = []
+        cmd_args << "gcc"
+        cmd_args << File.basename(options[:main])
+        cmd_args << "-O3 -Wall -swc"
+        cmd_args << "-o #{File.basename output}"
+
+        reserved = [:flexsdk,:main,:alchemytk]
+        options.to_hash.reject { |key, value| reserved.include?(key) }.
+            each do |key, value|
+              cmd_args << "-#{key}=#{value}"
+        end
+
+        unless Buildr.application.options.dryrun
+          ENV["ALCHEMY_HOME"]= alchemy_tk.home
+          ENV["ALCHEMY_VER"] = "0.4a"
+          ENV["PATH"] = "#{alchemy_tk.bin}:#{ENV["PATH"]}"
+          ENV["ASC"]="#{alchemy_tk.home}/bin/asc.jar"
+          ENV["SWFBRIDGE"]="#{alchemy_tk.home}/bin/swfbridge"
+          ENV["PATH"] = "#{alchemy_tk.achacks}:#{ENV["PATH"]}"
+          ENV["PATH"] = "#{ENV["PATH"]}:#{flex_sdk.bin}"
+          project_dir = Dir.getwd
+          Dir.chdir File.dirname options[:main]
+          system(cmd_args.join(" "))
+          File.copy( File.basename(output), output)
+          File.delete File.basename(output)
+          Dir.chdir project_dir
+        end
+      end
+    end
+    end
   end
 end
+Buildr::Compiler.compilers << Buildr::AS3::Compiler::AlcGcc

data/lib/buildr/as3/apparat.rb

@@ -20,9 +20,10 @@
 # THE SOFTWARE.
 #
 module Buildr
-  module BuildrAs3
+  module AS3
       class ApparatToolkit
-        attr_reader :home, :asmifier, :concrete, :coverage, :dump, :jitb, :reducer, :stripper, :tdsi, :asm_swc,
+        attr_reader :home, :asmifier, :concrete, :coverage, :dump,
+                    :jitb, :reducer, :stripper, :tdsi, :asm_swc,
                     :ersatz_swc, :lzma_decoder_swc
 
         def initialize(apparat_version,apparat_url)
@@ -55,7 +56,6 @@ module Buildr
         include Extension
 
         first_time do
-          # Define task not specific to any projet.
           Project.local_task('apparat_tdsi')
           Project.local_task('apparat_reducer')
         end
@@ -67,10 +67,7 @@ module Buildr
         end
 
         def apparat_tdsi(apparat_tk,options = {})
-          puts "aparat_tdsi"
-          main = compile.options[:main]
-          mainfile = File.basename(main, File.extname(main))
-          output =  (compile.options[:output] || "#{compile.target}/#{mainfile}.swf")
+          output = Buildr::AS3::Compiler::CompilerUtils::get_output(project,compile.target,compile.packaging,compile.options)
           cmd_args = []
           cmd_args << apparat_tk.tdsi
           cmd_args << "-i #{output}"
@@ -78,27 +75,24 @@ module Buildr
           reserved = []
           options.to_hash.reject { |key, value| reserved.include?(key) }.
             each do |key, value|
-              cmd_args << "-#{key}=#{value}"
+              cmd_args << "-#{key} #{value}"
           end
           system(cmd_args.join " ")
         end
 
         def apparat_reducer(apparat_tk,quality)
-          puts "aparat_reducer"
-          main = compile.options[:main]
-          mainfile = File.basename(main, File.extname(main))
-          output =  (compile.options[:output] || "#{compile.target}/#{mainfile}.swf")
+          output = Buildr::AS3::Compiler::CompilerUtils::get_output(project,compile.target,compile.packaging,compile.options)
           cmd_args = []
           cmd_args << apparat_tk.reducer
           cmd_args << "-i #{output}"
           cmd_args << "-o #{output}"
           cmd_args << "-q"
-          cmd_args << quality || 80
+          cmd_args << quality || 100
           system(cmd_args.join " ")
         end
       end
   end
   class Project
-    include Buildr::BuildrAs3::Apparat
+    include Buildr::AS3::Apparat
   end
 end

data/lib/buildr/as3/compiler.rb

@@ -20,371 +20,229 @@
 # THE SOFTWARE.
 #
 #TODO: Refactor compiler classes, right now everything is copy&paste
-module Buildr
-  module Compiler
-    module BuildInfo
-      def write_build_info_class( source_path, project )
-        file = File.join source_path, "org/devboy/buildras3/Build.as"
-        puts "Write Build Info Class:"+file
-        file_content =  "/**
- * Created by buildr-as3
- */
-package org.devboy.buildras3 {
-public class Build
-{
-    public static const PROJECT_NAME : String = '#{project.to_s}';
-    public static const PROJECT_GROUP : String = '#{project.group.to_s}';
-    public static const PROJECT_VERSION : String = '#{project.version.to_s}';
-    public static const BUILD_TIME : String = '#{Time.now.to_s}';
-}
-}"
-        File.open(file, 'w') {|f| f.write(file_content) }
-      end
-    end
-    module NeededTools
-      def is_output_outdated?(output,file_to_check)
-        return true unless File.exists? output
-        older(output,file_to_check)
-      end
-
-      def older(a,b) # a older than b
-#        puts "OLDER"
-#        puts a, timestamp_from_file(a)
-#        puts b, timestamp_from_file(b)
-        timestamp_from_file(a) < timestamp_from_file(b)
-      end
-
-      def timestamp_from_file(file)
-        File.directory?(file) ? get_last_modified(file) : File.mtime(file)
-      end
-
-      def get_last_modified(dir)
-        file_mtimes = []
-        dirs = Dir.new(dir).select { |file| file!= '.' && file!='..' && File.directory?(dir+"/"+file)==true }
-        dirs = dirs.collect { |subdir| dir+"/"+subdir }
-        dirs.each { |subdir| file_mtimes << get_last_modified(subdir) }
-        files = Dir.new(dir).select { |file| file!= '.' && file!='..' && File.directory?(dir+"/"+file)==false }
-        files = files.collect { |file| dir+'/'+file }
-        files.each { |file|
-          file_mtimes << File.mtime(file)
-#          puts "","checkFile:"
-#          puts File.mtime(file).to_s
-#          puts file.to_s, ""
-        }
-        file_mtimes.sort!
-        file_mtimes.reverse!
-        file_mtimes.length > 0 ? file_mtimes.first : Time.at(0)
-      end
-
-      def applies_to?(project, task) #:nodoc:
-          trace "applies_to?: false"
-          false
-      end
-    end
-    class Mxmlc < Base
-      specify :language => :actionscript,
-              :sources => [:as3, :mxml], :source_ext => [:as, :mxml],
-              :target => "bin", :target_ext => "swf",
-              :packaging => :swf
-
-      attr_reader :project
-
-      def initialize(project, options)
-        super
-        @project = project
-      end
-
 
-      include NeededTools
-      def needed?(sources, target, dependencies)
-        main = options[:main]
-        mainfile = File.basename(main, File.extname(main))
-        output =  (options[:output] || "#{target}/#{mainfile}.swf")
-        sources.each do |source|
-          if is_output_outdated?(output, source)
-#            puts "checkSource:" + source
-            puts "Recompile needed: Sources are newer than target"
-            return true
+module Buildr
+  module AS3
+    module Compiler
+      module CompilerUtils
+        def self.get_output( project, target, package, options )
+          return options[:output] if options.has_key? :output
+          return "#{target}/#{File.basename(options[:main].to_s, File.extname(options[:main].to_s))}.swf" if package == :swf
+          return "#{target}/#{project.name.gsub(":", "-")}.swc" if package == :swc
+          fail( "Could not guess output file.")
+        end
+
+        def needed?(sources, target, dependencies)
+          output =  CompilerUtils::get_output(project,target,project.compile.packaging,options)
+          sources.each do |source|
+            if is_output_outdated?(output, source)
+              puts "Recompile of #{project.name} needed: Sources are newer than target"
+              return true
+            end
           end
-        end
-        dependencies.each do |dependency|
-          if is_output_outdated?(output, dependency)
-            puts "Recompile needed: Dependencies are newer than target"
-            return true
+          dependencies.each do |dependency|
+            if is_output_outdated?(output, dependency)
+              puts "Recompile of #{project.name} needed: Dependencies are newer than target"
+              return true
+            end
           end
+          puts "Recompile of #{project.name} not needed."
+          false
         end
-        puts "Recompile not needed"
-        false
-      end
-
 
-      include BuildInfo
-      def compile(sources, target, dependencies)
-#        write_build_info_class sources[0], project
-        flex_sdk = options[:flexsdk]
-        main = options[:main]
-        mainfile = File.basename(main, File.extname(main))
-        output =  (options[:output] || "#{target}/#{mainfile}.swf")
+        def is_output_outdated?(output,file_to_check)
+          return true unless File.exists? output
+          older(output,file_to_check)
+        end
 
-        cmd_args = []
-        cmd_args << "-jar" << flex_sdk.mxmlc_jar
-        cmd_args << "+flexlib" << "#{flex_sdk.home}/frameworks"
-        cmd_args << main
-        cmd_args << "-output" << output
-        cmd_args << "-load-config" << flex_sdk.flex_config
-        cmd_args << "-source-path" << sources.join(" ")
-        cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
-        reserved = [:flexsdk,:main]
-        options.to_hash.reject { |key, value| reserved.include?(key) }.
-            each do |key, value|
-              cmd_args << "-#{key}=#{value}"
+        def older(a,b) # a older than b
+          timestamp_from_file(a) < timestamp_from_file(b)
         end
-        flex_sdk.default_options.each do |key, value|
-              cmd_args << "-#{key}=#{value}"
+
+        def timestamp_from_file(file)
+          File.directory?(file) ? get_last_modified(file) : File.mtime(file)
         end
 
-        unless Buildr.application.options.dryrun
-          Java::Commands.java cmd_args
+        def get_last_modified(dir)
+          file_mtimes = []
+          dirs = Dir.new(dir).select { |file| file!= '.' && file!='..' && File.directory?(dir+"/"+file)==true }
+          dirs = dirs.collect { |subdir| dir+"/"+subdir }
+          dirs.each { |subdir| file_mtimes << get_last_modified(subdir) }
+          files = Dir.new(dir).select { |file| file!= '.' && file!='..' && File.directory?(dir+"/"+file)==false }
+          files = files.collect { |file| dir+'/'+file }
+          files.each { |file| file_mtimes << File.mtime(file) }
+          file_mtimes.sort!
+          file_mtimes.reverse!
+          file_mtimes.length > 0 ? file_mtimes.first : Time.at(0)
         end
       end
-    end
-    class AirMxmlc < Base
-      specify :language => :actionscript,
-              :sources => [:as3, :mxml], :source_ext => [:as, :mxml],
-              :target => "bin", :target_ext => "swf",
-              :packaging => :swf
 
+      class Mxmlc < Buildr::Compiler::Base
+        specify :language => :actionscript,
+                :sources => [:as3, :mxml], :source_ext => [:as, :mxml],
+                :target => "bin", :target_ext => "swf",
+                :packaging => :swf
 
-      def initialize(project, options)
-        super
-      end
+        attr_reader :project
+
+        def initialize(project, options)
+          super
+          @project = project
+        end
+
+        include CompilerUtils
 
+        def compile(sources, target, dependencies)
+          flex_sdk = options[:flexsdk]
+          output =  CompilerUtils::get_output(project,target,:swf,options)
 
-      include NeededTools
-      def needed?(sources, target, dependencies)
-        main = options[:main]
-        mainfile = File.basename(main, File.extname(main))
-        output =  (options[:output] || "#{target}/#{mainfile}.swf")
-        sources.each do |source|
-          if is_output_outdated?(output, source)
-            puts "Recompile needed: Sources are newer than target"
-            return true
+          cmd_args = []
+          cmd_args << "-jar" << flex_sdk.mxmlc_jar
+          cmd_args << "+flexlib" << "#{flex_sdk.home}/frameworks"
+          cmd_args << options[:main]
+          cmd_args << "-output" << output
+          cmd_args << "-load-config" << flex_sdk.flex_config
+          cmd_args << "-source-path" << sources.join(" ")
+          cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
+          reserved = [:flexsdk,:main]
+          options.to_hash.reject { |key, value| reserved.include?(key) }.
+              each do |key, value|
+                cmd_args << "-#{key}=#{value}"
           end
-        end
-        dependencies.each do |dependency|
-          if is_output_outdated?(output, dependency)
-            puts "Recompile needed: Dependencies are newer than target"
-            return true
+          flex_sdk.default_options.each do |key, value|
+                cmd_args << "-#{key}=#{value}"
+          end
+
+          unless Buildr.application.options.dryrun
+            Java::Commands.java cmd_args
           end
         end
-        puts "Recompile not needed"
-        false
       end
 
-      def compile(sources, target, dependencies)
-        flex_sdk = options[:flexsdk]
-        main = options[:main]
-        mainfile = File.basename(main, File.extname(main))
-        output =  (options[:output] || "#{target}/#{mainfile}.swf")
+      class AirMxmlc < Buildr::Compiler::Base
 
-        cmd_args = []
-        cmd_args << "-jar" << flex_sdk.mxmlc_jar
-        cmd_args << "+flexlib" << "#{flex_sdk.home}/frameworks"
-        cmd_args << main
-        cmd_args << "-output" << output
-        cmd_args << "-load-config" << flex_sdk.air_config
-        cmd_args << "-source-path" << sources.join(" ")
-        cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
-        reserved = [:flexsdk,:main]
-        options.to_hash.reject { |key, value| reserved.include?(key) }.
-            each do |key, value|
-              cmd_args << "-#{key}=#{value}"
-        end
-        flex_sdk.default_options.each do |key, value|
-              cmd_args << "-#{key}=#{value}"
-        end
+        specify :language => :actionscript,
+                :sources => [:as3, :mxml], :source_ext => [:as, :mxml],
+                :target => "bin", :target_ext => "swf",
+                :packaging => :swf
 
-        unless Buildr.application.options.dryrun
-          Java::Commands.java cmd_args
-        end
-      end
-    end
-    class Compc < Base
-      specify :language => :actionscript,
-              :sources => [:as3, :mxml], :source_ext => [:as, :mxml],
-              :target => "bin", :target_ext => "swc",
-              :packaging => :swc
-      attr_reader :project
-      def initialize(project, options)
-        super
-        @project = project
-      end
-      include NeededTools
-      def needed?(sources, target, dependencies)
-        output =  (options[:output] || "#{target}/#{project.name.gsub(":", "-")}.swc")
-        sources.each do |source|
-          return true if is_output_outdated?(output,source)
-        end
-        dependencies.each do |dependency|
-          return true if is_output_outdated?(output,dependency)
-        end
-        puts "Recompile not needed"
-        false
-      end
+        attr_reader :project
 
-      def compile(sources, target, dependencies)
-#        write_build_info_class sources[0], project
-        flex_sdk = options[:flexsdk]
-        output =  (options[:output] || "#{target}/#{project.name.gsub(":", "-")}.swc")
-        cmd_args = []
-        cmd_args << "-jar" << flex_sdk.compc_jar
-        cmd_args << "-output" << output
-        cmd_args << "+flexlib" << "#{flex_sdk.home}/frameworks"
-        cmd_args << "-load-config" << flex_sdk.flex_config
-        cmd_args << "-include-sources" << sources.join(" ")
-        cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
-        reserved = [:flexsdk, :main]
-        options.to_hash.reject { |key, value| reserved.include?(key) }.
-            each do |key, value|
-              cmd_args << "-#{key}=#{value}"
-            end
-        flex_sdk.default_options.each do |key, value|
-              cmd_args << "-#{key}=#{value}"
+        def initialize(project, options)
+          super
+          @project = project
         end
 
-        unless Buildr.application.options.dryrun
-          Java::Commands.java cmd_args
-        end
-      end
-    end
-    class AirCompc < Base
-      specify :language => :actionscript,
-              :sources => [:as3, :mxml], :source_ext => [:as, :mxml],
-              :target => "bin", :target_ext => "swc",
-              :packaging => :swc
-      attr_reader :project
-      def initialize(project, options)
-        super
-        @project = project
-      end
-      include NeededTools
-      def needed?(sources, target, dependencies)
-        output =  (options[:output] || "#{target}/#{project.name.gsub(":", "-")}.swc")
-        sources.each do |source|
-          if is_output_outdated?(output, source)
-            puts "Recompile needed: Sources are newer than target"
-            return true
+        include CompilerUtils
+
+        def compile(sources, target, dependencies)
+          flex_sdk = options[:flexsdk]
+          output =  CompilerUtils::get_output(project,target,:swf,options)
+
+          cmd_args = []
+          cmd_args << "-jar" << flex_sdk.mxmlc_jar
+          cmd_args << "+flexlib" << "#{flex_sdk.home}/frameworks"
+          cmd_args << "+configname" << "air"
+          cmd_args << options[:main]
+          cmd_args << "-output" << output
+          cmd_args << "-load-config" << flex_sdk.air_config
+          cmd_args << "-source-path" << sources.join(" ")
+          cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
+          reserved = [:flexsdk,:main]
+          options.to_hash.reject { |key, value| reserved.include?(key) }.
+              each do |key, value|
+                cmd_args << "-#{key}=#{value}"
           end
-        end
-        dependencies.each do |dependency|
-          if is_output_outdated?(output, dependency)
-            puts "Recompile needed: Dependencies are newer than target"
-            return true
+          flex_sdk.default_options.each do |key, value|
+                cmd_args << "-#{key}=#{value}"
           end
-        end
-        false
-      end
 
-      def compile(sources, target, dependencies)
-        flex_sdk = options[:flexsdk]
-        output =  (options[:output] || "#{target}/#{project.to_s}.swc")
-        cmd_args = []
-        cmd_args << "-jar" << flex_sdk.compc_jar
-        cmd_args << "-output" << output
-        cmd_args << "-load-config" << flex_sdk.air_config
-        cmd_args << "+flexlib" << "#{flex_sdk.home}/frameworks"
-        cmd_args << "-include-sources" << sources.join(" ")
-        cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
-        reserved = [:flexsdk, :main]
-        options.to_hash.reject { |key, value| reserved.include?(key) }.
-            each do |key, value|
-              cmd_args << "-#{key}=#{value}"
-            end
-        flex_sdk.default_options.each do |key, value|
-              cmd_args << "-#{key}=#{value}"
-        end
-
-        unless Buildr.application.options.dryrun
-          Java::Commands.java cmd_args
+          unless Buildr.application.options.dryrun
+            Java::Commands.java cmd_args
+          end
         end
       end
-    end
-    class AlcGcc < Base
-      specify :language => :c,
-              :sources => :c, :source_ext => :c,
-              :target => "bin", :target_ext => "swc",
-              :packaging => :swc
-
-      attr_reader :project
-
-      def initialize(project, options)
-        super
-        @project = project
-      end
 
+      class Compc < Buildr::Compiler::Base
+        specify :language => :actionscript,
+                :sources => [:as3, :mxml], :source_ext => [:as, :mxml],
+                :target => "bin", :target_ext => "swc",
+                :packaging => :swc
+        attr_reader :project
+        def initialize(project, options)
+          super
+          @project = project
+        end
+
+        include CompilerUtils
+
+        def compile(sources, target, dependencies)
+          flex_sdk = options[:flexsdk]
+          output =  CompilerUtils::get_output(project,target,:swc,options)
+          cmd_args = []
+          cmd_args << "-jar" << flex_sdk.compc_jar
+          cmd_args << "-output" << output
+          cmd_args << "+flexlib" << "#{flex_sdk.home}/frameworks"
+          cmd_args << "-load-config" << flex_sdk.flex_config
+          cmd_args << "-include-sources" << sources.join(" ")
+          cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
+          reserved = [:flexsdk, :main]
+          options.to_hash.reject { |key, value| reserved.include?(key) }.
+              each do |key, value|
+                cmd_args << "-#{key}=#{value}"
+              end
+          flex_sdk.default_options.each do |key, value|
+                cmd_args << "-#{key}=#{value}"
+          end
 
-      include NeededTools
-      def needed?(sources, target, dependencies)
-        true
-#        main = options[:main]
-#        mainfile = File.basename(main, File.extname(main))
-#        output =  (options[:output] || "#{target}/#{mainfile}.swf")
-#        sources.each do |source|
-#          if is_output_outdated?(output, source)
-#            puts "Recompile needed: Sources are newer than target"
-#            return true
-#          end
-#        end
-#        dependencies.each do |dependency|
-#          if is_output_outdated?(output, dependency)
-#            puts "Recompile needed: Dependencies are newer than target"
-#            return true
-#          end
-#        end
-#        puts "Recompile not needed"
-#        false
+          unless Buildr.application.options.dryrun
+            Java::Commands.java cmd_args
+          end
+        end
       end
 
+      class AirCompc < Buildr::Compiler::Base
+        specify :language => :actionscript,
+                :sources => [:as3, :mxml], :source_ext => [:as, :mxml],
+                :target => "bin", :target_ext => "swc",
+                :packaging => :swc
+        attr_reader :project
+        def initialize(project, options)
+          super
+          @project = project
+        end
+
+        include CompilerUtils
+
+        def compile(sources, target, dependencies)
+          flex_sdk = options[:flexsdk]
+          output =  CompilerUtils::get_output(project,target,:swc,options)
+          cmd_args = []
+          cmd_args << "-jar" << flex_sdk.compc_jar
+          cmd_args << "-output" << output
+          cmd_args << "-load-config" << flex_sdk.air_config
+          cmd_args << "+flexlib" << "#{flex_sdk.home}/frameworks"
+          cmd_args << "+configname" << "air"
+          cmd_args << "-include-sources" << sources.join(" ")
+          cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
+          reserved = [:flexsdk, :main]
+          options.to_hash.reject { |key, value| reserved.include?(key) }.
+              each do |key, value|
+                cmd_args << "-#{key}=#{value}"
+              end
+          flex_sdk.default_options.each do |key, value|
+                cmd_args << "-#{key}=#{value}"
+          end
 
-      include BuildInfo
-      def compile(sources, target, dependencies)
-        alchemy_tk = options[:alchemytk]
-        flex_sdk = alchemy_tk.flex_sdk
-        output =  (options[:output] || "#{target}/#{project.name.gsub(":", "-")}.swc")
-
-        # gcc stringecho.c -O3 -Wall -swc -o stringecho.swc
-        cmd_args = []
-        cmd_args << "gcc"
-        cmd_args << File.basename(options[:main])
-        cmd_args << "-O3 -Wall -swc"
-        cmd_args << "-o #{File.basename output}"
-
-        reserved = [:flexsdk,:main,:alchemytk]
-        options.to_hash.reject { |key, value| reserved.include?(key) }.
-            each do |key, value|
-              cmd_args << "-#{key}=#{value}"
-        end
-
-        unless Buildr.application.options.dryrun
-          ENV["ALCHEMY_HOME"]= alchemy_tk.home
-          ENV["ALCHEMY_VER"] = "0.4a"
-          ENV["PATH"] = "#{alchemy_tk.bin}:#{ENV["PATH"]}"
-          ENV["ASC"]="#{alchemy_tk.home}/bin/asc.jar"
-          ENV["SWFBRIDGE"]="#{alchemy_tk.home}/bin/swfbridge"
-          ENV["PATH"] = "#{alchemy_tk.achacks}:#{ENV["PATH"]}"
-          ENV["PATH"] = "#{ENV["PATH"]}:#{flex_sdk.bin}"
-          project_dir = Dir.getwd
-          Dir.chdir File.dirname options[:main]
-          system(cmd_args.join(" "))
-          File.copy( File.basename(output), output)
-          Dir.chdir project_dir
+          unless Buildr.application.options.dryrun
+            Java::Commands.java cmd_args
+          end
         end
       end
     end
   end
 end
-Buildr::Compiler.compilers << Buildr::Compiler::Mxmlc
-Buildr::Compiler.compilers << Buildr::Compiler::Compc
-Buildr::Compiler.compilers << Buildr::Compiler::AirMxmlc
-Buildr::Compiler.compilers << Buildr::Compiler::AirCompc
-Buildr::Compiler.compilers << Buildr::Compiler::AlcGcc
+Buildr::Compiler.compilers << Buildr::AS3::Compiler::Mxmlc
+Buildr::Compiler.compilers << Buildr::AS3::Compiler::Compc
+Buildr::Compiler.compilers << Buildr::AS3::Compiler::AirMxmlc
+Buildr::Compiler.compilers << Buildr::AS3::Compiler::AirCompc

data/lib/buildr/as3/doc.rb

@@ -22,41 +22,44 @@
 require 'buildr/core/doc'
 
 module Buildr
-  module Doc
-    class Asdoc < Base
+  module AS3
+    module Doc
+      class Asdoc < Buildr::Doc::Base
 
-      specify :language => :actionscript, :source_ext => :as
+        specify :language => :actionscript,
+                :source_ext => :as
 
-      def generate(sources, target, options = {})
-        dependencies = project.compile.dependencies
-        sources = project.compile.sources
-        flex_sdk = options[:flexsdk]
-        output =  (options[:output] || "#{target}")
-        cmd_args = []
-        cmd_args << "-classpath" << "#{flex_sdk.home}/lib/xalan.jar"
-        cmd_args << "-classpath" << flex_sdk.asdoc_jar
-        cmd_args << "flex2.tools.ASDoc"
-        cmd_args << "+flexlib" << "#{flex_sdk.home}/frameworks"
-        cmd_args << "-load-config" << flex_sdk.flex_config
-        cmd_args << "-output" << output
-        cmd_args << "-source-path" << sources.join(" ")
-        cmd_args << "-doc-sources" << sources.join(" ")
-        cmd_args << "-templates-path" << flex_sdk.asdoc_templates
-        cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
-        reserved = [:flexsdk,:main,:classpath,:sourcepath]
-        options.to_hash.reject { |key, value| reserved.include?(key) }.
-            each do |key, value|
-              cmd_args << "-#{key}=#{value}"
-            end
-        flex_sdk.default_options.each do |key, value|
-              cmd_args << "-#{key}=#{value}"
-        end
-        unless Buildr.application.options.dryrun
-          Java::Commands.java cmd_args
+        def generate(sources, target, options = {})
+          dependencies = project.compile.dependencies
+          sources = project.compile.sources
+          flex_sdk = options[:flexsdk]
+          output =  (options[:output] || "#{target}")
+          cmd_args = []
+          cmd_args << "-classpath" << "#{flex_sdk.home}/lib/xalan.jar"
+          cmd_args << "-classpath" << flex_sdk.asdoc_jar
+          cmd_args << "flex2.tools.ASDoc"
+          cmd_args << "+flexlib" << "#{flex_sdk.home}/frameworks"
+          cmd_args << "-load-config" << flex_sdk.flex_config
+          cmd_args << "-output" << output
+          cmd_args << "-source-path" << sources.join(" ")
+          cmd_args << "-doc-sources" << sources.join(" ")
+          cmd_args << "-templates-path" << flex_sdk.asdoc_templates
+          cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
+          reserved = [:flexsdk,:main,:classpath,:sourcepath]
+          options.to_hash.reject { |key, value| reserved.include?(key) }.
+              each do |key, value|
+                cmd_args << "-#{key}=#{value}"
+              end
+          flex_sdk.default_options.each do |key, value|
+                cmd_args << "-#{key}=#{value}"
+          end
+          unless Buildr.application.options.dryrun
+            Java::Commands.java cmd_args
+          end
         end
       end
     end
   end
 end
 
-Buildr::Doc.engines << Buildr::Doc::Asdoc
+Buildr::Doc.engines << Buildr::AS3::Doc::Asdoc

data/lib/buildr/as3/flexsdk.rb

@@ -20,10 +20,11 @@
 # THE SOFTWARE.
 #
 module Buildr
-  module Compiler
+  module AS3
     class Flex4SDK
       
-      attr_reader :home, :mxmlc_jar, :compc_jar, :asdoc_jar, :fcsh_jar, :flex_config, :asdoc_templates, :default_options, :air_config, :bin
+      attr_reader :home, :mxmlc_jar, :compc_jar, :asdoc_jar, :fcsh_jar, :flex_config,
+                  :asdoc_templates, :default_options, :air_config, :bin
       
       attr_writer :flex_config, :air_config, :asdoc_templates
       
@@ -35,7 +36,6 @@ module Buildr
                 
         sdk_zip = Buildr::artifact("com.adobe.flex:sdk:zip:#{sdk_opts[:sdk_version]}").from(Buildr::download(sdk_opts[:sdk_url]))
         sdk_zip.invoke unless File.exists? sdk_zip.to_s
-        
         sdk_dir = File.join(File.dirname(sdk_zip.to_s), "sdk-#{sdk_opts[:sdk_version]}")
 
         unless File.exists? sdk_dir
@@ -53,7 +53,7 @@ module Buildr
         @air_config = "#{@home}/frameworks/air-config.xml"
         @bin = "#{@home}/bin"
       end
-      
+
       protected
 
       def generate_url(opts = {})

data/lib/buildr/as3/packaging.rb

@@ -19,15 +19,20 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #
-require 'buildr/packaging'
+require File.dirname(__FILE__)+"/compiler"
+require "buildr/packaging"
 require "ftools"
 module Buildr
-  module Packaging
-    module AS3
+  module AS3
+    module Packaging
       class SwcTask < Rake::FileTask
+
         include Extension
+        include Buildr::AS3::Compiler::CompilerUtils
+
         attr_writer :target_swc, :src_swc
         attr_reader :target_swc, :src_swc
+
         def initialize(*args) #:nodoc:
           super
           enhance do
@@ -35,23 +40,32 @@ module Buildr
             File.copy( src_swc, target_swc )
           end
         end
+
         def needed?
-          true
+          is_output_outdated? target_swc, src_swc
         end
+
         first_time do
           desc 'create swc package task'
           Project.local_task('package_swc')
         end
+
         before_define do |project|
           SwcTask.define_task('package_swc').tap do |package_swc|
             package_swc
           end
         end
+
       end
+
       class SwfTask < Rake::FileTask
+
         include Extension
+        include Buildr::AS3::Compiler::CompilerUtils
+
         attr_writer :target_swf, :src_swf
         attr_reader :target_swf, :src_swf
+
         def initialize(*args) #:nodoc:
           super
           enhance do
@@ -59,43 +73,53 @@ module Buildr
             File.copy( src_swf, target_swf )
           end
         end
+
         def needed?
-          true
+          is_output_outdated? target_swf, src_swf
         end
+
         first_time do
           desc 'create swf package task'
           Project.local_task('package_swf')
         end
+
         before_define do |project|
           SwfTask.define_task('package_swf').tap do |package_swf|
             package_swf
           end
         end
+
       end
+
       def package_swc(&block)
         task("package_swc").enhance &block
       end
+
       def package_swf(&block)
         task("package_swf").enhance &block
       end
+
       protected
+
       def package_as_swc(file_name)
+        fail("Package types don't match! :swc vs. :#{compile.packaging.to_s}") unless compile.packaging == :swc
         SwcTask.define_task(file_name).tap do |swc|
-          swc.src_swc = (compile.options[:output] || "#{compile.target}/#{project.name.gsub(":", "-")}.swc")
+          swc.src_swc = Buildr::AS3::Compiler::CompilerUtils::get_output(project,compile.target,:swc,compile.options)
           swc.target_swc = file_name
         end
       end
+
       def package_as_swf(file_name)
+       fail("Package types don't match! :swf vs. :#{compile.packaging.to_s}") unless compile.packaging == :swf
         SwfTask.define_task(file_name).tap do |swf|
-          main = compile.options[:main]
-          mainfile = File.basename(main, File.extname(main))
-          swf.src_swf =  (compile.options[:output] || "#{compile.target}/#{mainfile}.swf")
+          swf.src_swf =  Buildr::AS3::Compiler::CompilerUtils::get_output(project,compile.target,:swf,compile.options)
           swf.target_swf = file_name
         end
       end
+
     end
   end
 end
 class Buildr::Project
-  include Buildr::Packaging::AS3
+  include Buildr::AS3::Packaging
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: buildr-as3
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Dominic Graefen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 +01:00
+date: 2011-02-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,7 +112,7 @@ files:
 - VERSION
 - buildr-as3.gemspec
 - lib/buildr/as3.rb
-- lib/buildr/as3/alchemytk.rb
+- lib/buildr/as3/alchemy.rb
 - lib/buildr/as3/apparat.rb
 - lib/buildr/as3/compiler.rb
 - lib/buildr/as3/doc.rb