rake-delphi 0.0.31 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 120f3145c1247f66a69729aaaf8c8f9c742618d9
-  data.tar.gz: 7ecb1e92d74f7e1595fc31f3a3f2f9dc600551bc
+  metadata.gz: eca8384876329fb4725a0a2dfe448daeee168868
+  data.tar.gz: 05a2efd6373a367c07998bdb8e78e48fb1fc26cb
 SHA512:
-  metadata.gz: ef47d87d9b6d9b2c613e0010b7fd5a4150dc3dffb4b8c204c30fa403ef7888ccd72b4b1199089e18bbfc2b09ba957819c4872aa83f0e71b558c8a44f79604b61
-  data.tar.gz: 2c95206267488640f4036e7c6c032da148b534de29e494ac16a0834e925e9de09af3fd4b6174400cd953af77cc6988f04ee8bec4db5146dd10d7daf866571235
+  metadata.gz: 8a7f1a1943b60d27d5f653108f757c54fb257f1b100dea5800d823be5d0f73df7316700c244e25826b889bba4bc9d772f8855adc94ca4e212d5620876fe029c0
+  data.tar.gz: 045a1be7b49a0ba772d95866aaf4db51b2c04912968f28bf0147b97dc03166ab3e0cb6e87f06514d5abaf3bf3d0dd953ae422e1035619497ee82aec84882452f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rake-delphi (0.0.31)
+    rake-delphi (0.0.32)
       bundler (~> 1.3)
       inifile
       rake (~> 10.0.4)
@@ -14,19 +14,16 @@ GEM
       rubyzip
     inifile (3.0.0)
     minitest (4.7.5)
-    power_assert (0.2.2)
     rake (10.0.4)
     rubyzip (0.9.9)
-    test-unit (3.0.9)
-      power_assert
     xml-simple (1.1.5)
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
   apktools
   minitest (~> 4.3)
   rake-delphi!
   rubyzip (~> 0.9.9)
-  test-unit

data/lib/rake/delphi/{androidmanifest.rb → android/manifest.rb}

@@ -8,7 +8,8 @@ require 'rake/common/chdirtask'
 
 module Rake
   module Delphi
-    class AndroidManifestInfo
+  module Android
+    class ManifestInfo
       attr_accessor :version
 
       def initialize(owner)
@@ -26,9 +27,9 @@ module Rake
       def libname
         @owner.dccTask.dpr.pathmap('%n')
       end
-    end
+    end # class ManifestInfo
 
-    class AndroidManifestTask < Rake::Task
+    class ManifestTask < Rake::Task
       attr_reader :output, :dccTask
     public
       def initialize(name, application)
@@ -36,7 +37,7 @@ module Rake
         self.needed = false
         @template = 'AndroidManifest.erb'
         @output = 'AndroidManifest.xml'
-        @template_obj = AndroidManifestInfo.new(self)
+        @template_obj = ManifestInfo.new(self)
       end
 
       def execute(args = nil)
@@ -56,6 +57,7 @@ module Rake
           end
         end
       end
-    end # class AndroidManifestTask
-  end
-end
+    end # class ManifestTask
+  end # module Android
+  end # module Delphi
+end # module Rake

data/lib/rake/delphi/android/sdk.rb

@@ -0,0 +1,209 @@
+# encoding: utf-8
+# vim: set shiftwidth=2 tabstop=2 expandtab:
+#
+require 'rake/delphi/dcc32tool'
+require 'rake/helpers/rake'
+
+module Rake
+  module Delphi
+    module Android
+      class SDK < Dcc32Tool
+        PROPERTIES = {
+          :linker => 'NDKArmLinuxAndroidFile',
+          :lib => 'DelphiNDKLibraryPath',
+          :linker_option => 'DelphiNDKLibraryPath',
+          :stripdebug => 'NDKArmLinuxAndroidStripFile',
+          :aapt => 'SDKAaptPath',
+          :platform => 'SDKApiLevelPath',
+          :keystore => nil,
+          :zipalign => 'SDKZipAlignPath',
+          :jdk_path => 'JDKJarsignerPath'
+        }
+        REG_KEYS = {::Win32::Registry::HKEY_CURRENT_USER => 'HKCU',
+          ::Win32::Registry::HKEY_LOCAL_MACHINE => 'HKLM'}
+
+        PROPERTIES.keys.each do |prop|
+          attr_accessor prop
+        end
+
+        def initialize
+          super(false)
+          read_properties
+        end
+
+        def read_default_config
+          begin
+            require 'win32/registry'
+            [::Win32::Registry::HKEY_CURRENT_USER, \
+                ::Win32::Registry::HKEY_LOCAL_MACHINE].each do |regRoot|
+              begin
+                key = 'Default_Android'
+                Logger.trace(Logger::DEBUG, "Finding #{REG_KEYS[regRoot]}\\#{@platform_SDKs}\\#{key}")
+                regRoot.open(@platform_SDKs) do |reg|
+                    reg_typ, reg_val = reg.read(key)
+                  Logger.trace(Logger::DEBUG, "Found '#{reg_val}'")
+                  return reg_val
+                end
+              rescue ::Win32::Registry::Error
+                Logger.trace(Logger::DEBUG, "No reg key '#{regRoot}'?!")
+              end
+            end
+            return nil
+          rescue LoadError
+            Logger.trace(Logger::DEBUG, 'No `win32/registry` gem?!')
+            return nil
+          end
+        end
+
+        def read_properties
+          @platform_SDKs = @@regroot + '\\PlatformSDKs'
+          default_android = read_default_config
+          return unless default_android
+          reg_default = @platform_SDKs + '\\' + default_android
+          begin
+            require 'win32/registry'
+            PROPERTIES.each do |prop, reg_key|
+              next unless reg_key
+              # current user values have precedence over local machine
+              [::Win32::Registry::HKEY_CURRENT_USER, \
+                 ::Win32::Registry::HKEY_LOCAL_MACHINE].each do |regRoot|
+                begin
+                  Logger.trace(Logger::DEBUG, "Finding '#{reg_key}' for '#{prop}' in '#{REG_KEYS[regRoot]}\\#{reg_default}'")
+                  regRoot.open(reg_default) do |reg|
+                    reg_typ, reg_val = reg.read(reg_key)
+                    Logger.trace(Logger::DEBUG, "Value=#{reg_val}")
+                    send "#{prop}=", reg_val
+                  end
+                  # if value found (in CU) there is no reason to search in LM
+                  break
+                rescue ::Win32::Registry::Error
+                  Logger.trace(Logger::DEBUG, "No reg key '#{regRoot}'?!")
+                end
+              end
+            end
+          rescue LoadError
+            Logger.trace(Logger::DEBUG, 'No `win32/registry` gem?!')
+          end
+        end
+
+        def lib=(value)
+          @lib, null  = value.split(';', 2)
+        end
+
+        def linker_option=(value)
+          null, @linker_option = value.split(';', 2)
+          @linker_option = ' -L \"' + @linker_option + '\"'
+        end
+
+        def linker
+          @linker = ENV['DELPHI_ANDROID_SDK_LINKER'] || @linker
+          warn "Please, define DELPHI_ANDROID_SDK_LINKER environment variable.\n Otherwise you may get 'File not found: ldandroid.exe' error" unless @linker
+          @linker
+        end
+
+        def lib
+          @lib = ENV['DELPHI_ANDROID_SDK_LIBPATH'] || @lib
+          warn 'Please, define DELPHI_ANDROID_SDK_LIBPATH environment variable' unless @lib
+          @lib
+        end
+
+        def linker_option
+          @linker_option = ENV['DELPHI_ANDROID_SDK_LINKER_OPTION'] || @linker_option
+          warn 'Please, define DELPHI_ANDROID_SDK_LINKER_OPTION environment variable' unless @linker_option
+          @linker_option
+        end
+
+        def stripdebug
+          @stripdebug = ENV['DELPHI_ANDROID_SDK_STRIPDEBUG'] || @stripdebug
+          warn 'Please, set DELPHI_ANDROID_SDK_STRIPDEBUG to path where arm-linux-androideabi-strip.exe is located' unless @stripdebug
+          @stripdebug
+        end
+
+        def aapt
+          @aapt = ENV['DELPHI_ANDROID_SDK_BUILD_TOOLS_PATH'] || @aapt
+          warn 'Please, set DELPHI_ANDROID_SDK_BUILD_TOOLS_PATH to path where aapt.exe is located' unless @aapt
+          @aapt
+        end
+
+        def platform
+          @platform = ENV['DELPHI_ANDROID_SDK_PLATFORM_PATH'] || @platform
+          warn 'Please, set DELPHI_ANDROID_SDK_PLATFORM_PATH to the path where android.jar is located' unless @platform
+          @platform
+        end
+
+        def keystore
+          @keystore = ENV['DELPHI_ANDROID_KEYSTORE'] || @keystore
+          warn 'Please, set DELPHI_ANDROID_KEYSTORE to the path where a keystore (to sign an application) is located' unless @keystore
+          @keystore
+        end
+
+        def zipalign
+          @zipalign = ENV['DELPHI_ANDROID_SDK_PLATFORM_TOOLS'] || @zipalign
+          warn 'Please, set DELPHI_ANDROID_SDK_PLATFORM_TOOLS to the path where zipalign.exe is located' unless @zipalign
+          @zipalign
+        end
+      end # class SDK
+
+      class DCC32SDKOptions < SDK
+        def dcc32options
+          opts = []
+          opts << '-TX.so'
+          opts << "--linker:\"#{linker}\""
+          opts << "--libpath:\"#{lib}\""
+          opts << "--linker-option:\"#{linker_option}\""
+          opts
+        end
+      end # class DCC32SDKOptions
+
+      class PAClientSDKOptions < SDK
+        def stripdebug
+          stripdebug = super
+          return Rake.quotepath('', stripdebug.to_s)
+        end
+
+        def aapt
+          aapt = super
+          aapt = aapt.to_s + '\\aapt.exe' unless aapt.to_s.match(/aapt\.exe$/i)
+          aapt = Rake.quotepath('', aapt)
+        end
+
+        def jar
+          jar = platform.to_s + '\\android.jar'
+          jar = Rake.quotepath('', jar)
+        end
+
+        def zipalign
+          zip_align = super
+          zip_align = zip_align.to_s + '\\zipalign.exe' unless zip_align.to_s.match(/zipalign\.exe$/i)
+          zip_align = Rake.quotepath('', zip_align)
+        end
+      end  # class PAClientSDKOptions
+
+      class JavaSDK < SDK
+        def path
+          @jdk_path = ENV['JAVA_SDK_PATH'] || @jdk_path
+          warn 'Please, set JAVA_SDK_PATH to the path where jarsigner.exe is located' unless @jdk_path
+          @jdk_path
+        end
+
+        def jarsigner
+          jarsigner = path.to_s
+          jarsigner += '\\jarsigner.exe' unless jarsigner.match(/jarsigner\.exe$/i)
+          return Rake.quotepath('', jarsigner)
+        end
+
+        def keystore
+          key_store = super
+          key_store = Rake.quotepath('', key_store.to_s.double_delimiters)
+        end
+
+        def keystore_params
+          key_store_params = ENV['DELPHI_ANDROID_KEYSTORE_PARAMS']
+          warn 'Please, set DELPHI_ANDROID_KEYSTORE_PARAMS to alias,method,keystore_password,key_password' unless key_store_params
+          key_alias, key_params = key_store_params.to_s.split(',', 2)
+          return [key_alias, key_params]
+        end
+      end # class JavaSDK
+    end # module Android
+  end # module Delphi
+end # module Rake

data/lib/rake/delphi/dccaarmtool.rb

@@ -2,6 +2,7 @@
 # encoding: utf-8
 
 require 'rake/delphi/dcc32tool'
+require 'rake/delphi/android/sdk'
 
 module Rake
   module Delphi
@@ -11,19 +12,8 @@ module Rake
       end
 
       def options
-        opts = []
-        linker_path = ENV['DELPHI_ANDROID_SDK_LINKER']
-        warn "Please, define DELPHI_ANDROID_SDK_LINKER environment variable.\n Otherwise you may get 'File not found: ldandroid.exe' error" unless linker_path
-        lib_path = ENV['DELPHI_ANDROID_SDK_LIBPATH']
-        warn 'Please, define DELPHI_ANDROID_SDK_LIBPATH environment variable' unless lib_path
-        linker_option = ENV['DELPHI_ANDROID_SDK_LINKER_OPTION']
-        warn 'Please, define DELPHI_ANDROID_SDK_LINKER_OPTION environment variable' unless linker_option
-        opts << '-TX.so'
-        opts << "--linker:\"#{linker_path}\""
-        opts << "--libpath:\"#{lib_path}\""
-        opts << "--linker-option:\"#{linker_option}\""
-        return opts
+        return Android::DCC32SDKOptions.new.dcc32options
       end
-    end
-  end
-end
+    end # class DccARMTool
+  end # module Delphi
+end # moddule Rake

data/lib/rake/delphi/paclient.rb

@@ -9,7 +9,8 @@ require 'rake/helpers/raketask'
 require 'rake/helpers/string'
 require 'rake/common/chdirtask'
 require 'rake/delphi/paclienttool'
-require 'rake/delphi/androidmanifest'
+require 'rake/delphi/android/manifest'
+require 'rake/delphi/android/sdk'
 
 module Rake
   module Delphi
@@ -24,7 +25,7 @@ module Rake
         super
         @last_put_arg_index = 0
         @suffix = 'AndroidPackage'
-        @manifest = application.define_task(AndroidManifestTask, shortname + ':manifest')
+        @manifest = application.define_task(Android::ManifestTask, shortname + ':manifest')
         enhance([@manifest])
         self.needed = false
         dccTaskName = name.gsub(/:post$/, '')
@@ -118,9 +119,7 @@ module Rake
       end
 
       def get_stripdebug_arg(paclientTool)
-        stripdebug_path = ENV['DELPHI_ANDROID_SDK_STRIPDEBUG']
-        warn 'Please, set DELPHI_ANDROID_SDK_STRIPDEBUG to path where arm-linux-androideabi-strip.exe is located' unless stripdebug_path
-        stripdebug_path = Rake.quotepath('', stripdebug_path.to_s)
+        stripdebug_path = Android::PAClientSDKOptions.new.stripdebug
         output_dest = find_project_so(@deploymentfiles).dup
         output = @dccTask.exeoutput + '\\' + output_dest.last
         # remove '1' string
@@ -148,10 +147,8 @@ module Rake
       def get_aaptpackage_arg(paclientTool)
         output = @dccTask.exeoutput
         output_platform = File.expand_path2(output, '-u')
-        apt_path = ENV['DELPHI_ANDROID_SDK_BUILD_TOOLS_PATH']
-        warn 'Please, set DELPHI_ANDROID_SDK_BUILD_TOOLS_PATH to path where aapt.exe is located' unless apt_path
-        apt_path = apt_path.to_s + '\\aapt.exe'
-        apt_path  = Rake.quotepath('', apt_path)
+        paclient_options = Android::PAClientSDKOptions.new
+        apt_path = paclient_options.aapt
         args = [apt_path.double_delimiters]
         args += aapt_args.map do |a|
            to_mkdir = false
@@ -159,10 +156,7 @@ module Rake
            if a == :output
              a = unsigned_path
            elsif a == :jar
-             platform = ENV['DELPHI_ANDROID_SDK_PLATFORM_PATH']
-             warn 'Please, set DELPHI_ANDROID_SDK_PLATFORM_PATH to the path where android.jar is located' unless platform
-             a = platform.to_s + '\\android.jar'
-             a = Rake.quotepath('', a)
+             a = paclient_options.jar
              out = false
            else
              if a.kind_of?(Symbol)
@@ -188,24 +182,19 @@ module Rake
       end
 
       def get_jarsign_arg(paclientTool)
-        jdk_path = ENV['JAVA_SDK_PATH']
-        warn 'Please, set JAVA_SDK_PATH to the path where jarsigner.exe is located' unless jdk_path
-        args = [Rake.quotepath('', jdk_path.to_s + '\\jarsigner.exe')]
+        args = []
+        java_sdk = Android::JavaSDK.new
+        args << java_sdk.jarsigner
         args << unsigned_path(true).double_delimiters
-        key_store = ENV['DELPHI_ANDROID_KEYSTORE']
-        warn 'Please, set DELPHI_ANDROID_KEYSTORE to the path where keystore (to sign application) located' unless key_store
-        key_store = Rake.quotepath('', key_store.double_delimiters)
-        key_store_params = ENV['DELPHI_ANDROID_KEYSTORE_PARAMS']
-        warn 'Please, set DELPHI_ANDROID_KEYSTORE_PARAMS to alias,method,keystore_password,key_password' unless key_store_params
-        key_alias, key_params = key_store_params.split(',', 2)
+        key_store = java_sdk.keystore
+        key_alias, key_params = java_sdk.keystore_params
         args << key_alias << key_store << key_params
         return args.join(',')
       end
 
       def get_zipalign_arg(paclientTool)
-        zip_align = ENV['DELPHI_ANDROID_SDK_PLATFORM_TOOLS']
-        warn 'Please, set DELPHI_ANDROID_SDK_PLATFORM_TOOLS to the path where zipalign.exe is located' unless zip_align
-        args = [Rake.quotepath('', zip_align.to_s + '\\zipalign.exe')]
+        args = []
+        args << Android::PAClientSDKOptions.new.zipalign
         args << unsigned_path(true).double_delimiters
         zip_aligned_out = @dccTask.exeoutput + '\\' + @suffix + '\\' + @dccTask.dpr.pathmap('%n.apk')
         zip_aligned_out_platform = File.expand_path2(zip_aligned_out, '-u')

data/lib/rake/delphi/tool.rb

@@ -19,13 +19,13 @@ module Rake
         EmbarcaderoRegRoot = 'SOFTWARE\\Embarcadero\\BDS'
 
         def self.reinit
-            @@version, @@delphidir, @@toolpath = nil, nil, nil
+            @@version, @@delphidir, @@toolpath, @@regroot = nil, nil, nil, nil
         end
 
         reinit
 
         def initialize(checkExistance = false)
-            @@version, @@delphidir, @@toolpath = self.class.find(checkExistance) unless @@version
+            @@version, @@delphidir, @@toolpath, @@regroot = self.class.find(checkExistance) unless @@version
         end
 
         def self.toolName
@@ -44,6 +44,10 @@ module Rake
           @@delphidir
         end
 
+        def regroot
+          @@regroot
+        end
+
         def options
             ''
         end
@@ -114,18 +118,19 @@ module Rake
                         ::Win32::Registry::HKEY_CURRENT_USER].each do |regRoot|
                     begin
                         Logger.trace(Logger::DEBUG, "Finding Delphi dir for #{ver}")
-                        regRoot.open(rootForVersion(ver)) do |reg|
+                        reg_root = rootForVersion(ver)
+                        regRoot.open(reg_root) do |reg|
                             reg_typ, reg_val = reg.read('RootDir')
-                            return reg_val.unix2dos_separator
+                            return reg_val.unix2dos_separator, reg_root
                         end
                     rescue ::Win32::Registry::Error
                         Logger.trace(Logger::DEBUG, "No reg key '#{regRoot}'?!")
                     end
                 end
-                return nil
+                return nil, nil
             rescue LoadError
                 Logger.trace(Logger::DEBUG, 'No `win32/registry` gem?!')
-                return nil
+                return nil, nil
             end
         end
 
@@ -137,7 +142,7 @@ module Rake
                 ENV['DELPHI_DIR'] = ENV['DELPHI_DIR'].gsub(/[^\/]$/, '\&/')
                 tool = ENV['DELPHI_DIR'] + toolName
                 checkToolFailure(tool) if failIfNotFound
-                return v, ENV['DELPHI_DIR'], tool
+                return v, ENV['DELPHI_DIR'], tool, ENV['DELPHI_REG_ROOT']
             end
             if v.to_s.empty?
                 v = []
@@ -149,7 +154,7 @@ module Rake
             end
             tool_was_found = false
             v.each do |ver|
-                path = readDelphiDir(ver)
+                path, regroot = readDelphiDir(ver)
                 next unless path
                 tool = path + toolName
                 tool_was_found = true
@@ -157,8 +162,9 @@ module Rake
                 if File.exists?(tool) # found it !
                     ENV['DELPHI_VERSION'] = ver
                     ENV['DELPHI_DIR'] = path
-                    Logger.trace(Logger::DEBUG, "Set: DELPHI_VERSION=#{ver}; DELPHI_DIR='#{path}'")
-                    return ver, path, tool
+                    ENV['DELPHI_REG_ROOT'] = regroot
+                    Logger.trace(Logger::DEBUG, "Set: DELPHI_VERSION=#{ver}; DELPHI_DIR='#{path}'; DELPHI_REG_ROOT='#{regroot}'")
+                    return ver, path, tool, regroot
                 else
                     Logger.trace(Logger::DEBUG, 'But file does not exist!')
                 end

data/lib/rake/delphi/version.rb

@@ -2,6 +2,6 @@
 
 module Rake
   module Delphi
-    VERSION = '0.0.31'
+    VERSION = '0.0.32'
   end
 end

data/lib/rake/helpers/unittest.rb

@@ -1,17 +1,15 @@
 # encoding: utf-8
+# vim: set shiftwidth=2 tabstop=2 expandtab:
 
-require 'test/unit'
+require 'minitest/unit'
 
-# Ruby 1.9 uses "minitest". There is no `name` property there
-if defined? MiniTest::Unit::TestCase && Test::Unit::TestCase < MiniTest::Unit::TestCase
-    module Test
-        module Unit
-            class TestCase
-                def name
-                    __name__
-                end unless instance_methods.include?(:name)
-            end
-        end
+# MiniTest::Unit::TestCase have no `name` property
+module MiniTest
+  class Unit
+    class TestCase
+      def name
+        __name__
+      end unless instance_methods.include?(:name)
     end
+  end
 end
-

data/rake-delphi.gemspec

@@ -32,10 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rake", "~> 10.0.4"
   spec.add_runtime_dependency "xml-simple"
   spec.add_runtime_dependency "inifile"
-  # Ruby 2.2 have no `test-unit` gem in stdlib
-  if (Gem::Version.new(RUBY_VERSION) <=> Gem::Version.new('2.2')) >= 0
-    spec.add_development_dependency "test-unit"
-  end
   spec.add_development_dependency "minitest", "~> 4.3"
   spec.add_development_dependency "rubyzip", "~> 0.9.9"
   spec.add_development_dependency "apktools"

data/test/helpers/verinfo.rb

@@ -1,5 +1,5 @@
 require 'fileutils'
-require 'test/unit'
+require 'minitest/autorun'
 require 'helpers/consts'
 require 'rake/delphi/envvariables'
 
@@ -16,7 +16,7 @@ end
 
 module DelphiTests
 
-class TestVerInfo < Test::Unit::TestCase
+class TestVerInfo < MiniTest::Unit::TestCase
     DPROJ_VERSIONS = { '10' => '2006.bdsproj', '11' => '2007.dproj', \
                        '13' => '2010.dproj', '18' => 'xe5.dproj',
                        '21' => 'xe7.dproj' }
@@ -40,7 +40,7 @@ protected
 
     def _test_deploy_files(deploymentfiles, tested_deploymentFiles)
       assert deploymentfiles.kind_of?(Array), 'NOT an Array?!'
-      assert_not_equal 0, deploymentfiles.size, 'No files?!'
+      refute_equal 0, deploymentfiles.size, 'No files?!'
 
       dfiles = []
       deploymentfiles.each do |dfile|

data/test/resources/testproject/Rakefile.rb

@@ -31,6 +31,7 @@ namespace :test do
     task :prepare, :useresources, :options do |t, opts|
         _task = Rake::Task['test:compile']
         dpr = Rake.application.define_task(Rake::Delphi::Project, (_task.name + ':delphi').to_sym)
+        dpr[:quiet] = true
         dpr[:resources_additional] = []
         dpr[:resources_additional] << 'resources' if opts[:useresources]
         dpr[:resources_additional] << 'resources_ext:extended_resources.dres' if opts[:useresources] === 'ext'

data/test/resources/testproject/testproject.rc

@@ -37,13 +37,13 @@ BEGIN
         BLOCK "041904E3"
         BEGIN
             VALUE "CompanyName", "Rake\0"
-            VALUE "FileDescription", "Test rake-delphi project 2006 description\0"
+            VALUE "FileDescription", "Test rake-delphi project XE7 description\0"
             VALUE "FileVersion", "0.0.0.0\0"
             VALUE "InternalName", "testproject.exe\0"
             VALUE "LegalCopyright", "Copyright. ��������\0"
             VALUE "LegalTrademarks", "Trademark. �������� �����\0"
             VALUE "OriginalFilename", "testproject.exe\0"
-            VALUE "ProductName", "Test rake-delphi project 2006 product name\0"
+            VALUE "ProductName", "Test rake-delphi project XE7 product name\0"
             VALUE "ProductVersion", "1.2.3.4\0"
             VALUE "Comments", "Test project comment\0"
 #ifdef DEBUG

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

@@ -29,6 +29,7 @@ module TestAndroidModule
       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[:quiet] = true
       dpr[:resources_additional] = 'resources' if opts[:useresources]
       dpr[:platform_configuration] = 'Debug'
       dpr[:platform] = 'Android32'

data/test/resources/testproject-android/TestProject.cfg.1

@@ -0,0 +1,8 @@
+-U"."
+-I"."
+-R"."
+-O"."
+-U"./lib/AnyLib"
+-I"./lib/AnyLib"
+-R"./lib/AnyLib"
+-O"./lib/AnyLib"

data/test/resources/testproject-android/TestProject.xe7.dproj

@@ -298,7 +298,7 @@
                 </DeployFile>
                 <DeployFile LocalName="c:\program files (x86)\embarcadero\rad studio\15.0\lib\android\debug\classes.dex" Configuration="Debug" Class="AndroidClassesDexFile">
                     <Platform Name="Android">
-                        <RemoteName>classes.dex</RemoteName>
+                        <RemoteName>classes.debug.dex</RemoteName>
                     </Platform>
                 </DeployFile>
                 <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_48x48.png" Configuration="Debug" Class="Android_LauncherIcon48">

data/test/test-delphi-android.rb

@@ -3,7 +3,6 @@
 
 require 'rake'
 require 'fileutils'
-require 'test/unit'
 require 'rake/delphi/dccaarmtool'
 require 'rake/delphi/envvariables'
 require 'rake/helpers/unittest'
@@ -28,7 +27,7 @@ module DelphiAndroidTests
         META-INF/ANDROIDD.RSA
         lib/armeabi/libTestProject.so
         AndroidManifest.xml
-        classes.dex
+        classes.debug.dex
         resources.arsc
         res/drawable-hdpi/ic_launcher.png
         res/drawable-ldpi/ic_launcher.png

data/test/test-delphi-xe7-android.rb

@@ -15,7 +15,7 @@ module DelphiAndroidTests
       super
       @required_files << 'assets/internal/module.ext'
       @required_files << 'assets/internal/predefined.db'
-      @required_files << 'lib/mips/libTestProject.so'
+      @required_files << 'lib/mips/libTestProject.debug.so'
     end
   end
 

data/test/test-delphi.rb

@@ -2,7 +2,6 @@
 
 require 'rake'
 require 'fileutils'
-require 'test/unit'
 require 'rake/delphi'
 require 'rake/delphi/project'
 require 'rake/delphi/tool'
@@ -164,17 +163,15 @@ public
     end
 end
 
-class TestCustomDelphiTool <  Test::Unit::TestCase
+class TestCustomDelphiTool < MiniTest::Unit::TestCase
 private
 public
     def test_checkToolFailure
-        assert_nothing_raised RuntimeError do
-            Rake::Delphi::CustomDelphiTool.checkToolFailure(__FILE__)
-        end
+        Rake::Delphi::CustomDelphiTool.checkToolFailure(__FILE__)
     end
 
     def test_checkToolFailure_failure
-        assert_raise RuntimeError do
+        assert_raises RuntimeError do
             Rake::Delphi::CustomDelphiTool.checkToolFailure(__FILE__ + '.ext')
         end
     end
@@ -192,7 +189,7 @@ end
 
 end
 
-class TestRCResourceCompiler < Test::Unit::TestCase
+class TestRCResourceCompiler < MiniTest::Unit::TestCase
 private
 public
     def setup

data/test/test-echo.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
 
 require 'rake'
-require 'test/unit'
+require 'minitest/autorun'
 require 'rake/common/echotask'
 require 'rake/helpers/unittest'
 
-class TestEchoToFileTask <  Test::Unit::TestCase
+class TestEchoToFileTask < MiniTest::Unit::TestCase
 private
     def file_in
         return @file_in ||= File.expand_path('../resources/echo/file.in', __FILE__)

data/test/test-envvariables.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
 
 require 'rake'
-require 'test/unit'
+require 'minitest/autorun'
 require 'rake/delphi/envvariables'
 require 'rake/helpers/unittest'
 
-class TestEnvVariables < Test::Unit::TestCase
+class TestEnvVariables < MiniTest::Unit::TestCase
 
     def setup
         ENV['BDS_PLATFORM'] = 'BDS platform'
@@ -23,7 +23,7 @@ class TestEnvVariables < Test::Unit::TestCase
 
         env_vars['BDS_PLATFORM_CASE_2'] = 'BDS Platform Case 2'
         # be sure there is no BDS_Platform_Case_2 defined
-        assert_not_equal('BDS Platform Case 2', env_vars['BDS_Platform_Case_2'])
+        refute_equal('BDS Platform Case 2', env_vars['BDS_Platform_Case_2'])
         # also freeze string (ENV vars are frozen strings)
         assert_equal('Platform: BDS Platform Case 2', env_vars.expand('Platform: $(BDS_Platform_Case_2)'.freeze))
     end

data/test/test-gemversion.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rake/helpers/gemversion'
 
-class TestVersionImproved <  Test::Unit::TestCase
+class TestVersionImproved < MiniTest::Unit::TestCase
 public
     def setup
     end

data/test/test-git.rb

@@ -1,13 +1,13 @@
 # encoding: utf-8
 
 require 'rake'
-require 'test/unit'
+require 'minitest/autorun'
 require 'fileutils'
 require 'rake/common/chdirtask'
 require 'rake/common/git'
 require 'rake/helpers/unittest'
 
-class CustomTestGit <  Test::Unit::TestCase
+class CustomTestGit < MiniTest::Unit::TestCase
 private
     def init_test_dit_dir
         @test_git_dir = File.expand_path('../tmp', __FILE__)
@@ -126,7 +126,7 @@ public
 
     def test_changelog_processed_not_a_hash_string
         @opts.merge!({ :process => 'added'})
-        assert_raise RuntimeError do
+        assert_raises RuntimeError do
             Rake::Delphi::ChDir.new(@rake_task, @test_git_dir) do
                 chlog = Rake::Delphi::GitChangelog.new(@rake_task, @opts)
             end
@@ -135,7 +135,7 @@ public
 
     def test_changelog_processed_not_a_hash_array
         @opts.merge!({ :process => [['added']] })
-        assert_raise RuntimeError do
+        assert_raises RuntimeError do
             Rake::Delphi::ChDir.new(@rake_task, @test_git_dir) do
                 chlog = Rake::Delphi::GitChangelog.new(@rake_task, @opts)
             end

data/test/test-hashes.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
 
 require 'rake'
-require 'test/unit'
+require 'minitest/autorun'
 require 'rake/common/hashtask'
 require 'rake/helpers/unittest'
 
-class CustomTestHashTask <  Test::Unit::TestCase
+class CustomTestHashTask < MiniTest::Unit::TestCase
 private
     def _file
         return @file ||= File.expand_path('../resources/hashes/hash.file', __FILE__)

data/test/test-ini.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
 
 require 'rake'
-require 'test/unit'
+require 'minitest/autorun'
 require 'rake/common/initask'
 require 'rake/helpers/unittest'
 
-class TestIniProperty <  Test::Unit::TestCase
+class TestIniProperty < MiniTest::Unit::TestCase
 private
     def _file
         return @file ||= File.expand_path('../resources/ini/file.ini', __FILE__)

data/test/test-libstask.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
 
 require 'rake'
-require 'test/unit'
+require 'minitest/autorun'
 require 'rake/common/libstask'
 require 'rake/helpers/unittest'
 
-class TestLibsTask <  Test::Unit::TestCase
+class TestLibsTask < MiniTest::Unit::TestCase
 private
     def _dir
         return @dir ||= File.expand_path('../resources/libstask/', __FILE__)
@@ -27,9 +27,9 @@ public
             assert_equal('test-libs-task-test_define', task2.name)
         end
         # already invoked
-        assert_not_equal(nil, task2.libs)
+        refute_equal(nil, task2.libs)
         # not empty
-        assert_not_equal([], task2.libs)
+        refute_equal([], task2.libs)
     end
 
     def test_libs_relative_not_executed

data/test/test-projectinfo-android-xe7.rb

@@ -2,7 +2,6 @@
 # vim: set shiftwidth=2 tabstop=2 expandtab:
 
 require 'rake'
-require 'test/unit'
 require 'rake/delphi'
 require 'rake/delphi/projectinfo'
 require 'rake/delphi/dcc32'
@@ -64,7 +63,7 @@ module DelphiAndroidTests
         tested_deploymentFiles << '$(BDS)\bin\Artwork\Android\FM_LauncherIcon_%dx%d.png,res\drawable-%sdpi\,1,ic_launcher.png' % [n, n, tested_deploymentFiles_prefixes[n]]
       end
       tested_deploymentFiles << 'project_so,library\lib\armeabi\,1,libTestProject.so'
-      tested_deploymentFiles << '$(BDS)\lib\android\debug\classes.dex,classes\,1,classes.dex'
+      tested_deploymentFiles << '$(BDS)\lib\android\debug\classes.dex,classes\,1,classes.debug.dex'
       tested_deploymentFiles << 'external\module.ext,.\assets\internal\\\\,1,'
       tested_deploymentFiles << 'external\predefined.db,.\assets\internal\\\\,1,'
       tested_deploymentFiles << '$(BDS)\lib\android\debug\mips\libnative-activity.so,library\lib\mips\,1,libTestProject.debug.so'

data/test/test-projectinfo-android.rb

@@ -2,7 +2,6 @@
 # vim: set shiftwidth=2 tabstop=2 expandtab:
 
 require 'rake'
-require 'test/unit'
 require 'rake/delphi'
 require 'rake/delphi/projectinfo'
 require 'rake/delphi/dcc32'

data/test/test-projectinfo.rb

@@ -1,7 +1,6 @@
 # encoding: Windows-1251
 
 require 'rake'
-require 'test/unit'
 require 'rake/delphi'
 require 'rake/delphi/projectinfo'
 require 'rake/delphi/dcc32'

data/test/test-string.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
 
 require 'rake'
-require 'test/unit'
+require 'minitest/autorun'
 require 'rake/helpers/unittest'
 require 'rake/helpers/string'
 
-class TestString < Test::Unit::TestCase
+class TestString < MiniTest::Unit::TestCase
     def test_prepend
         assert_equal('prefix_a', 'a'.prepend('prefix_'))
     end

data/test/test-zip.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
 
 require 'rake'
-require 'test/unit'
+require 'minitest/autorun'
 require 'rake/common/ziptask'
 require 'rake/helpers/unittest'
 
-class TestZipTask <  Test::Unit::TestCase
+class TestZipTask <  MiniTest::Unit::TestCase
 private
 public
     def setup
@@ -15,14 +15,14 @@ public
     end
 
     def test_zip_no_filename
-        assert_raise RuntimeError do
+        assert_raises RuntimeError do
             # second argument must be non-empty
             Rake::Delphi::ZipTask.new(@rake_task, nil, nil)
         end
     end
 
     def test_zip_empty_filename
-        assert_raise RuntimeError do
+        assert_raises RuntimeError do
             # second argument must be non-empty
             Rake::Delphi::ZipTask.new(@rake_task, '', nil)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-delphi
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.32
 platform: ruby
 authors:
 - Alexey Shumkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +133,8 @@ files:
 - lib/rake/common/sendmailtask.rb
 - lib/rake/common/ziptask.rb
 - lib/rake/delphi.rb
-- lib/rake/delphi/androidmanifest.rb
+- lib/rake/delphi/android/manifest.rb
+- lib/rake/delphi/android/sdk.rb
 - lib/rake/delphi/dcc32.rb
 - lib/rake/delphi/dcc32tool.rb
 - lib/rake/delphi/dccaarmtool.rb
@@ -189,6 +176,7 @@ files:
 - test/resources/testproject-android/ExplicitLib/ExplicitLibUnit.pas
 - test/resources/testproject-android/Rakefile.rb
 - test/resources/testproject-android/TestProject.cfg
+- test/resources/testproject-android/TestProject.cfg.1
 - test/resources/testproject-android/TestProject.dpr
 - test/resources/testproject-android/TestProject.rc
 - test/resources/testproject-android/TestProject.xe5.dproj
@@ -274,6 +262,7 @@ test_files:
 - test/resources/testproject-android/ExplicitLib/ExplicitLibUnit.pas
 - test/resources/testproject-android/Rakefile.rb
 - test/resources/testproject-android/TestProject.cfg
+- test/resources/testproject-android/TestProject.cfg.1
 - test/resources/testproject-android/TestProject.dpr
 - test/resources/testproject-android/TestProject.rc
 - test/resources/testproject-android/TestProject.xe5.dproj