rake-delphi 0.0.12 → 0.0.13

data/lib/rake/delphi/dcc32.rb

@@ -45,6 +45,7 @@ module Rake
             @dccToolClass ||= Dcc32Tool
             @dccToolClass.reinit
             @dccTool = @dccToolClass.new(checkExistance)
+            Logger.trace(Logger::DEBUG, name + ': DCC tool set: ' + @dccToolClass.to_s)
         end
 
         # used in tests
@@ -87,8 +88,6 @@ module Rake
                 @dccToolClass = DccARMTool
                 post_needed = true
             end
-            recreate_dcc_tool
-            Logger.trace(Logger::DEBUG, 'DCC tool set: ' + @dccToolClass.to_s)
             # enable appropriate PAClientTask
             application[name + ':post'].needed = post_needed
             # for XE and above set default aliases and namespaces
@@ -274,6 +273,7 @@ module Rake
 
         def execute(opts=nil)
             super
+            recreate_dcc_tool
             @dccTool.class.checkToolFailure(@dccTool.toolpath)
             fail "Could not find #{_source} to compile" unless @_source && File.exists?(@_source)
             init_libs

data/lib/rake/delphi/version.rb

@@ -2,6 +2,6 @@
 
 module Rake
   module Delphi
-    VERSION = '0.0.12'
+    VERSION = '0.0.13'
   end
 end

data/test/resources/testproject-android/ExplicitLib/ExplicitLibUnit.pas

@@ -0,0 +1,17 @@
+unit ExplicitLibUnit;
+
+interface
+
+uses
+  SysUtils;
+
+function ExplicitLibUnitFunction: string;
+
+implementation
+
+function ExplicitLibUnitFunction: string;
+begin
+  Result := '-=WITH EXPLICIT LIBS=-';
+end;
+
+end.

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.dpr

@@ -4,12 +4,29 @@ uses
   System.StartUpCopy,
   FMX.MobilePreview,
   Forms,
+  SysUtils,
+  {$IFDEF LIBS}
+  LibUnit,
+  {$ENDIF LIBS}
+  {$IFDEF EXPLICIT_LIBS}
+  ExplicitLibUnit,
+  {$ENDIF}
   fmTest in 'fmTest.pas' {TestForm};
 
 {$R *.res}
 
+var
+  s: string;
 begin
+  s := EmptyStr;
+  {$IFDEF LIBS}
+  s := s + LibUnit.LibUnitFunction;
+  {$ENDIF LIBS}
+  {$IFDEF EXPLICIT_LIBS}
+  s := s + ExplicitLibUnit.ExplicitLibUnitFunction;
+  {$ENDIF EXPLICIT_LIBS}
   Application.Initialize;
   Application.CreateForm(TTestForm, TestForm);
+  TestForm.Caption := s;
   Application.Run;
 end.

data/test/resources/testproject-android/lib/AnyLib/LibUnit.pas

@@ -0,0 +1,17 @@
+unit LibUnit;
+
+interface
+
+uses
+  SysUtils;
+
+function LibUnitFunction: string;
+
+implementation
+
+function LibUnitFunction: string;
+begin
+  Result := '-=WITH LIBS=-';
+end;
+
+end.

data/test/resources/testproject/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/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 XE5 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 XE5 product name\0"
             VALUE "ProductVersion", "1.2.3.4\0"
             VALUE "Comments", "Test project comment\0"
 #ifdef DEBUG

data/test/test-delphi-android.rb

@@ -68,8 +68,8 @@ module DelphiAndroidTests
       end
 
       bin_dir = File.dirname(apk)
-      dcu_dir_rel = '../../../tmp/android/dcu'
-      dcu_dir = bin_dir + '/../' + dcu_dir_rel
+      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
@@ -80,6 +80,7 @@ module DelphiAndroidTests
       prepare_args.delete(:useresources)
       prepare_args[:bin] = bin_dir
       prepare_args[:version] = '1.3.2.4'
+      prepare_args[:dcu] = dcu_dir_rel.gsub('/', '\\')
 
       prepare_task.invoke(useresources, prepare_args)
 

data/test/test-delphi.rb

@@ -23,8 +23,8 @@ private
         end
 
         bin_dir = File.dirname(exe)
-        dcu_dir_rel = '../../../../tmp/win32/dcu'
-        dcu_dir = bin_dir + '/../' + dcu_dir_rel
+        dcu_dir_rel = '../../tmp/win32/dcu'
+        dcu_dir = bin_dir + '/../../' + dcu_dir_rel
         FileUtils.mkdir_p(bin_dir)
         FileUtils.mkdir_p(dcu_dir)
         # reenable task for subsequent calls

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-delphi
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -178,6 +178,7 @@ files:
 - test/resources/testproject/testproject.2007.dproj
 - test/resources/testproject/testproject.2010.dproj
 - test/resources/testproject/testproject.cfg
+- test/resources/testproject/testproject.cfg.1
 - test/resources/testproject/testproject.dpr
 - test/resources/testproject/testproject.ico
 - test/resources/testproject/testproject.rc
@@ -185,13 +186,17 @@ files:
 - test/resources/testproject/testproject.xe5.dproj
 - test/resources/testproject-android/AndroidManifest.erb
 - test/resources/testproject-android/AndroidManifest.xml
+- test/resources/testproject-android/ExplicitLib/ExplicitLibUnit.pas
 - test/resources/testproject-android/fmTest.fmx
 - test/resources/testproject-android/fmTest.pas
+- test/resources/testproject-android/lib/AnyLib/LibUnit.pas
 - test/resources/testproject-android/local.resources.txt
 - test/resources/testproject-android/Rakefile.rb
 - test/resources/testproject-android/release.dcc.cfg
 - test/resources/testproject-android/resources.rc
+- test/resources/testproject-android/resources.res
 - 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.res
@@ -258,6 +263,7 @@ test_files:
 - test/resources/testproject/testproject.2007.dproj
 - test/resources/testproject/testproject.2010.dproj
 - test/resources/testproject/testproject.cfg
+- test/resources/testproject/testproject.cfg.1
 - test/resources/testproject/testproject.dpr
 - test/resources/testproject/testproject.ico
 - test/resources/testproject/testproject.rc
@@ -265,13 +271,17 @@ test_files:
 - test/resources/testproject/testproject.xe5.dproj
 - test/resources/testproject-android/AndroidManifest.erb
 - test/resources/testproject-android/AndroidManifest.xml
+- test/resources/testproject-android/ExplicitLib/ExplicitLibUnit.pas
 - test/resources/testproject-android/fmTest.fmx
 - test/resources/testproject-android/fmTest.pas
+- test/resources/testproject-android/lib/AnyLib/LibUnit.pas
 - test/resources/testproject-android/local.resources.txt
 - test/resources/testproject-android/Rakefile.rb
 - test/resources/testproject-android/release.dcc.cfg
 - test/resources/testproject-android/resources.rc
+- test/resources/testproject-android/resources.res
 - 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.res