rake-delphi 0.0.6 → 0.0.7

data/lib/rake/delphi/dcc32.rb

@@ -229,11 +229,7 @@ module Rake
             @rc_template_task[:releaseCandidate] = properties[:releaseCandidate]
             @rc_task.input = src
             @rc_task.is_rc = properties[:releaseCandidate]
-            mainicon_path = File.expand_path2(Rake.unquotepath(@mainicon))
-            @rc_task.is_main_icon = File.exists?(mainicon_path)
-            unless @rc_task.is_main_icon
-                warn "WARNING! Icon file '#{mainicon_path}' does not exists. Application icon is disabled."
-            end
+            @rc_task.mainicon_path = @mainicon
             return unless properties[:resources_additional]
             res_add = properties[:resources_additional]
             if res_add.kind_of?(String)

data/lib/rake/delphi/resources.rb

@@ -6,6 +6,7 @@ require 'rake/common/logger'
 require 'rake/delphi/rc'
 require 'rake/helpers/gemversion'
 require 'rake/helpers/rake'
+require 'rake/helpers/file'
 
 module Rake
   module Delphi
@@ -94,13 +95,12 @@ module Rake
     end
 
     class RCTask < Rake::Task
-        attr_accessor :output, :input
-        attr_reader :is_main_icon
+        attr_accessor :output, :input, :mainicon_path
         def initialize(name, app)
             super
             @output = nil
             @is_rc = false
-            @is_main_icon = false
+            @main_icon_path = nil
         end
 
         def input=(value)
@@ -112,15 +112,20 @@ module Rake
             @is_rc = ! value.to_s.empty?
         end
 
-        def is_main_icon=(value)
-            @is_main_icon = value
+        def is_main_icon
+            mainicon_path_unquoted = File.expand_path2(Rake.unquotepath(@mainicon_path), '-ml')
+            is_main_icon = File.exists?(mainicon_path_unquoted)
+            unless is_main_icon
+                warn "WARNING! Icon file '#{mainicon_path_unquoted}' does not exists. Application icon is disabled."
+            end
+            return is_main_icon
         end
 
         def execute(args=nil)
             v, path, tool = RCResourceCompiler.find(true)
             a = []
             a << '/dRC' if @is_rc
-            a << '/dMAIN_ICON' if @is_main_icon
+            a << '/dMAIN_ICON' if is_main_icon
             a |= ['/fo', Rake.quotepath('', output), '/r', Rake.quotepath('', input) ]
             opts = { :args => a }
             opts.merge!(args)

data/lib/rake/delphi/version.rb

@@ -2,6 +2,6 @@
 
 module Rake
   module Delphi
-    VERSION = '0.0.6'
+    VERSION = '0.0.7'
   end
 end

data/lib/rake/helpers/file.rb

@@ -19,10 +19,10 @@ class File
 		path = `cygpath #{flag} "#{path}"`.chomp
 	end
 
-	def self.expand_path2(path)
+	def self.expand_path2(path, flag = nil)
 		path = expand_path(path)
 		return path unless cygwin?
-		return cygpath(path)
+		return cygpath(path, flag)
 	end
 
 	def self.dirname2(path, flag = nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-delphi
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler