rake-delphi 0.0.33 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c119e5e4ece30a32ff3711de76435085b2537a5
-  data.tar.gz: e5637e98253cd6c1a19f5d4ea0618c81beb4f501
+  metadata.gz: e9bb89ff1359c294d2ae1bc5e2a60f6f7e37fe65
+  data.tar.gz: 7b9c30e7a4903b079e385663b8fe57e45e43c1aa
 SHA512:
-  metadata.gz: b4cd5c00f5acd60e9ca67e94fe2af7ac18ccb5e49a9c5f9b391f2a33a7836d8b0f39d77d68c35f6caf89986d732145902e269a51c1a9fd972eae3b8a3c44f97b
-  data.tar.gz: 1e6222bc2efdf3b4dbbba47658764860f221c3c26922320eb1607ab1c3b5fd24edb0b253302f53c213f4d86ac464449b35eb4bc7ad684ecea2ad4aa229f04b30
+  metadata.gz: f16296d3b94d7280d09e138ff80bb71b019a342ad020af2686064105653aeb5f401cabb562891d6b8a958888e2a4fe165e7ccfd647a2bba3957ad2e50e523e8e
+  data.tar.gz: df15b814a2c42abebf4bc6b08f66d7f9b358278890fd8b12add008519835a6b1fb6d21a17ba9ad835664f9b4e25276b2b1bd5a1bd57c30bd91c234db41ba52c1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rake-delphi (0.0.33)
+    rake-delphi (0.0.34)
       bundler (~> 1.3)
       inifile
       rake (~> 10.0.4)

data/Rakefile.rb

@@ -15,7 +15,7 @@ end
 Rake::TestTask.new('test:no:delphi') do |t|
     t.ruby_opts << '-d' if Rake.application.options.trace
     t.libs << 'test'
-    t.test_files = FileList['test/test*'].delete_if do |f|
+    t.test_files = FileList['test/test*.rb'].delete_if do |f|
       # exclude "delphi" tests
       /delphi/.match(f)
     end

data/lib/rake/common/sendmailtask.rb

@@ -34,11 +34,7 @@ module Rake
         end
 
         def sendmail
-            if @task.application.unix?
-                "sendmail"
-            else
-                ENV['SENDMAIL']
-            end
+            ENV['SENDMAIL'] || 'sendmail'
         end
     end
   end

data/lib/rake/delphi/dcc32.rb

@@ -20,7 +20,7 @@ module Rake
     private
         @@symbols = [:quiet, :assertions, :build, :optimization, :debug, :defines,
             :debuginfo, :localsymbols, :console, :warnings, :hints, :altercfg,
-            :includepaths, :writeableconst,
+            :includepaths, :writeableconst, :boolean,
             :map, :dcuoutput, :bploutput,
             :aliases, :platform, :platform_configuration, :namespaces,
             :dcpoutput, :dcu, :uselibrarypath, :usecfg, :dcc_options]
@@ -120,6 +120,7 @@ module Rake
         end
 
         def _paths(ppaths)
+            ppaths = ppaths.dup
             ppaths.map! do |p|
                 a = []
                 ['U', 'I', 'R', 'O'].each do |s|
@@ -190,7 +191,7 @@ module Rake
         end
 
         def _alldebuginfo
-            return @debuginfo ? '-$D+ -$L+ -$YD' : '-$D- -$L- -$Y-'
+            return @debuginfo.nil? ?  '' : (@debuginfo ? '-$D+ -$L+ -$YD' : '-$D- -$L- -$Y-')
         end
 
         def outputs
@@ -213,10 +214,16 @@ module Rake
             return '-$J' + (@writeableconst ? '+' : '-')
         end
 
+        def _complete_booleans
+            return @boolean.nil? ? '' : ('-$B' + (@boolean == :full ? '+' : '-'))
+        end
+
         def build_args
             args = []
-            args << @dccTool.options << dcc_options << build? << console? << warnings? << hints? << quiet? << debug? << _alldebuginfo << _map
-            args << _defines << _writeableconst << _aliases << _namespaces
+            args << @dccTool.options << dcc_options << build? << console?
+            args << warnings? << hints? << quiet? << debug? << _alldebuginfo << _map
+            args << _defines << _writeableconst << _complete_booleans
+            args << _aliases << _namespaces
             args << _source << outputs << implicitpaths
             args.flatten
         end

data/lib/rake/delphi/paclient.rb

@@ -115,7 +115,9 @@ module Rake
         deploymentfiles.each do |file|
           return file[:project_so] if file[:project_so]
         end
-        fail 'Cannot find :project_so in files'
+        fail 'Cannot find :project_so in files!
+Please check :platform_configuration property for the Dcc32Task!
+This error may occur if :platform_configuration is set to an incorrect value'
       end
 
       def get_stripdebug_arg(paclientTool)

data/lib/rake/delphi/project.rb

@@ -50,7 +50,7 @@ module Rake
             @cdir = File.dirname(rake_file)
             self[:systempath] = @cdir + '/' + projectfile
             self[:altercfg].prepend(self[:sourcename] + '/') if self[:altercfg]
-            [:version, :bin, :build, :dcu, :alldebuginfo, :map, :defines, :releaseCandidate].each do |k|
+            [:version, :bin, :build, :dcu, :debug, :debuginfo, :map, :defines, :releaseCandidate].each do |k|
                 self[k] = vars[k] if vars.has_key?(k)
             end if vars
 

data/lib/rake/delphi/projectinfo.rb

@@ -157,15 +157,23 @@ module Rake
 
       def make_deployment(files, classes, configuration)
         r = []
+        configuration = configuration.to_s
+        if configuration.empty?
+          warn 'WARNING! Platform configuration is not set, \'Debug\' is assumed!'
+          configuration = 'Debug'
+        end
         Logger.trace(Logger::TRACE, "Gathering deployment files for '#{configuration}'")
-        configuration = configuration.to_s.downcase.to_sym
+        configuration = configuration.downcase.to_sym
         files.each do |file, value|
           value = value[configuration]
-          next unless value
+          unless value
+            Logger.trace(Logger::TRACE, "Skip #{file}: it has no entity for the configuration")
+            next
+          end
           value_class = value['Class']
           _class = classes[value_class]
           if ['AndroidGDBServer', 'ProjectAndroidManifest'].include?(value_class)
-            Logger.trace(Logger::TRACE, "Skip #{file} of '#{value_class}'")
+            Logger.trace(Logger::TRACE, "Skip '#{file}' of '#{value_class}'")
             next
           end
           if is_special_class_for_bds_path(value_class)
@@ -173,7 +181,7 @@ module Rake
             # usually .dproj has full path to it
             # but we may have another path
             # so remove 'first' part
-            Logger.trace(Logger::TRACE, "#{file} of '#{value_class}' is a special case: prepend with $(BDS)")
+            Logger.trace(Logger::TRACE, "'#{file}' of '#{value_class}' is a special case: prepend with $(BDS)")
             file = file.gsub(/^.+(\\lib\\android\\)/, '$(BDS)\1')
           end
           remote_name = value['Platform'] ? value['Platform']['RemoteName'] : file.dos2unix_separator.pathmap('%f')
@@ -182,9 +190,6 @@ module Rake
             file = :project_so
           elsif value_class == 'ProjectFile'
             _class = value
-          elsif _class['Platform']['Operation'].to_i == 0
-            Logger.trace(Logger::TRACE, "Operation=0 for '#{value_class}'")
-            next
           else
             remote_dir = value['Platform']['RemoteDir'] if value['Platform']
           end
@@ -193,6 +198,7 @@ module Rake
           remote_dir += '\\'
           r << { file => [remote_dir, '1', remote_name] }
         end
+        warn "WARNING! There are no files for the platform configuration '#{configuration}'!" if r.empty?
         return r
       end
 

data/lib/rake/delphi/version.rb

@@ -2,6 +2,6 @@
 
 module Rake
   module Delphi
-    VERSION = '0.0.33'
+    VERSION = '0.0.34'
   end
 end

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

@@ -298,17 +298,17 @@
                         <RemoteName>ic_launcher.png</RemoteName>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="some\deployment\file\with\operation=0\class" Configuration="Debug" Class="File">
+                <DeployFile LocalName="resources\some-deployment-file-with-operation-eq-0-class" Configuration="Debug" Class="File">
                     <Platform Name="Android">
                         <RemoteName>release.conf</RemoteName>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="some\disabled\deployment\file\from\disabled.release.conf" Configuration="Release" Class="FileOperation0">
+                <DeployFile LocalName="resources\some-disabled-deployment-file-from-disabled.release.conf" Configuration="Release" Class="FileOperation0">
                     <Platform Name="Android">
                         <RemoteName>disabled.release.conf.file</RemoteName>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="some\deployment\file\from\enabled.release.conf" Configuration="Release" Class="FileOperation1">
+                <DeployFile LocalName="resources\some-deployment-file-from-enabled.release.conf" Configuration="Release" Class="FileOperation1">
                     <Platform Name="Android">
                         <RemoteName>enabled.release.conf.file</RemoteName>
                     </Platform>

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

@@ -306,17 +306,17 @@
                         <RemoteName>ic_launcher.png</RemoteName>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="some\deployment\file\with\operation=0\class" Configuration="Debug" Class="File">
+                <DeployFile LocalName="resources\some-deployment-file-with-operation-eq-0-class" Configuration="Debug" Class="File">
                     <Platform Name="Android">
                         <RemoteName>release.conf</RemoteName>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="some\disabled\deployment\file\from\disabled.release.conf" Configuration="Release" Class="FileOperation0">
+                <DeployFile LocalName="resources\some-disabled-deployment-file-from-disabled.release.conf" Configuration="Release" Class="FileOperation0">
                     <Platform Name="Android">
                         <RemoteName>disabled.release.conf.file</RemoteName>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="some\deployment\file\from\enabled.release.conf" Configuration="Release" Class="FileOperation1">
+                <DeployFile LocalName="resources\some-deployment-file-from-enabled.release.conf" Configuration="Release" Class="FileOperation1">
                     <Platform Name="Android">
                         <RemoteName>enabled.release.conf.file</RemoteName>
                     </Platform>

data/test/resources/testproject/Rakefile.rb

@@ -32,6 +32,9 @@ namespace :test do
         _task = Rake::Task['test:compile']
         dpr = Rake.application.define_task(Rake::Delphi::Project, (_task.name + ':delphi').to_sym)
         dpr[:quiet] = true
+        # always reset :map
+        dpr[:map] = false
+        dpr[:boolean] = :fast
         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.dpr

@@ -52,6 +52,15 @@ end;
 
 var
   s: string;
+
+{$IFDEF TEST_BOOLEAN_EXPRESSIONS}
+function WriteIfFullBooleanExpressions(): Boolean;
+begin
+  s := s + '-=BOOLEAN EXPRESSION=-';
+  Result := False;
+end;
+{$ENDIF TEST_BOOLEAN_EXPRESSIONS}
+
 begin
   {$IFDEF DEBUG}
   Write('DEBUG: ');
@@ -84,5 +93,9 @@ begin
       Free;
     end;
   {$ENDIF}
+  {$IFDEF TEST_BOOLEAN_EXPRESSIONS}
+  if False and WriteIfFullBooleanExpressions() then
+    ;
+  {$ENDIF TEST_BOOLEAN_EXPRESSIONS}
   WriteLn('testproject works', s);
 end.

data/test/test-delphi.rb

@@ -16,6 +16,9 @@ module DelphiTests
 class TestDelphi < TestVerInfo
 private
     def _test_prepare(prepare_args)
+        # -$D+ flag is the default for dcc32, so turn off debuginfo explicitly
+        # if it's not set
+        prepare_args[:debuginfo] = false if prepare_args[:debuginfo].nil? && ! prepare_args[:debug]
         args = [:altercfg, :usecfg, :defines, :debuginfo, :debug, :includepaths]
         # reinitialize arguments (even absent ones)
         args.each do |arg|
@@ -40,13 +43,18 @@ private
         prepare_task.invoke(useresources, prepare_args)
     end
 
-    def _test_compile_and_output(prepare_args, output)
-        _test_prepare(prepare_args)
+    def _test_compile_and_output(prepare_args, output, check_map_file = false)
+        # we mayset `prepare_args` to nil to skip `_test_prepare`
+        _test_prepare(prepare_args) if prepare_args
         # reenable tasks (!!! after invoking 'test:prepare')
         task = ::Rake::Task['test:compile']
         task.reenable_chain
         task.invoke
 
+        unless check_map_file.nil?
+            assert_equal check_map_file, File.exists?(map_file), 'File %s existance' % map_file
+        end
+
         assert(File.exists?(exe), 'File %s does not exist' % exe)
         out = `#{exe}`.chomp
         assert_equal output, out, 'exe output'
@@ -56,13 +64,17 @@ private
         return PROJECT_EXE % name.gsub(/[():]/, '_')
     end
 
+    def map_file
+        exe.pathmap('%X.map')
+    end
+
 public
     def setup
         Rake::Delphi::Dcc32Tool.reinit
         ENV['DELPHI_DIR'] = nil
         super
         ENV['RAKE_DIR'] = PROJECT_PATH
-        [exe, PROJECT_PATH + '/resources.res', PROJECT_PATH + '/extended_resources.dres'].each do |file|
+        [exe, map_file, PROJECT_PATH + '/resources.res', PROJECT_PATH + '/extended_resources.dres'].each do |file|
             File.unlink(file) if File.exists?(file)
         end
         require PROJECT_PATH + '/Rakefile.rb'
@@ -85,9 +97,45 @@ public
             'DEBUG: testproject works')
     end
 
-    def test_compile_debug_info
+    def test_compile_boolean_expressions_fast
+        _test_compile_and_output({:defines => 'TEST_BOOLEAN_EXPRESSIONS'},
+            'testproject works')
+    end
+
+    def test_compile_boolean_expressions_full
+        _test_compile_and_output({:boolean => :full,
+          :defines => 'TEST_BOOLEAN_EXPRESSIONS'},
+            'testproject works-=BOOLEAN EXPRESSION=-')
+    end
+
+    def test_compile_debug_only_on
+        _test_compile_and_output({:debug => true},
+            'D+: testproject works', true)
+    end
+
+    def test_compile_debug_only_off
+        _test_compile_and_output({:debug => false},
+            'testproject works')
+    end
+
+    def test_compile_debuginfo_only_on
+        _test_compile_and_output({:debuginfo => true},
+            'D+: testproject works', false)
+    end
+
+    def test_compile_debuginfo_map
+        _test_compile_and_output({:debuginfo => true, :map => :detail},
+            'D+: testproject works', true)
+    end
+
+    def test_compile_debuginfo_only_off
+        _test_compile_and_output({:debuginfo => false},
+            'testproject works')
+    end
+
+    def test_compile_debug_debuginfo
         _test_compile_and_output({:debug => true, :debuginfo => true},
-            'D+: testproject works')
+            'D+: testproject works', true)
     end
 
     def test_compile_with_resources
@@ -155,6 +203,13 @@ public
             'testproject works-=WITH EXPLICIT LIBS=-')
     end
 
+    def test_compile_with_explicit_libs_twice
+        test_compile_with_explicit_libs
+        # invoke 'test:compile' and run again but without 'test:prepare'
+        _test_compile_and_output(nil,
+            'testproject works-=WITH EXPLICIT LIBS=-')
+    end
+
     def test_compile_with_explicit_and_implicit_libs
         paths = ['./ExplicitLib/']
         _test_compile_and_output({:defines => 'LIBS,EXPLICIT_LIBS',

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

@@ -56,6 +56,24 @@ module DelphiAndroidTests
       assert_equal 'Test project comment', @info['Comments']
     end
 
+    def test_deploy_files_Android_implicit_debug_configuration
+      tested_deploymentFiles = []
+      tested_deploymentFiles_prefixes = { 36 => 'l', 48 => 'm', 72 => 'h', 96 => 'xh', 144 => 'xxh'}
+      [36, 48, 72, 96, 144].each do |n|
+        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.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'
+      tested_deploymentFiles << '$(BDS)\lib\android\debug\armeabi\libnative-activity.so,library\lib\armeabi\,1,libTestProject.so'
+      tested_deploymentFiles << 'resources\some-deployment-file-with-operation-eq-0-class,.\,1,release.conf'
+      deploymentfiles = @info.deploymentfiles('Android', nil)
+
+      _test_deploy_files(deploymentfiles, tested_deploymentFiles)
+    end
+
     def test_deploy_files_Android_Debug
       tested_deploymentFiles = []
       tested_deploymentFiles_prefixes = { 36 => 'l', 48 => 'm', 72 => 'h', 96 => 'xh', 144 => 'xxh'}
@@ -68,6 +86,7 @@ module DelphiAndroidTests
       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'
       tested_deploymentFiles << '$(BDS)\lib\android\debug\armeabi\libnative-activity.so,library\lib\armeabi\,1,libTestProject.so'
+      tested_deploymentFiles << 'resources\some-deployment-file-with-operation-eq-0-class,.\,1,release.conf'
       deploymentfiles = @info.deploymentfiles('Android', 'Debug')
 
       _test_deploy_files(deploymentfiles, tested_deploymentFiles)
@@ -77,11 +96,19 @@ module DelphiAndroidTests
       tested_deploymentFiles = []
       # libnative-activity.so must present both in Release and Debug configurations
       tested_deploymentFiles << '$(BDS)\lib\android\debug\mips\libnative-activity.so,library\lib\mips\,1,libTestProject.release.so'
-      tested_deploymentFiles << 'some\deployment\file\from\enabled.release.conf,.\,1,enabled.release.conf.file'
+      tested_deploymentFiles << 'resources\some-deployment-file-from-enabled.release.conf,.\,1,enabled.release.conf.file'
+      tested_deploymentFiles << 'resources\some-disabled-deployment-file-from-disabled.release.conf,.\,1,disabled.release.conf.file'
       deploymentfiles = @info.deploymentfiles('Android', 'Release')
 
       _test_deploy_files(deploymentfiles, tested_deploymentFiles)
     end
+
+    def test_deploy_files_Android_incorrect_configuration
+      tested_deploymentFiles = []
+      deploymentfiles = @info.deploymentfiles('Android', 'absent configuration')
+
+      assert_equal deploymentfiles, tested_deploymentFiles
+    end
   end
 
 end

data/test/test-projectinfo-android.rb

@@ -56,6 +56,20 @@ module DelphiAndroidTests
       assert_equal 'Test project comment', @info['Comments']
     end
 
+    def test_deploy_files_Android_implicit_debug_configuration
+      tested_deploymentFiles = []
+      tested_deploymentFiles_prefixes = { 36 => 'l', 48 => 'm', 72 => 'h', 96 => 'xh', 144 => 'xxh'}
+      [36, 48, 72, 96, 144].each do |n|
+        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.debug.dex'
+      tested_deploymentFiles << 'resources\some-deployment-file-with-operation-eq-0-class,.\,1,release.conf'
+      deploymentfiles = @info.deploymentfiles('Android', nil)
+
+      _test_deploy_files(deploymentfiles, tested_deploymentFiles)
+    end
+
     def test_deploy_files_Android_Debug
       tested_deploymentFiles = []
       tested_deploymentFiles_prefixes = { 36 => 'l', 48 => 'm', 72 => 'h', 96 => 'xh', 144 => 'xxh'}
@@ -64,6 +78,7 @@ module DelphiAndroidTests
       end
       tested_deploymentFiles << 'project_so,library\lib\armeabi\,1,libTestProject.so'
       tested_deploymentFiles << '$(BDS)\lib\android\debug\classes.dex,classes\,1,classes.debug.dex'
+      tested_deploymentFiles << 'resources\some-deployment-file-with-operation-eq-0-class,.\,1,release.conf'
       deploymentfiles = @info.deploymentfiles('Android', 'Debug')
 
       _test_deploy_files(deploymentfiles, tested_deploymentFiles)
@@ -71,13 +86,22 @@ module DelphiAndroidTests
 
     def test_deploy_files_Android_Release
       tested_deploymentFiles = []
-      tested_deploymentFiles << 'some\deployment\file\from\enabled.release.conf,.\,1,enabled.release.conf.file'
+      tested_deploymentFiles << 'resources\some-deployment-file-from-enabled.release.conf,.\,1,enabled.release.conf.file'
       # classes.dex must present both in Release and Debug configurations
       tested_deploymentFiles << '$(BDS)\lib\android\debug\classes.dex,classes\,1,classes.release.dex'
+      tested_deploymentFiles << 'resources\some-deployment-file-from-enabled.release.conf,.\,1,enabled.release.conf.file'
+      tested_deploymentFiles << 'resources\some-disabled-deployment-file-from-disabled.release.conf,.\,1,disabled.release.conf.file'
       deploymentfiles = @info.deploymentfiles('Android', 'Release')
 
       _test_deploy_files(deploymentfiles, tested_deploymentFiles)
     end
+
+    def test_deploy_files_Android_incorrect_configuration
+      tested_deploymentFiles = []
+      deploymentfiles = @info.deploymentfiles('Android', 'absent configuration')
+
+      assert_equal deploymentfiles, tested_deploymentFiles
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-delphi
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.34
 platform: ruby
 authors:
 - Alexey Shumkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -189,9 +189,9 @@ files:
 - test/resources/testproject-android/local.resources.txt
 - test/resources/testproject-android/release.dcc.cfg
 - test/resources/testproject-android/resources.rc
+- test/resources/testproject-android/resources/some-deployment-file-with-operation-eq-0-class
 - test/resources/testproject/ExplicitLib/ExplicitLibUnit.pas
 - test/resources/testproject/Rakefile.rb
-- test/resources/testproject/extended_resources.dres
 - test/resources/testproject/lib/AnyLib/LibUnit.pas
 - test/resources/testproject/local.resources.ext.txt
 - test/resources/testproject/local.resources.txt
@@ -275,9 +275,9 @@ test_files:
 - test/resources/testproject-android/local.resources.txt
 - test/resources/testproject-android/release.dcc.cfg
 - test/resources/testproject-android/resources.rc
+- test/resources/testproject-android/resources/some-deployment-file-with-operation-eq-0-class
 - test/resources/testproject/ExplicitLib/ExplicitLibUnit.pas
 - test/resources/testproject/Rakefile.rb
-- test/resources/testproject/extended_resources.dres
 - test/resources/testproject/lib/AnyLib/LibUnit.pas
 - test/resources/testproject/local.resources.ext.txt
 - test/resources/testproject/local.resources.txt