rake-delphi 0.0.4 → 0.0.5

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rake-delphi.gemspec
 gemspec
+gem 'rake', '~> 10.0.4'
+gem 'xml-simple'
+gem 'rubyzip', '~> 0.9.9'
+gem 'inifile

data/Gemfile.lock

@@ -0,0 +1,19 @@
+PATH
+  remote: .
+  specs:
+    rake-delphi (0.0.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rake (10.0.4)
+    xml-simple (1.1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.3)
+  rake (~> 10.0.4)
+  rake-delphi!
+  xml-simple

data/Rakefile.rb

@@ -5,8 +5,14 @@ require 'rake/testtask'
 
 task :default => :test
 
+task :"test:prerequisites" do
+    raise 'Please define DELPHI_VERSION environment variable' \
+		+ ' to run tests with appropriate Delphi compiler' unless ENV['DELPHI_VERSION']
+end
+
 Rake::TestTask.new('test') do |t|
     t.ruby_opts << '-d' if Rake.application.options.trace
     t.libs << 'test'
     t.verbose = true
+    Rake::application[t.name].enhance([:"test:prerequisites"])
 end

data/lib/rake/common/git.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'rake/common/classes'
+require 'rake/common/logger'
 require 'rake/helpers/rake'
 
 module Rake
@@ -52,7 +53,7 @@ module Rake
             cmd = ['git']
             cmd << "-c i18n.logOutputEncoding=#{opts[:logoutputencoding]}" if opts[:logoutputencoding]
             cmd << 'log' << '--format=%B' << "#{opts[:since]}..HEAD"
-            p cmd if trace?
+            Logger.trace(Logger::VERBOSE, cmd)
             @changelog=%x[#{cmd.join(' ')}].lines.to_a
             @changelog.map! do |line|
                 line.chomp!
@@ -69,7 +70,7 @@ module Rake
             @changelog.uniq!
             do_filter
             do_process
-            puts @changelog if trace?
+            Logger.trace(Logger::TRACE, @changelog)
         end
 
         def charset

data/lib/rake/common/logger.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+
+module Rake
+  module Delphi
+    class Logger
+      NORMAL = 0
+      VERBOSE = 1
+      DEBUG = 2
+      TRACE = 3
+      def self.debug?
+        return ENV['RAKE_DELPHI_TRACE'].to_i >= DEBUG
+      end
+
+      def self.trace(level, msg)
+        if ENV['RAKE_DELPHI_TRACE'].to_i >= level
+          if msg.kind_of?(String)
+            $stderr.puts(msg)
+          else
+            require 'pp'
+            PP.pp(msg, $stderr)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rake/common/sendmailtask.rb

@@ -15,7 +15,7 @@ module Rake
                 cmd += "#{predefined[k]} #{opts[k]} " if opts[k]
             end
             cmd = "#{sendmail} -i #{cmd}"
-            pp cmd if trace?
+            Logger.trace(Logger::VERBOSE, cmd)
             if @task.application.windows? && Rake.ruby18?
                 require 'win32/open3'
             else

data/lib/rake/common/ziptask.rb

@@ -36,7 +36,7 @@ module Rake
     class ZipTask < BasicTask
         def initialize(task, zipfile, files, options = nil)
             super(task)
-            pp [zipfile, files] if trace?
+            Logger.trace(Logger::VERBOSE, [zipfile, files])
             raise "zipfile name is not defined!" if zipfile.nil? || zipfile.empty?
             @norubyzip = nil
             @options = options || {}
@@ -52,7 +52,7 @@ module Rake
             raise "no ZIP library (nor zipruby nor rubyzip) found!" if @norubyzip
             if defined? Zip::Archive
                 # zipruby used
-                $stderr.puts '`zipruby` gem is used' if trace?
+                Logger.trace(Logger::VERBOSE, '`zipruby` gem is used')
                 Zip::Archive.open(zipfile, Zip::CREATE | Zip::TRUNC) do |z|
                     files.each do |f|
                         zip_addfile(z, f)
@@ -60,7 +60,7 @@ module Rake
                 end
             else
                 # work with rubyzip
-                $stderr.puts '`rubyzip` gem is used' if trace?
+                Logger.trace(Logger::VERBOSE, '`rubyzip` gem is used')
                 File.unlink(zipfile) if File.exists?(zipfile)
                 Zip.options[:continue_on_exists_proc] = true
                 Zip::ZipFile.open(zipfile, Zip::ZipFile::CREATE) do |z|

data/lib/rake/delphi.rb

@@ -2,3 +2,4 @@
 
 require 'rake/helpers/rake'
 require 'rake/helpers/raketask'
+require 'rake/delphi/version'

data/lib/rake/delphi/dcc32.rb

@@ -2,6 +2,7 @@
 
 require 'rake'
 require 'rake/common/chdirtask'
+require 'rake/common/logger'
 require 'rake/delphi/envvariables'
 require 'rake/delphi/resources'
 require 'rake/delphi/tool'
@@ -15,16 +16,30 @@ module Rake
             'bin/dcc32.exe'
         end
 
-        def readLibraryPaths
-            libpaths = self.class.readUserOption('Library', 'Search Path', self.version).split(';') \
+        def delphidir
+            @@delphidir
+        end
+
+        def delphilib
+            ENV['BDSLIB']
+        end
+
+        def readLibraryPaths(platform)
+            warn "WARNING! You are using Delphi XE or above but no platform defined!" if ENV['DELPHI_VERSION'].to_i >= 14 && ! platform
+
+            platform = platform.to_s != '' ? '\\' + platform : ''
+            # platform not used for old Delphis 'SearchPath'
+            libpaths = self.class.readUserOption('Library' + platform, 'Search Path', self.version).split(';') \
                 | self.class.readUserOption('Library', 'SearchPath', self.version).split(';')
+            Logger.trace(Logger::TRACE, libpaths)
             dev = EnvVariables.new(self.class.rootForVersion(self.version) + '\Environment Variables', self.delphidir)
             libpaths.map! do |lp|
-                if !lp.nil? && !lp.empty?
+                unless lp.to_s.empty?
                     lp = dev.expand(lp)
                 end
                 lp
             end
+            Logger.trace(Logger::TRACE, libpaths)
             return libpaths
         end
     end
@@ -36,11 +51,11 @@ module Rake
         @@symbols = [:quiet, :assertions, :build, :optimization, :debug, :defines,
             :debuginfo, :localsymbols, :console, :warnings, :hints, :altercfg,
             :includepaths, :writeableconst,
-            :map, :dcuoutput, :bploutput,
+            :map, :dcuoutput, :bploutput, :aliases, :platform, :namespaces,
             :dcpoutput, :dcu, :uselibrarypath, :uselibrarypath, :usecfg]
     public
         @@symbols.map do |sym|
-            attr_accessor sym
+            attr_accessor sym unless method_defined?(sym)
         end
 
         def initialize(name, application)
@@ -50,9 +65,17 @@ module Rake
             @rc_template_task = application.define_task(RCTemplateTask, shortname + ':rc:template')
             @rc_task = application.define_task(RCTask, shortname + ':rc')
             enhance([@rc_template_task, @rc_task])
+            @platform = nil
             @dcc32Tool = Dcc32Tool.new
         end
 
+        # used in tests
+        def reenable
+            # recreate Dcc32Tool to reinitialize paths to tool
+            @dcc32Tool = Dcc32Tool.new(true)
+            super
+        end
+
         def versionInfoClass
             @dcc32Tool.versionInfoClass
         end
@@ -66,7 +89,19 @@ module Rake
         end
 
         def delphilibs
-            return [@dcc32Tool.delphidir + 'Lib'] | @dcc32Tool.readLibraryPaths
+            return [@dcc32Tool.delphilib] | @dcc32Tool.readLibraryPaths(@platform)
+        end
+
+        def platform=(value)
+            @platform = value
+            Logger.trace(Logger::DEBUG, 'PLATFORM set: ' + value)
+            ENV['PLATFORM'] = @platform
+            # 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'
+                Logger.trace(Logger::TRACE, 'Aliases and namespaces are set for Delphi XE')
+            end
         end
 
         def _paths(ppaths)
@@ -113,6 +148,14 @@ module Rake
             return @quiet ? '-Q' : ''
         end
 
+        def aliases
+            return @aliases ? Rake.quotepath('-A', @aliases) : ''
+        end
+
+        def namespaces
+            return @namespaces ? Rake.quotepath('-NS', @namespaces) : ''
+        end
+
         def exeoutput
             return @exeoutput || @bin
         end
@@ -157,16 +200,20 @@ module Rake
         def build_args
             args = []
             args << build? << warnings? << hints? << quiet? << debug? << alldebuginfo << map
-            args << defines << writeableconst
+            args << defines << writeableconst << aliases << namespaces
             args << _source << outputs << implicitpaths
             args.flatten
         end
 
     public
         def init(properties)
-            pp properties if trace?
+            Logger.trace(Logger::TRACE, properties)
             properties.map do |key, value|
-                instance_variable_set("@#{key}", value)
+                begin
+                    send("#{key}=", value)
+                rescue NoMethodError
+                    instance_variable_set("@#{key}", value)
+                end
             end
             @_source = properties[:projectfile].pathmap('%X.dpr')
             src = @_source.gsub('\\', '/')
@@ -223,12 +270,16 @@ module Rake
             cmd = Rake.quotepath('', @dcc32Tool.toolpath)
             cmd << ([''] | args).join(' ')
             ChDir.new(self, File.dirname(@_source)) do |dir|
-                RakeFileUtils.verbose(trace?) do
+                RakeFileUtils.verbose(Logger.debug?) do
                     begin
                         unless @usecfg
                             cfg = @systempath.pathmap('%X.cfg')
                             bak_cfg = @systempath.pathmap('%X.rake.cfg')
-                            mv cfg, bak_cfg
+                            if File.exists?(cfg)
+                                mv cfg, bak_cfg
+                            else
+                                warn "WARNING! Config #{cfg} is absent!"
+                            end
                             if @altercfg
                                 cp @altercfg, cfg
                             end
@@ -238,7 +289,6 @@ module Rake
                                 paths.each do |p|
                                     f.write(p + "\n")
                                 end
-                                f.close
                             end
                         end
                         sh cmd
@@ -247,7 +297,7 @@ module Rake
                             begin
                                 cp cfg, cfg + '.1' if trace?
                             ensure
-                                mv bak_cfg, cfg
+                                mv bak_cfg, cfg if File.exists?(bak_cfg)
                             end
                         end
                     end

data/lib/rake/delphi/envvariables.rb

@@ -1,39 +1,67 @@
 # encoding: utf-8
+require 'rake/common/logger'
 
 module Rake
   module Delphi
-    class EnvVariable
-        attr_reader :name
-        attr_accessor :value
+    class EnvVariables < ::Hash
+        def self.delphi_version
+            ENV['DELPHI_VERSION']
+        end
 
-        def initialize(name, value)
-            @name, @value = name, value
+        def readreg(regpath)
+            return unless regpath
+            begin
+                require 'win32/registry'
+                Logger.trace(Logger::DEBUG, "Reading environment variables from '#{regpath}'")
+                begin
+                    ::Win32::Registry::HKEY_CURRENT_USER.open(regpath) do |reg|
+                        reg.each do |name|
+                            reg_type, value = reg.read(name)
+                            value.gsub!('\\', '/')
+                            add(name, value)
+                        end
+                    end
+                rescue ::Win32::Registry::Error
+                    Logger.trace(Logger::DEBUG, "No reg key '%s'?!" % regpath)
+                end
+            rescue LoadError
+                Logger.trace(Logger::DEBUG, 'No `win32/registry` gem?!')
+            end
         end
-    end
 
-    class EnvVariables < ::Array
         def initialize(regpath, delphidir)
+            readreg(regpath)
             _dir = delphidir.gsub(/\/$/, '')
             add('DELPHI', _dir)
             add('BDS', _dir)
+            add('BDSLIB', _dir + '/Lib')
             expand_vars
+            Logger.trace(Logger::TRACE, self)
         end
 
         def add(var, value)
-            self << EnvVariable.new(var, value)
+            self[var] = value
+        end
+
+        def expand_global(value)
+            value.gsub!(/\$\((?'env_name'\w+)\)/) do |match|
+                name = Regexp.last_match[:env_name].upcase
+                ENV[name] || match
+            end
+            value
         end
 
         def expand(value)
-            self.each do |ev|
-                value.gsub!("$(#{ev.name})", ev.value)
+            self.each do |name, val|
+                value.gsub!("$(#{name})", val)
+                value = expand_global(value)
             end
             value
         end
 
         def expand_vars
-            self.map! do |v|
-                v.value = expand(v.value)
-                v
+            self.each do |name, value|
+                self[name] = expand(value)
             end
         end
     end

data/lib/rake/delphi/project.rb

@@ -7,7 +7,6 @@ require 'rake/delphi/dcc32'
 require 'rake/helpers/file'
 require 'rake/helpers/raketask'
 require 'rake/helpers/string'
-require 'pp'
 
 module Rake
   module Delphi

data/lib/rake/delphi/projectinfo.rb

@@ -32,27 +32,39 @@ module Rake
     class BDSVersionInfo < ProjectVersionInfo
         def initialize(task)
             super(task)
-            content = @content['Delphi.Personality']['VersionInfoKeys']['VersionInfoKeys']
+            versioninfo = get_versioninfo_tag(@content)
+            # no need to continue if no version info file
+            return unless versioninfo
+            versioninfo = versioninfo['Delphi.Personality']['VersionInfoKeys']['VersionInfoKeys']
             use_encode = String.new.respond_to?(:encode)
             encoding = self.class.encoding
             if encoding && ! use_encode
                 require 'iconv'
                 iconv = Iconv.new(encoding, 'UTF-8')
             end
-            content.each do |v|
+            versioninfo.each do |v|
                 cv = v['content']
-                cv = (use_encode ? cv.encode(encoding, 'UTF-8') : iconv.iconv(cv)) if encoding
+                cv = (use_encode ? cv.encode(encoding, 'UTF-8') : iconv.iconv(cv)) if cv && encoding
                 @info[v['Name'].to_sym] = cv
             end
         end
 
+        def get_versioninfo_tag(content)
+            return content
+        end
+
         def self.encoding
             # override to set your own encoding
             nil
         end
 
         def do_getcontent
-            @content = XmlSimple.xml_in(@file, :ForceArray => false)
+            if File.exists?(@file)
+                @content = XmlSimple.xml_in(@file, :ForceArray => false)
+            else
+                warn "WARNING! Version info file #{@file} does not exists"
+                @content = nil
+            end
         end
 
         def _ext
@@ -65,12 +77,21 @@ module Rake
             return 'dproj'
         end
 
-        def do_getcontent
-            super
+        def get_versioninfo_tag(content)
+            # .dproj file has more nesting levels
+            return content['ProjectExtensions']['BorlandProject']['BorlandProject'] if content
+        end
+    end
+
+    class RAD2010VersionInfo < RAD2007VersionInfo
+        def get_versioninfo_tag(content)
             # .dproj file has more nesting levels
-            @content = @content['ProjectExtensions']['BorlandProject']['BorlandProject']
+            return content['ProjectExtensions']['BorlandProject'] if content
         end
     end
 
+    class XEVersionInfo < RAD2010VersionInfo
+    end
+
   end
 end