rake-delphi 0.0.8 → 0.0.9

data/lib/rake/delphi/dcc32.rb

@@ -80,6 +80,18 @@ module Rake
             @dcc32Tool.versionInfoClass
         end
 
+        def dcu=(value)
+          # delete previously defined
+          @prerequisites.delete_if do |d|
+            if d.kind_of?(Rake::FileCreationTask)
+               d.name.casecmp(@dcu) == 0
+            end
+          end
+          @dcu = value
+          dcu_task = directory @dcu
+          enhance([dcu_task])
+        end
+
     private
         def initvars
             @exeoutput = nil
@@ -99,7 +111,7 @@ module Rake
             # for XE and above set default aliases and namespaces
             if ENV['DELPHI_VERSION'].to_i >= 14
                 @aliases = 'Generics.Collections=System.Generics.Collections;Generics.Defaults=System.Generics.Defaults;WinTypes=Winapi.Windows;WinProcs=Winapi.Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE'
-                @namespaces = 'Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;System;Xml;Data;Datasnap;Web;Soap'
+                @namespaces = 'Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;System;Xml;Data;Datasnap;Web;Soap;Vcl'
                 Logger.trace(Logger::TRACE, 'Aliases and namespaces are set for Delphi XE')
             end
         end
@@ -164,6 +176,10 @@ module Rake
             return @dcuoutput || @dcu || @_source.pathmap('%d%sdcu')
         end
 
+        def console?
+          return @console.nil? ? '' : (@console ? '-CC' : '-CG')
+        end
+
         def map
             # segments -> -GS
             # publics   -> -GP
@@ -199,7 +215,7 @@ module Rake
 
         def build_args
             args = []
-            args << build? << warnings? << hints? << quiet? << debug? << alldebuginfo << map
+            args << build? << console? << warnings? << hints? << quiet? << debug? << alldebuginfo << map
             args << defines << writeableconst << aliases << namespaces
             args << _source << outputs << implicitpaths
             args.flatten
@@ -217,11 +233,9 @@ module Rake
             end
             @_source = properties[:projectfile].pathmap('%X.dpr')
             src = @_source.gsub('\\', '/')
-            dcu = src.pathmap('%d%sdcu')
             # make sure to create dir for output dcu
             # for now default is <PROJECTDIR>/dcu
-            directory dcu
-            enhance([dcu])
+            self.dcu = src.pathmap('%d%sdcu') unless @dcu
             # mainicon is usually requested by RCTemplate
             @mainicon ||= Rake.quotepath('', src.pathmap('%X.ico'))
             @rc_template_task.output = src

data/lib/rake/delphi/version.rb

@@ -2,6 +2,6 @@
 
 module Rake
   module Delphi
-    VERSION = '0.0.8'
+    VERSION = '0.0.9'
   end
 end

data/test/test-delphi.rb

@@ -31,7 +31,10 @@ private
         end
 
         bin_dir = File.dirname(exe)
+        dcu_dir_rel = '../../tmp/dcu'
+        dcu_dir = bin_dir + '/../' + dcu_dir_rel
         FileUtils.mkdir_p(bin_dir)
+        FileUtils.mkdir_p(dcu_dir)
         # reenable task for subsequent calls
         prepare_task = ::Rake::Task['test:prepare']
         prepare_task.reenable
@@ -39,6 +42,7 @@ private
         useresources = prepare_args[:useresources]
         prepare_args.delete(:useresources)
         prepare_args[:bin] = bin_dir
+        prepare_args[:dcu] = dcu_dir_rel.gsub('/', '\\')
 
         prepare_task.invoke(useresources, prepare_args)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-delphi
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors: