buildr-hx 0.0.24.pre → 0.0.25.pre

data/VERSION

@@ -1 +1 @@
-0.0.24.pre
+0.0.25.pre

data/buildr-hx.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "buildr-hx"
-  s.version = "0.0.24.pre"
+  s.version = "0.0.25.pre"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dominic Graefen"]
-  s.date = "2012-05-02"
+  s.date = "2012-05-04"
   s.description = "Build like you code - now supporting haXe"
   s.email = "dominic @nospam@ devboy.org"
   s.extra_rdoc_files = [

data/lib/buildr/hx/compiler/haxe_compiler_base.rb

@@ -16,7 +16,7 @@ module Buildr
           check_options options, COMPILE_OPTIONS
           @output = get_output_file(target)
           is_test = is_test?(sources, target, dependencies)
-          args = ["haxe"]
+          args = %w(haxe)
           sources += @project.compile.sources.map(&:to_s) if is_test
           args += generate_source_args sources
           args += generate_dependency_args dependencies
@@ -50,7 +50,7 @@ module Buildr
           args << '-debug' if options[:debug]
           args += options[:resources].map{|id,path| "-resource #{path}@#{id.to_s}"} unless options[:resources].nil?
           options[:flags] << "ENV_#{Buildr.environment.upcase}"
-          args += options[:flags].map{|flag| "-D #{flag.to_s}"} unless options[:flags].nil?
+          args += options[:flags].uniq.map{|flag| "-D #{flag.to_s}"} unless options[:flags].nil?
           args + Array(options[:args])
         end
 
@@ -64,19 +64,17 @@ module Buildr
             spec = HaxeLib.path_to_spec(dep)
             if spec
               args << "-lib #{spec[:id]}:#{spec[:version]}"
-              #elsif File.extname(dep) == ".zip" && Buildr.zip(dep).contain?("haxelib.xml")
-              #  xml = Zip::ZipFile.open(dep) { |zip| zip.file.read("haxelib.xml") }
-              #  require 'rexml/document'
-              #  doc = REXML::Document.new(xml)
-              #  id = doc.root.attribute("name")
-              #  version = doc.root.elements['version'].attribute("name")
-              #  fail "Could not install #{id}:#{version}." unless install_haxelib_zip dep
-              #  args << "-lib #{id}:#{version}"
             elsif File.extname(dep) == ".swf"
               args << "-swf-lib #{dep}"
             elsif File.extname(dep) == ".hxlib"
               args += File.read(dep).split("\n").map{ |dep|
-                dep.start_with?("-cp") ? "-cp #{File.join(root_project_dir, dep.gsub("-cp ", "").strip )}" : dep
+                if dep.start_with?("-cp")
+                  "-cp #{File.join(root_project_dir, dep.gsub("-cp ", "").strip )}"
+                elsif dep.start_with?("-swf-lib")
+                  "-swf-lib #{File.join(root_project_dir, dep.gsub("-swf-lib ", "").strip )}"
+                else
+                  dep
+                end
               }
             end
           }
@@ -101,7 +99,7 @@ module Buildr
         def create_hxml( args, is_test )
           file = File.join(@project.base_dir, options[:hxml] || is_test ? "test.hxml" : "compile.hxml")
           puts "Creating hxml '#{file}'"
-          with_path = ["cp", "swf-lib", "swf", "js", "as3", "cpp", "neko", "xml", "swf9", "resource"].map{|p|"-#{p}"}
+          with_path = %w(cp swf-lib swf js as3 cpp neko xml swf9 resource).map{|p|"-#{p}"}
           File.open(file, 'w') {|f| f.write(
               args.reject{|a| a == "haxe"}.
                   map{|a|

data/lib/buildr/hx/compiler/hxlib.rb

@@ -12,9 +12,15 @@ module Buildr
 
         def compile(sources, target, dependencies)
           dependency_list = (generate_dependency_args(dependencies) + generate_source_args(sources)).
-              reject{|dep| !( dep.start_with?("-cp") || dep.start_with?("-lib") ) }.
+              reject{|dep| !( dep.start_with?("-cp") || dep.start_with?("-lib") || dep.start_with?("-swf-lib") ) }.
               map{ |dep|
-                dep.start_with?("-cp") ? "-cp #{relative_path( dep.gsub("-cp ", "").strip, root_project_dir )}" : dep
+                if dep.start_with?("-cp")
+                  "-cp #{relative_path( dep.gsub("-cp ", "").strip, root_project_dir )}"
+                elsif dep.start_with?("-swf-lib")
+                  "-swf-lib #{relative_path( dep.gsub("-swf-lib ", "").strip, root_project_dir )}"
+                else
+                  dep
+                end
               }
           file = get_output_file(target)
           FileUtils.mkdir_p File.dirname(file)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildr-hx
 version: !ruby/object:Gem::Version
-  version: 0.0.24.pre
+  version: 0.0.25.pre
   prerelease: 7
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000 Z
+date: 2012-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: buildr
@@ -213,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3144013810839005503
+      hash: 705849060145704839
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: