buildr-as3 0.1.18 → 0.1.19

data/README.rdoc

@@ -4,9 +4,17 @@
 
 = Changelog
 
+== 0.1.19
+
+* [FEATURE] compile.with now works with directories, which allows to use other as3-source-folders to be referenced in your project.
+
+== 0.1.18
+
+* [FIXED] Fixed a bug in as3:fdt4:generate, which would overwrite files with a symlink to itself.
+
 == 0.1.17
 
-* [FXIED] Actually no files were updated in version 0.1.16 because of a git hick-up, now the changes meant for 0.1.16 are applied in 0.1.17.
+* [FIXED] Actually no files were updated in version 0.1.16 because of a git hick-up, now the changes meant for 0.1.16 are applied in 0.1.17.
 
 == 0.1.16
 

data/VERSION

@@ -1 +1 @@
-0.1.18
+0.1.19

data/buildr-as3.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{buildr-as3}
-  s.version = "0.1.18"
+  s.version = "0.1.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dominic Graefen"]
-  s.date = %q{2011-02-10}
+  s.date = %q{2011-02-20}
   s.description = %q{Build like you code - now supporting ActionScript 3 & Flex}
   s.email = %q{dominic @nospam@ devboy.org}
   s.extra_rdoc_files = [

data/lib/buildr/as3/alchemy.rb

@@ -40,12 +40,6 @@ module Buildr
         def invoke
           @url ||= get_alchemy_toolkit_url(@system)
 
-#          if @url
-#            Buildr.artifact(@spec).from(Buildr.download(@url)).invoke unless File.exists? @alchemy_zip.to_s
-#          else
-#            Buildr.artifact(@spec).invoke unless File.exists? @alchemy_zip.to_s
-#          end
-
           if Buildr::Util.win_os?
             unless File.exists? @alchemy_zip.to_s
               FileUtils.mkdir_p File.dirname(@alchemy_zip.to_s) unless File.directory? File.dirname(@alchemy_zip.to_s)

data/lib/buildr/as3/compiler.rb

@@ -75,6 +75,15 @@ module Buildr
           file_mtimes.reverse!
           file_mtimes.length > 0 ? file_mtimes.first : Time.at(0)
         end
+
+        def move_dependency_dirs_to_source( sources, dependencies )
+          dependencies.each do |dependency|
+            if File.directory? dependency
+              dependencies.delete dependency
+              sources << dependency
+            end
+          end
+        end
       end
 
       class Mxmlc < Buildr::Compiler::Base
@@ -95,14 +104,15 @@ module Buildr
         def compile(sources, target, dependencies)
           flex_sdk = options[:flexsdk].invoke
           output = CompilerUtils::get_output(project, target, :swf, options)
-
+          move_dependency_dirs_to_source( sources, dependencies)
           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(" ")
+          sources.each {|source| cmd_args << "-source-path+=#{source}"}
+#          cmd_args << "-source-path" << sources.join(" ")
           cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
           options[:debug] = Buildr.options.debug.to_s
           reserved = [:flexsdk, :main, :apparat]
@@ -139,7 +149,7 @@ module Buildr
         def compile(sources, target, dependencies)
           flex_sdk = options[:flexsdk].invoke
           output = CompilerUtils::get_output(project, target, :swf, options)
-
+          move_dependency_dirs_to_source( sources, dependencies)
           cmd_args = []
           cmd_args << "-jar" << flex_sdk.mxmlc_jar
           cmd_args << "+flexlib" << "#{flex_sdk.home}/frameworks"
@@ -147,7 +157,7 @@ module Buildr
           cmd_args << options[:main]
           cmd_args << "-output" << output
           cmd_args << "-load-config" << flex_sdk.air_config
-          cmd_args << "-source-path" << sources.join(" ")
+          sources.each {|source| cmd_args << "-source-path+=#{source}"}
           cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
           options[:debug] = Buildr.options.debug.to_s
           reserved = [:flexsdk, :main, :apparat]
@@ -182,12 +192,13 @@ module Buildr
         def compile(sources, target, dependencies)
           flex_sdk = options[:flexsdk].invoke
           output = CompilerUtils::get_output(project, target, :swc, options)
+          move_dependency_dirs_to_source( sources, dependencies)
           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(" ")
+          sources.each {|source| cmd_args << "-include-sources+=#{source}"}
           cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
           reserved = [:flexsdk, :main, :apparat]
           options[:debug] = Buildr.options.debug.to_s
@@ -222,13 +233,14 @@ module Buildr
         def compile(sources, target, dependencies)
           flex_sdk = options[:flexsdk].invoke
           output = CompilerUtils::get_output(project, target, :swc, options)
+          move_dependency_dirs_to_source( sources, dependencies)
           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(" ")
+          sources.each {|source| cmd_args << "-include-sources+=#{source}"}
           cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
           options[:debug] = Buildr.options.debug.to_s
           reserved = [:flexsdk, :main, :apparat]

data/lib/buildr/as3/ide/fdt4.rb

@@ -93,7 +93,7 @@ module Buildr
           end
 
           def create_fdt4_dependency_symlink(project, dependency)
-            case source
+            case dependency
               when Buildr::Artifact then
                 path = dependency.name
               else

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: buildr-as3
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 1
-  - 18
-  version: 0.1.18
+  - 19
+  version: 0.1.19
 platform: ruby
 authors: 
 - Dominic Graefen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-10 00:00:00 +01:00
+date: 2011-02-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency