buildr-as3 0.1.17 → 0.1.18

data/README.rdoc

@@ -6,23 +6,15 @@
 
 == 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.
+* [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.
 
 == 0.1.16
 
-* [FEATURE]
-API for Framworks and Toolkits integration has been refactored and updated.
+* [FEATURE] API for Framworks and Toolkits integration has been refactored and updated.
 
-* [FIXED] Issue 15
-Zip file extraction is now handled with gnuwin32 unzip on Windows, and the equivalent
-on *nix platforms as a fallback for rubyzip.
-On Windows gnuwin32 unzip needs to be installed and added to the PATH variable.
+* [FIXED] Issue 15: Zip file extraction is now handled with gnuwin32 unzip on Windows, and the equivalent on *nix platforms as a fallback for rubyzip. On Windows gnuwin32 unzip needs to be installed and added to the PATH variable.
 
-* [FIXED] Issue 16
-Binarymode was not set on target-file, which caused the downloaded archive to be corrupt.
-This is an issue of buildr and was reported.
+* [FIXED] Issue 16: Binarymode was not set on target-file, which caused the downloaded archive to be corrupt. This is an issue of buildr and was reported.
 
 == 0.1.13
 

data/VERSION

@@ -1 +1 @@
-0.1.17
+0.1.18

data/buildr-as3.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{buildr-as3}
-  s.version = "0.1.17"
+  s.version = "0.1.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dominic Graefen"]
-  s.date = %q{2011-02-07}
+  s.date = %q{2011-02-10}
   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

@@ -24,44 +24,113 @@ module Buildr
     module Alchemy
       class AlchemyToolkit
 
-        attr_reader :home, :achacks, :gcc, :flex_sdk, :alchemy_setup, :bin
+        attr_reader :home, :achacks, :gcc, :flex_sdk, :alchemy_setup, :bin, :swfbridge
 
         def initialize(flex_sdk)
+          @version = "1.0-PR1"
+          @system = Buildr::Util.win_os? ? "win" : "unix"
+          @spec = "com.adobe.alchemy:toolkit:zip:#{@system}:#{@version}"
+          @flex_sdk = flex_sdk
+          @alchemy_zip = Buildr.artifact(@spec)
+          @alchemy_dir = File.join(File.dirname(@alchemy_zip.to_s), "alchemy-#{@system}-#{@version}", get_alchemy_toolkit_subfolder(@system) )
+          generate_paths @alchemy_dir
+          self
+        end
 
-          fail("Alchemy support currently only on *nix based systems.") if Buildr::Util.win_os?
+        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)
+              File.open @alchemy_zip.to_s, 'w' do |file|
+                file.binmode()
+                URI.read(@url, {:progress=>true}) { |chunk| file.write chunk }
+              end
+            end
+          else
+            Buildr.artifact(@spec).from(Buildr.download(@url)).invoke unless File.exists? @alchemy_zip.to_s
+          end
 
-          @flex_sdk = flex_sdk
+          unless File.exists? @alchemy_dir
+            puts "Unzipping Alchemy, this might take a while."
+            unzip_dir = File.dirname @alchemy_dir
+            if Buildr::Util.win_os?
+              puts "Please make sure unzip is installed and in your PATH variable!"
+              unzip @alchemy_zip, unzip_dir
+            else
+              begin
+                Buildr.unzip(unzip_dir.to_s=>@alchemy_zip.to_s).target.invoke
+              rescue TypeError
+                puts "RubyZip extract failed, trying system unzip now."
+                unzip @alchemy_zip, unzip_dir
+              end
+            end
+          end
+          setup unless File.exists? @alchemy_setup
+          self
+        end
 
-          toolkit_version = "1.0.0"
-          toolkit_url = "http://download.macromedia.com/pub/labs/alchemy/alchemy_sdk_darwin_p1_121008.zip"
+        def from(url)
+          @url = url
+          self
+        end
 
-          toolkit_zip = Buildr::artifact("com.adobe.alchemy:toolkit:zip:#{toolkit_version}").from(Buildr::download(toolkit_url))
-          toolkit_zip.invoke unless File.exists? toolkit_zip.to_s
+        protected
 
-          toolkit_dir = File.join(File.dirname(toolkit_zip.to_s), "toolkit-#{toolkit_version}")
+        def unzip(zip, destination)
+          project_dir = Dir.getwd
+          Dir.chdir File.dirname(zip.to_s)
+          system("unzip #{File.basename(zip.to_s).to_s} -d #{File.basename(destination).to_s}")
+          Dir.chdir project_dir
+        end
 
-          unless File.exists? toolkit_dir
-            puts "Unzipping Alchemy Toolkit, this may take a while."
-            Buildr::unzip("#{toolkit_dir}"=>toolkit_zip.to_s).target.invoke
+        def setup
+          project_dir = Dir.getwd
+          ENV["PATH"] = "#{flex_sdk.bin}#{File::PATH_SEPARATOR}#{ENV["PATH"]}"
+          Dir.chdir @home
+          system("sh ./config")
+          if Buildr::Util.win_os?
+            Dir.chdir @bin
+            system("ln -sf llvm-stub llvm-stub.exe")
           end
+          Dir.chdir project_dir
+        end
 
-          @home = "#{toolkit_dir}/alchemy-darwin-v0.5a"
+        def generate_paths(home_dir)
+          @home = home_dir
           @achacks = "#{@home}/achacks"
           @gcc = "#{@achacks}/gcc"
           @alchemy_setup = "#{@home}/alchemy-setup"
           @config = "#{@home}/config"
           @bin = "#{@home}/bin"
+          @swfbridge = Buildr::Util.win_os? ? "#{@bin}/swfbridge.exe" : "#{@bin}/swfbridge"
+        end
 
-          # Run config script if alchemy-setup doesn't exist
-          unless File.exists? @alchemy_setup
-            project_dir = Dir.getwd
-            ENV["PATH"] = "#{ENV["PATH"]}:#{flex_sdk.bin}"
-            Dir.chdir @home
-            system("sh ./config")
-            Dir.chdir project_dir
+        def get_alchemy_toolkit_subfolder(system)
+          if system == "win"
+            folder = "alchemy-cygwin-v0.5a"
+          else
+            folder = "alchemy-darwin-v0.5a"
           end
+          folder
+        end
 
+        def get_alchemy_toolkit_url(system)
+          if system == "win"
+            url = "http://download.macromedia.com/pub/labs/alchemy/alchemy_sdk_cygwin_p1_121008.zip"
+          else
+            url = "http://download.macromedia.com/pub/labs/alchemy/alchemy_sdk_darwin_p1_121008.zip"
+          end
+          url
         end
+
       end
 
       module Compiler
@@ -81,7 +150,7 @@ module Buildr
           include Buildr::AS3::Compiler::CompilerUtils
 
           def compile(sources, target, dependencies)
-            alchemy_tk = options[:alchemy]
+            alchemy_tk = options[:alchemy].invoke
             flex_sdk = alchemy_tk.flex_sdk
             output = Buildr::AS3::Compiler::CompilerUtils::get_output(project, target, :swc, options)
 
@@ -101,10 +170,11 @@ module Buildr
             unless Buildr.application.options.dryrun
               ENV["ALCHEMY_HOME"]= alchemy_tk.home
               ENV["ALCHEMY_VER"] = "0.4a"
-              ENV["PATH"] = "#{alchemy_tk.bin}:#{ENV["PATH"]}"
+              ENV["PATH"] = "#{alchemy_tk.bin}#{File::PATH_SEPARATOR}#{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["ADL"]=alchemy_tk.flex_sdk.adl
+              ENV["SWFBRIDGE"]=alchemy_tk.swfbridge
+              ENV["PATH"] = "#{alchemy_tk.achacks}#{File::PATH_SEPARATOR}#{ENV["PATH"]}"
               ENV["PATH"] = "#{ENV["PATH"]}:#{flex_sdk.bin}"
               project_dir = Dir.getwd
               Dir.chdir File.dirname options[:main]

data/lib/buildr/as3/apparat.rb

@@ -100,7 +100,6 @@ module Buildr
         end
       end
 
-
       module Tasks
         include Extension
 
@@ -119,7 +118,7 @@ module Buildr
           output = Buildr::AS3::Compiler::CompilerUtils::get_output(project, compile.target, compile.packaging, compile.options)
           apparat_tk = compile.options[:apparat].invoke
           cmd_args = []
-          cmd_args << "\"#{apparat_tk.tdsi}\""
+          cmd_args << "#{apparat_tk.tdsi}"
           cmd_args << "-i #{output}"
           cmd_args << "-o #{output}"
           reserved = []
@@ -128,15 +127,16 @@ module Buildr
             cmd_args << "-#{key} #{value}"
           end
           ENV["PATH"] = "#{apparat_tk.scala_home}/bin#{File::PATH_SEPARATOR}#{ENV["PATH"]}" if apparat_tk.scala_home && !ENV["PATH"].include?("#{apparat_tk.scala_home}/bin")
-          puts "path:", ENV["PATH"]
-          puts "tdsi:",cmd_args.join(" "), system(cmd_args.join " ")
+#          puts "path:", ENV["PATH"]
+#          puts "tdsi:",cmd_args.join(" "), system(cmd_args.join " ")
+          system(cmd_args.join " ")
         end
 
         def apparat_reducer(quality)
           output = Buildr::AS3::Compiler::CompilerUtils::get_output(project, compile.target, compile.packaging, compile.options)
           apparat_tk = compile.options[:apparat].invoke
           cmd_args = []
-          cmd_args << "\"#{apparat_tk.reducer}\""
+          cmd_args << "#{apparat_tk.reducer}"
           cmd_args << "-i #{output}"
           cmd_args << "-o #{output}"
           cmd_args << "-q"

data/lib/buildr/as3/flexsdk.rb

@@ -29,7 +29,7 @@ module Buildr
       class FlexSDK
 
         attr_reader :home, :mxmlc_jar, :compc_jar, :asdoc_jar, :fcsh_jar, :flex_config,
-                    :asdoc_templates, :default_options, :air_config, :bin, :adt_jar
+                    :asdoc_templates, :default_options, :air_config, :bin, :adt_jar, :adl
 
         attr_writer :flex_config, :air_config, :asdoc_templates
 

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

@@ -100,9 +100,12 @@ module Buildr
                 path = dependency.to_s
             end
             target = project.path_to(:lib, :main, :as3) + "/" + File.basename(path)
-            unless target != path
-              File.delete(target) if File.exists?(target)
-              File.symlink path, target
+            if target != path
+              unless File.exists?(target) && !File.symlink?(target)
+                puts "Creating symlink: #{target}"
+                File.delete(target) if File.exists?(target)
+                File.symlink path, target
+              end
             end
             target
           end

metadata

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