rake-delphi 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a0f101f1a96214f373fe0c1335c90a17dc85b36
-  data.tar.gz: a5c30492fdcb33075969c33715a2f5d7b224367c
+  metadata.gz: 3d30171a3216bfeb302fbb9726822d42d188d7e9
+  data.tar.gz: bf6a445410c43ad323741d99daba4834d48b90e6
 SHA512:
-  metadata.gz: d78bdd4f177aa5219e924c727accf424bb97a1b4b7094fa465559627b824b7b71b2f77aa47b667c23c78af29c809a4528db51367a73ef660077549e83fd55f05
-  data.tar.gz: 6180f8c5863c3458416e27c3e38b1a1a4d91d0560be720d2098d91bb366ee0f08afa32e918265a1c3fe10d69e9c38ad9649d9f64c7b73b4e1faed11a6f3b1d45
+  metadata.gz: 864baa63a25a053a866354018d541db9016a9f13aa71e629ad43fbb4683067ac8384240eee9d698deed1969eda9b1ce33bf6dfd5b7890c1ad10d10dad04c251a
+  data.tar.gz: 523a8f8b63b99ef7f7c4d2ae36d03f293ed4cbb7c242d1bfc6404bb6b24e0dde769c3022c065627bde421f2338b991e69535efb14d962ae2e02754ae7f484257

data/Gemfile.lock

@@ -0,0 +1,26 @@
+PATH
+  remote: .
+  specs:
+    rake-delphi (0.0.14)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    apktools (0.6.0)
+      rubyzip
+    inifile (3.0.0)
+    rake (10.0.4)
+    rubyzip (0.9.9)
+    xml-simple (1.1.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  apktools
+  bundler (~> 1.3)
+  inifile
+  rake (~> 10.0.4)
+  rake-delphi!
+  rubyzip (~> 0.9.9)
+  xml-simple

data/lib/rake/delphi/dcc32.rb

@@ -91,7 +91,7 @@ module Rake
             # enable appropriate PAClientTask
             application[name + ':post'].needed = post_needed
             # for XE and above set default aliases and namespaces
-            if ENV['DELPHI_VERSION'].to_i >= 14
+            if EnvVariables.delphi_version >= DELPHI_VERSION_XE
                 @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')
@@ -129,6 +129,7 @@ module Rake
 
         def implicitpaths
             ipaths = ['.', '..']
+            Logger.trace(Logger::TRACE, 'Using library paths? %s' + (@uselibrarypath ? 'YES' : 'NO'))
             ipaths |= delphilibs if @uselibrarypath
             _paths(ipaths)
         end

data/lib/rake/delphi/dcc32tool.rb

@@ -26,7 +26,7 @@ module Rake
 
         def readLibraryPaths(platform, platform_stripped)
             Logger.trace(Logger::TRACE, 'Reading library paths for platform: ' + platform.to_s)
-            warn "WARNING! You are using Delphi XE or above but no platform defined!" if ENV['DELPHI_VERSION'].to_i >= 14 && ! platform
+            warn "WARNING! You are using Delphi XE or above but no platform defined!" if ENV['DELPHI_VERSION'].to_i >= DELPHI_VERSION_XE && ! platform
 
             platform = platform.to_s != '' ? '\\' + platform : ''
             # platform not used for old Delphis 'SearchPath'

data/lib/rake/delphi/envvariables.rb

@@ -5,7 +5,7 @@ module Rake
   module Delphi
     class EnvVariables < ::Hash
         def self.delphi_version
-            ENV['DELPHI_VERSION']
+            ENV['DELPHI_VERSION'].to_i
         end
 
         def initialize(regpath, delphidir)

data/lib/rake/delphi/project.rb

@@ -42,7 +42,7 @@ module Rake
 
         def init(module_name, rake_file, vars, level = 1)
             @level = level
-            module_name = module_name.dup.pop.to_s
+            module_name = module_name.dup.shift.to_s
             self[:projectlabel] = eval("#{module_name}::PROJECT_NAME")
             projectfile = eval("#{module_name}::PROJECT_FILE")
             self[:projectfile] = File.dirname2(rake_file) + File.separator +  projectfile

data/lib/rake/delphi/tool.rb

@@ -7,6 +7,11 @@ require 'rake/delphi/envvariables'
 
 module Rake
   module Delphi
+    DELPHI_VERSION_7 = 9
+    DELPHI_VERSION_2006 = 11
+    DELPHI_VERSION_2010 = 13
+    DELPHI_VERSION_XE = 14
+    DELPHI_VERSION_XE5 = 18
     class CustomDelphiTool < CustomExec
         DelphiRegRoot =  'SOFTWARE\\Borland\\Delphi'
         BDSRegRoot = 'SOFTWARE\\Borland\\BDS'
@@ -44,9 +49,9 @@ module Rake
         end
 
         def versionInfoClass
-            return @@version.to_f < 11 ? BDSVersionInfo : \
-                @@version.to_f < 13 ? RAD2007VersionInfo : \
-                @@version.to_f < 14 ? RAD2010VersionInfo : XEVersionInfo
+            return @@version.to_f < DELPHI_VERSION_2006 ? BDSVersionInfo : \
+                @@version.to_f < DELPHI_VERSION_2010 ? RAD2007VersionInfo : \
+                @@version.to_f < DELPHI_VERSION_XE ? RAD2010VersionInfo : XEVersionInfo
         end
 
         def self.readUserOption(key, name, ver)
@@ -73,7 +78,7 @@ module Rake
         end
 
         def self.version4version(version)
-            if version.to_f >= 9
+            if version.to_f >= DELPHI_VERSION_7
                 version = format('%.1f', version.to_f - 6)
             end
             if !version["."]
@@ -83,12 +88,12 @@ module Rake
         end
 
         def self.rootForVersion(version)
-            if version.to_f < 9
+            if version.to_f < DELPHI_VERSION_7
                 regRoot = DelphiRegRoot
             else
-                if version.to_f < 12
+                if version.to_f <= DELPHI_VERSION_2006
                     regRoot = BDSRegRoot
-                elsif version.to_f < 14
+                elsif version.to_f < DELPHI_VERSION_XE
                     regRoot = EDSRegRoot
                 else
                     regRoot = EmbarcaderoRegRoot
@@ -124,7 +129,7 @@ module Rake
         end
 
         def self.find(failIfNotFound = false)
-            v = EnvVariables.delphi_version
+            v = EnvVariables.delphi_version.to_s
             if ENV['DELPHI_DIR']
                 Logger.trace(Logger::DEBUG, 'DELPHI_DIR is set: ' + ENV['DELPHI_DIR'])
                 # append trailing path delimiter

data/lib/rake/delphi/version.rb

@@ -2,6 +2,6 @@
 
 module Rake
   module Delphi
-    VERSION = '0.0.14'
+    VERSION = '0.0.15'
   end
 end

data/test/helpers/verinfo.rb

@@ -22,7 +22,7 @@ class TestVerInfo < Test::Unit::TestCase
 
 protected
     def delphi_version
-        return Rake::Delphi::EnvVariables.delphi_version
+        return Rake::Delphi::EnvVariables.delphi_version.to_s
     end
 
     def prepare_ver_info_file?
@@ -39,7 +39,7 @@ protected
 
 public
     def setup
-        @saved_delphi_version = Rake::Delphi::EnvVariables.delphi_version
+        @saved_delphi_version = Rake::Delphi::EnvVariables.delphi_version.to_s
         ENV['DELPHI_VERSION'] = delphi_version
 
         template_ext = DPROJ_VERSIONS[delphi_version]

data/test/resources/testproject/Rakefile.rb

@@ -32,7 +32,7 @@ namespace :test do
         _task = Rake::Task['test:compile']
         dpr = Rake.application.define_task(Rake::Delphi::Project, (_task.name + ':delphi').to_sym)
         dpr[:resources_additional] = 'resources' if opts[:useresources]
-        if ENV['DELPHI_VERSION'].to_i >= 14
+        if Rake::Delphi::EnvVariables.delphi_version >= Rake::Delphi::DELPHI_VERSION_XE
             dpr[:platform] = 'Win32'
         end
         options = opts[:options] || {}

data/test/resources/testproject-android/Rakefile.rb

@@ -26,7 +26,7 @@ module TestAndroidModule
 
     desc 'Preparation'
     task :prepare, :useresources, :options do |t, opts|
-      fail 'Cannot compile this project with Delphi below XE5' if ENV['DELPHI_VERSION'].to_i < 18
+      fail 'Cannot compile this project with Delphi below XE5' if Rake::Delphi::EnvVariables.delphi_version < Rake::Delphi::DELPHI_VERSION_XE5
       _task = Rake::Task['test_android:compile']
       dpr = Rake.application.define_task(Rake::Delphi::Project, (_task.name + ':delphi').to_sym)
       dpr[:resources_additional] = 'resources' if opts[:useresources]

data/test/test-delphi-android.rb

@@ -5,6 +5,7 @@ require 'rake'
 require 'fileutils'
 require 'test/unit'
 require 'rake/delphi/dccaarmtool'
+require 'rake/delphi/envvariables'
 require 'rake/helpers/unittest'
 require 'rake/helpers/raketask'
 require 'helpers/consts'
@@ -100,7 +101,7 @@ module DelphiAndroidTests
 
   public
     def setup
-      fail 'Cannot compile this project with Delphi below XE5' if ENV['DELPHI_VERSION'].to_i < 18
+      fail 'Cannot compile this project with Delphi below XE5' if Rake::Delphi::EnvVariables.delphi_version < Rake::Delphi::DELPHI_VERSION_XE5
       Rake::Delphi::DccARMTool.reinit
       ENV['DELPHI_DIR'] = nil
       super

data/test/test-git.rb

@@ -84,7 +84,7 @@ public
     def test_changelog_last
         Rake::Delphi::ChDir.new(@rake_task, @test_git_dir) do
             chlog = Rake::Delphi::GitChangelog.new(@rake_task, nil)
-            assert_equal [], chlog.changelog, 'Changelog'
+            assert_equal ["line two added message", "file content added", "first commit"], chlog.changelog, 'Changelog'
             assert_equal [], chlog.processed, 'Processed'
         end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-delphi
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Alexey Shumkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - Messages.txt
 - README.md