rake-delphi 0.0.9 → 0.0.11

data/test/resources/testproject-android/fmTest.fmx

@@ -0,0 +1,26 @@
+object TestForm: TTestForm
+  Left = 0
+  Top = 0
+  Caption = 'TestForm'
+  ClientHeight = 567
+  ClientWidth = 384
+  FormFactor.Width = 320
+  FormFactor.Height = 480
+  FormFactor.Devices = [dkDesktop]
+  DesignerMobile = True
+  DesignerWidth = 384
+  DesignerHeight = 592
+  DesignerDeviceName = 'Google Nexus 4'
+  DesignerOrientation = 0
+  DesignerOSVersion = ''
+  object Button1: TButton
+    Height = 44.000000000000000000
+    Position.X = 24.000000000000000000
+    Position.Y = 32.000000000000000000
+    TabOrder = 0
+    Text = 'HW'
+    Trimming = ttCharacter
+    Width = 145.000000000000000000
+    OnClick = Button1Click
+  end
+end

data/test/resources/testproject-android/fmTest.pas

@@ -0,0 +1,31 @@
+unit fmTest;
+
+interface
+
+uses
+  System.SysUtils, System.Types, System.UITypes, System.Classes, System.Variants,
+  FMX.Types, FMX.Controls, FMX.Forms, FMX.Graphics, FMX.Dialogs, FMX.StdCtrls;
+
+type
+  TTestForm = class(TForm)
+    Button1: TButton;
+    procedure Button1Click(Sender: TObject);
+  private
+    { Private declarations }
+  public
+    { Public declarations }
+  end;
+
+var
+  TestForm: TTestForm;
+
+implementation
+
+{$R *.fmx}
+
+procedure TTestForm.Button1Click(Sender: TObject);
+begin
+  ShowMessage('Hello, world!');
+end;
+
+end.

data/test/resources/testproject-android/local.resources.txt

@@ -0,0 +1 @@
+-=WITH RESOURCES=-

data/test/resources/testproject-android/release.dcc.cfg

@@ -0,0 +1 @@
+-DRELEASE_CFG

data/test/resources/testproject-android/resources.rc

@@ -0,0 +1 @@
+LOCAL_RESOURCES     RCDATA  local.resources.txt

data/test/resources/testproject/Rakefile.rb

@@ -30,7 +30,7 @@ namespace :test do
     desc 'Preparation'
     task :prepare, :useresources, :options do |t, opts|
         _task = Rake::Task['test:compile']
-        dpr = Rake.application.define_task(Rake::Delphi::Project, (_task.shortname + ':delphi').to_sym)
+        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
             dpr[:platform] = 'Win32'

data/test/test-delphi-android.rb

@@ -0,0 +1,192 @@
+# vim: set shiftwidth=2 tabstop=2 expandtab:
+# encoding: utf-8
+
+require 'rake'
+require 'fileutils'
+require 'test/unit'
+require 'rake/delphi/dccaarmtool'
+require 'rake/helpers/unittest'
+require 'rake/helpers/raketask'
+require 'helpers/consts'
+require 'helpers/verinfo'
+require 'zip/zip'
+require 'apktools/apkxml'
+require 'xmlsimple'
+
+module DelphiAndroidTests
+
+  class TestDelphiAndroid < DelphiTests::TestVerInfo
+  public
+    def project_path
+      PROJECT_PATH
+    end
+
+    def project_name
+      PROJECT_APK.pathmap('%n')
+    end
+
+  private
+    REQUIRED_FILES = %Q[META-INF/MANIFEST.MF
+        META-INF/ANDROIDD.SF
+        META-INF/ANDROIDD.RSA
+        lib/armeabi/libTestProject.so
+        AndroidManifest.xml
+        classes.dex
+        resources.arsc
+        res/drawable-hdpi/ic_launcher.png
+        res/drawable-ldpi/ic_launcher.png
+        res/drawable-mdpi/ic_launcher.png
+        res/drawable-xhdpi/ic_launcher.png
+        res/drawable-xxhdpi/ic_launcher.png].split(/\s+/)
+
+    def _test_apk(apk)
+      entries = []
+      Zip::ZipFile.open(apk) do |zip|
+        zip.each do |entry|
+          # test all files in .apk
+          assert REQUIRED_FILES.include?(entry.to_s), entry.to_s
+          entries << entry.to_s
+        end
+      end
+      REQUIRED_FILES.each do |file|
+        # test all required file
+        assert entries.include?(file), file
+      end
+      xml = ApkXml.new(apk)
+      manifest = xml.parse_xml('AndroidManifest.xml')
+      xml_hash = XmlSimple.xml_in(manifest, :ForceArray => false)
+      assert_equal '0x2', xml_hash['android:versionCode'], 'versionCode'
+      assert_equal '1.3.2.4', xml_hash['android:versionName'], 'versionName'
+      assert_equal 'TestProject', xml_hash['application']['activity']['meta-data']['android:value'], '<application><meta-data android:value>'
+    end
+
+    def _test_compile_and_output(prepare_args, output)
+      args = [:altercfg, :usecfg, :defines, :debuginfo, :debug, :includepaths]
+      # reinitialize arguments (even absent ones)
+      args.each do |arg|
+        prepare_args[arg] = prepare_args[arg]
+      end
+
+      bin_dir = File.dirname(apk)
+      dcu_dir_rel = '../../../tmp/android/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_android:prepare']
+      prepare_task.reenable
+      # prepare arguments
+      useresources = prepare_args[:useresources]
+      prepare_args.delete(:useresources)
+      prepare_args[:bin] = bin_dir
+      prepare_args[:version] = '1.3.2.4'
+
+      prepare_task.invoke(useresources, prepare_args)
+
+      # reenable tasks (!!! after invoking 'test_android:prepare')
+      task = ::Rake::Task['test_android:compile']
+      task.reenable_chain
+      task.invoke
+
+      assert(File.exists?(apk), 'File %s does not exist' % apk)
+
+      _test_apk(apk)
+    end
+
+    def apk
+      return PROJECT_APK % name.gsub(/[():]/, '_')
+    end
+
+  public
+    def setup
+      fail 'Cannot compile this project with Delphi below XE5' if ENV['DELPHI_VERSION'].to_i < 18
+      Rake::Delphi::DccARMTool.reinit
+      ENV['DELPHI_DIR'] = nil
+      super
+      ENV['RAKE_DIR'] = PROJECT_PATH
+      File.unlink(apk) if File.exists?(apk)
+      res = PROJECT_PATH + '/resources.res'
+      File.unlink(res) if File.exists?(res)
+      require PROJECT_PATH + '/Rakefile.rb'
+    end
+
+    def test_compile
+      _test_compile_and_output({},
+                               'testproject works')
+    end
+
+    def test_compile_defines
+      _test_compile_and_output({:defines => 'DEBUG'},
+                               'DEBUG: testproject works')
+    end
+
+    def test_compile_debug_info
+      _test_compile_and_output({:debug => true, :debuginfo => true},
+                               'D+: testproject works')
+    end
+
+    def test_compile_with_resources
+      _test_compile_and_output({:useresources => true, :defines => 'RESOURCES'},
+                               'testproject works-=WITH RESOURCES=-')
+    end
+
+    def test_compile_with_libs
+      _test_compile_and_output({:useresources => true, :defines => 'LIBS'},
+                               'testproject works-=WITH LIBS=-')
+    end
+
+    def test_compile_with_resources_and_libs
+      _test_compile_and_output({:useresources => true, :defines => 'RESOURCES,LIBS'},
+                               'testproject works-=WITH RESOURCES=--=WITH LIBS=-')
+    end
+
+    def test_compile_consts
+      _test_compile_and_output({:defines => 'ASSIGNABLE_CONSTS', :writeableconst => true},
+                               'testproject works-=ASSIGNED CONST=-')
+    end
+
+    def test_compile_alter_cfg
+      _test_compile_and_output({:altercfg => 'release.dcc.cfg'},
+                               'testproject works-=RELEASE=-')
+    end
+
+    def test_compile_use_config
+      _test_compile_and_output({:usecfg => true},
+                               'testproject works-=CONFIG=-')
+    end
+
+    def test_compile_use_absent_config
+      RakeFileUtils.verbose(Rake::Delphi::Logger.debug?) do
+        cfg = PROJECT_PATH.pathmap('%p%s') + PROJECT_APK.pathmap('%n.cfg')
+        mv cfg, cfg.pathmap('%X.absent.cfg')
+        begin
+          _test_compile_and_output({:usecfg => true},
+                                   'testproject works')
+        ensure
+          mv cfg.pathmap('%X.absent.cfg'), cfg
+        end
+      end
+    end
+
+    def test_compile_use_library_path
+      # usually Indy components are in Delphi library paths
+      _test_compile_and_output({:defines => 'INDY', :uselibrarypath => true},
+                               'testproject works-=indy#path=-')
+    end
+
+    def test_compile_with_explicit_libs
+      paths = ['./ExplicitLib/']
+      _test_compile_and_output({:defines => 'EXPLICIT_LIBS',
+                                :includepaths => paths},
+                                'testproject works-=WITH EXPLICIT LIBS=-')
+    end
+
+    def test_compile_with_explicit_and_implicit_libs
+      paths = ['./ExplicitLib/']
+      _test_compile_and_output({:defines => 'LIBS,EXPLICIT_LIBS',
+                                :includepaths => paths},
+                                'testproject works-=WITH LIBS=--=WITH EXPLICIT LIBS=-')
+    end
+  end
+
+end

data/test/test-delphi.rb

@@ -7,6 +7,7 @@ require 'rake/delphi'
 require 'rake/delphi/project'
 require 'rake/delphi/tool'
 require 'rake/helpers/unittest'
+require 'rake/helpers/raketask'
 require 'helpers/consts'
 require 'helpers/verinfo'
 
@@ -14,15 +15,6 @@ module DelphiTests
 
 class TestDelphi < TestVerInfo
 private
-    def reenable_tasks(task)
-        return unless task.class <= Rake::Task
-        task.reenable
-        task.prerequisites.each do |ptask|
-            ptask.reenable if ptask.class < Rake::Task
-            reenable_tasks(ptask)
-        end
-    end
-
     def _test_compile_and_output(prepare_args, output)
         args = [:altercfg, :usecfg, :defines, :debuginfo, :debug, :includepaths]
         # reinitialize arguments (even absent ones)
@@ -31,7 +23,7 @@ private
         end
 
         bin_dir = File.dirname(exe)
-        dcu_dir_rel = '../../tmp/dcu'
+        dcu_dir_rel = '../../../../tmp/win32/dcu'
         dcu_dir = bin_dir + '/../' + dcu_dir_rel
         FileUtils.mkdir_p(bin_dir)
         FileUtils.mkdir_p(dcu_dir)
@@ -48,7 +40,7 @@ private
 
         # reenable tasks (!!! after invoking 'test:prepare')
         task = ::Rake::Task['test:compile']
-        reenable_tasks(task)
+        task.reenable_chain
         task.invoke
 
         assert(File.exists?(exe), 'File %s does not exist' % exe)

data/test/test-envvariables.rb

@@ -18,6 +18,13 @@ class TestEnvVariables < Test::Unit::TestCase
         assert_equal('c:/delphi directory/Lib', env_vars['BDSLIB'])
         assert_equal('Platform: BDS platform', env_vars.expand('Platform: $(BDS_PLATFORM)'))
         assert_equal('Platform: BDS platform case', env_vars.expand('Platform: $(bds_platform_case)'))
+
         assert_equal('Env: $(BDS_NON_EXISTANT)', env_vars.expand('Env: $(BDS_NON_EXISTANT)'))
+
+        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'])
+        # 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
 end

data/test/test-gemversion.rb

@@ -28,6 +28,17 @@ public
         assert_equal '1,2,3,4', Gem::VersionImproved.new('1.2.3.4').comma
     end
 
+    def test_release_num
+        @version = Gem::VersionImproved.new('1.2.3.4')
+        assert_equal 3, @version.release_num
+
+        @version = Gem::VersionImproved.new('1.2.3')
+        assert_equal 2, @version.release_num
+
+        @version = Gem::VersionImproved.new('1.2')
+        assert_equal 1, @version.release_num
+    end
+
     def test_prev_release
         @version = Gem::VersionImproved.new('1.2.3.4')
         assert_equal '1.2.2', @version.prev_release.version

data/test/test-projectinfo-android.rb

@@ -0,0 +1,81 @@
+# encoding: Windows-1251
+# vim: set shiftwidth=2 tabstop=2 expandtab:
+
+require 'rake'
+require 'test/unit'
+require 'rake/delphi'
+require 'rake/delphi/projectinfo'
+require 'rake/delphi/dcc32'
+require 'rake/helpers/unittest'
+require 'helpers/consts'
+require 'helpers/verinfo'
+
+module DelphiAndroidTests
+
+  class TestVersionInfo < DelphiTests::TestVerInfo
+  private
+    def version
+      'XE5'
+    end
+
+  protected
+    def delphi_version
+      return '18'
+    end
+
+    def do_getinfo
+      @info = Rake::Delphi::XEVersionInfo.new(@rake_task)
+    end
+
+    def project_path
+      PROJECT_PATH
+    end
+
+    def project_name
+      PROJECT_APK.pathmap('%n')
+    end
+
+  public
+    def setup
+      super
+      @rake_task = Rake::Delphi::Dcc32Task.new('some-task-' + name, Rake.application)
+      @rake_task.systempath = project_path + '/TestProject.dpr'
+      do_getinfo
+    end
+
+    def test_info
+      return unless prepare_ver_info_file?
+      assert_equal '4.3.2.1', @info['FileVersion']
+      assert_equal 'Rake', @info['CompanyName']
+      assert_equal 'Test rake-delphi project %s description' % version, @info['FileDescription']
+      assert_equal 'testproject.exe', @info['InternalName']
+      assert_equal 'Copyright. ��������', @info['LegalCopyright']
+      assert_equal 'Trademark. �������� �����', @info['LegalTrademarks']
+      assert_equal 'testproject.exe', @info['OriginalFilename']
+      assert_equal 'Test rake-delphi project %s product name' % version, @info['ProductName']
+      assert_equal '1.2.3.4', @info['ProductVersion']
+      assert_equal 'Test project comment', @info['Comments']
+    end
+
+    def test_deploy_files
+      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.dex'
+      deploymentfiles = @info.deploymentfiles('Android')
+      assert deploymentfiles.kind_of?(Array), 'NOT an Array?!'
+      assert_not_equal 0, deploymentfiles.size, 'No files?!'
+      deploymentfiles.each do |dfile|
+        assert dfile.kind_of?(Hash), 'NOT a Hash?!'
+        assert_equal 1, dfile.keys.count, 'More than one value?!'
+        assert dfile.keys.first.kind_of?(String) || dfile.keys.first.kind_of?(Symbol), 'Key is NOT a String or Symbol?!'
+        assert dfile.values.first.kind_of?(Array), 'Value is NOT an Array?!'
+        assert tested_deploymentFiles.include?(dfile.to_a.join(',')), dfile.to_a.join(',')
+      end
+    end
+  end
+
+end

data/test/test-projectinfo.rb

@@ -9,17 +9,6 @@ require 'rake/helpers/unittest'
 require 'helpers/consts'
 require 'helpers/verinfo'
 
-module Rake
-    module Delphi
-        class BDSVersionInfo
-            # override method
-            def self.encoding
-                'Windows-1251'
-            end
-        end
-    end
-end
-
 module DelphiTests
 
 class TestBDSVersionInfo < TestVerInfo