rake-delphi 0.0.12 → 0.0.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/rake/delphi/dcc32.rb +2 -2
- data/lib/rake/delphi/version.rb +1 -1
- data/test/resources/testproject-android/ExplicitLib/ExplicitLibUnit.pas +17 -0
- data/test/resources/testproject-android/TestProject.cfg.1 +8 -0
- data/test/resources/testproject-android/TestProject.dpr +17 -0
- data/test/resources/testproject-android/lib/AnyLib/LibUnit.pas +17 -0
- data/test/resources/testproject-android/resources.res +0 -0
- data/test/resources/testproject/testproject.cfg.1 +8 -0
- data/test/resources/testproject/testproject.rc +2 -2
- data/test/resources/testproject/testproject.res +0 -0
- data/test/test-delphi-android.rb +3 -2
- data/test/test-delphi.rb +2 -2
- metadata +12 -2
data/lib/rake/delphi/dcc32.rb
CHANGED
@@ -45,6 +45,7 @@ module Rake
|
|
45
45
|
@dccToolClass ||= Dcc32Tool
|
46
46
|
@dccToolClass.reinit
|
47
47
|
@dccTool = @dccToolClass.new(checkExistance)
|
48
|
+
Logger.trace(Logger::DEBUG, name + ': DCC tool set: ' + @dccToolClass.to_s)
|
48
49
|
end
|
49
50
|
|
50
51
|
# used in tests
|
@@ -87,8 +88,6 @@ module Rake
|
|
87
88
|
@dccToolClass = DccARMTool
|
88
89
|
post_needed = true
|
89
90
|
end
|
90
|
-
recreate_dcc_tool
|
91
|
-
Logger.trace(Logger::DEBUG, 'DCC tool set: ' + @dccToolClass.to_s)
|
92
91
|
# enable appropriate PAClientTask
|
93
92
|
application[name + ':post'].needed = post_needed
|
94
93
|
# for XE and above set default aliases and namespaces
|
@@ -274,6 +273,7 @@ module Rake
|
|
274
273
|
|
275
274
|
def execute(opts=nil)
|
276
275
|
super
|
276
|
+
recreate_dcc_tool
|
277
277
|
@dccTool.class.checkToolFailure(@dccTool.toolpath)
|
278
278
|
fail "Could not find #{_source} to compile" unless @_source && File.exists?(@_source)
|
279
279
|
init_libs
|
data/lib/rake/delphi/version.rb
CHANGED
@@ -4,12 +4,29 @@ uses
|
|
4
4
|
System.StartUpCopy,
|
5
5
|
FMX.MobilePreview,
|
6
6
|
Forms,
|
7
|
+
SysUtils,
|
8
|
+
{$IFDEF LIBS}
|
9
|
+
LibUnit,
|
10
|
+
{$ENDIF LIBS}
|
11
|
+
{$IFDEF EXPLICIT_LIBS}
|
12
|
+
ExplicitLibUnit,
|
13
|
+
{$ENDIF}
|
7
14
|
fmTest in 'fmTest.pas' {TestForm};
|
8
15
|
|
9
16
|
{$R *.res}
|
10
17
|
|
18
|
+
var
|
19
|
+
s: string;
|
11
20
|
begin
|
21
|
+
s := EmptyStr;
|
22
|
+
{$IFDEF LIBS}
|
23
|
+
s := s + LibUnit.LibUnitFunction;
|
24
|
+
{$ENDIF LIBS}
|
25
|
+
{$IFDEF EXPLICIT_LIBS}
|
26
|
+
s := s + ExplicitLibUnit.ExplicitLibUnitFunction;
|
27
|
+
{$ENDIF EXPLICIT_LIBS}
|
12
28
|
Application.Initialize;
|
13
29
|
Application.CreateForm(TTestForm, TestForm);
|
30
|
+
TestForm.Caption := s;
|
14
31
|
Application.Run;
|
15
32
|
end.
|
Binary file
|
@@ -37,13 +37,13 @@ BEGIN
|
|
37
37
|
BLOCK "041904E3"
|
38
38
|
BEGIN
|
39
39
|
VALUE "CompanyName", "Rake\0"
|
40
|
-
VALUE "FileDescription", "Test rake-delphi project
|
40
|
+
VALUE "FileDescription", "Test rake-delphi project XE5 description\0"
|
41
41
|
VALUE "FileVersion", "0.0.0.0\0"
|
42
42
|
VALUE "InternalName", "testproject.exe\0"
|
43
43
|
VALUE "LegalCopyright", "Copyright. ��������\0"
|
44
44
|
VALUE "LegalTrademarks", "Trademark. �������� �����\0"
|
45
45
|
VALUE "OriginalFilename", "testproject.exe\0"
|
46
|
-
VALUE "ProductName", "Test rake-delphi project
|
46
|
+
VALUE "ProductName", "Test rake-delphi project XE5 product name\0"
|
47
47
|
VALUE "ProductVersion", "1.2.3.4\0"
|
48
48
|
VALUE "Comments", "Test project comment\0"
|
49
49
|
#ifdef DEBUG
|
Binary file
|
data/test/test-delphi-android.rb
CHANGED
@@ -68,8 +68,8 @@ module DelphiAndroidTests
|
|
68
68
|
end
|
69
69
|
|
70
70
|
bin_dir = File.dirname(apk)
|
71
|
-
dcu_dir_rel = '
|
72
|
-
dcu_dir = bin_dir + '
|
71
|
+
dcu_dir_rel = '../../tmp/android/dcu'
|
72
|
+
dcu_dir = bin_dir + '/../../' + dcu_dir_rel
|
73
73
|
FileUtils.mkdir_p(bin_dir)
|
74
74
|
FileUtils.mkdir_p(dcu_dir)
|
75
75
|
# reenable task for subsequent calls
|
@@ -80,6 +80,7 @@ module DelphiAndroidTests
|
|
80
80
|
prepare_args.delete(:useresources)
|
81
81
|
prepare_args[:bin] = bin_dir
|
82
82
|
prepare_args[:version] = '1.3.2.4'
|
83
|
+
prepare_args[:dcu] = dcu_dir_rel.gsub('/', '\\')
|
83
84
|
|
84
85
|
prepare_task.invoke(useresources, prepare_args)
|
85
86
|
|
data/test/test-delphi.rb
CHANGED
@@ -23,8 +23,8 @@ private
|
|
23
23
|
end
|
24
24
|
|
25
25
|
bin_dir = File.dirname(exe)
|
26
|
-
dcu_dir_rel = '
|
27
|
-
dcu_dir = bin_dir + '
|
26
|
+
dcu_dir_rel = '../../tmp/win32/dcu'
|
27
|
+
dcu_dir = bin_dir + '/../../' + dcu_dir_rel
|
28
28
|
FileUtils.mkdir_p(bin_dir)
|
29
29
|
FileUtils.mkdir_p(dcu_dir)
|
30
30
|
# reenable task for subsequent calls
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rake-delphi
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.13
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2014-07-
|
12
|
+
date: 2014-07-24 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: bundler
|
@@ -178,6 +178,7 @@ files:
|
|
178
178
|
- test/resources/testproject/testproject.2007.dproj
|
179
179
|
- test/resources/testproject/testproject.2010.dproj
|
180
180
|
- test/resources/testproject/testproject.cfg
|
181
|
+
- test/resources/testproject/testproject.cfg.1
|
181
182
|
- test/resources/testproject/testproject.dpr
|
182
183
|
- test/resources/testproject/testproject.ico
|
183
184
|
- test/resources/testproject/testproject.rc
|
@@ -185,13 +186,17 @@ files:
|
|
185
186
|
- test/resources/testproject/testproject.xe5.dproj
|
186
187
|
- test/resources/testproject-android/AndroidManifest.erb
|
187
188
|
- test/resources/testproject-android/AndroidManifest.xml
|
189
|
+
- test/resources/testproject-android/ExplicitLib/ExplicitLibUnit.pas
|
188
190
|
- test/resources/testproject-android/fmTest.fmx
|
189
191
|
- test/resources/testproject-android/fmTest.pas
|
192
|
+
- test/resources/testproject-android/lib/AnyLib/LibUnit.pas
|
190
193
|
- test/resources/testproject-android/local.resources.txt
|
191
194
|
- test/resources/testproject-android/Rakefile.rb
|
192
195
|
- test/resources/testproject-android/release.dcc.cfg
|
193
196
|
- test/resources/testproject-android/resources.rc
|
197
|
+
- test/resources/testproject-android/resources.res
|
194
198
|
- test/resources/testproject-android/TestProject.cfg
|
199
|
+
- test/resources/testproject-android/TestProject.cfg.1
|
195
200
|
- test/resources/testproject-android/TestProject.dpr
|
196
201
|
- test/resources/testproject-android/TestProject.rc
|
197
202
|
- test/resources/testproject-android/TestProject.res
|
@@ -258,6 +263,7 @@ test_files:
|
|
258
263
|
- test/resources/testproject/testproject.2007.dproj
|
259
264
|
- test/resources/testproject/testproject.2010.dproj
|
260
265
|
- test/resources/testproject/testproject.cfg
|
266
|
+
- test/resources/testproject/testproject.cfg.1
|
261
267
|
- test/resources/testproject/testproject.dpr
|
262
268
|
- test/resources/testproject/testproject.ico
|
263
269
|
- test/resources/testproject/testproject.rc
|
@@ -265,13 +271,17 @@ test_files:
|
|
265
271
|
- test/resources/testproject/testproject.xe5.dproj
|
266
272
|
- test/resources/testproject-android/AndroidManifest.erb
|
267
273
|
- test/resources/testproject-android/AndroidManifest.xml
|
274
|
+
- test/resources/testproject-android/ExplicitLib/ExplicitLibUnit.pas
|
268
275
|
- test/resources/testproject-android/fmTest.fmx
|
269
276
|
- test/resources/testproject-android/fmTest.pas
|
277
|
+
- test/resources/testproject-android/lib/AnyLib/LibUnit.pas
|
270
278
|
- test/resources/testproject-android/local.resources.txt
|
271
279
|
- test/resources/testproject-android/Rakefile.rb
|
272
280
|
- test/resources/testproject-android/release.dcc.cfg
|
273
281
|
- test/resources/testproject-android/resources.rc
|
282
|
+
- test/resources/testproject-android/resources.res
|
274
283
|
- test/resources/testproject-android/TestProject.cfg
|
284
|
+
- test/resources/testproject-android/TestProject.cfg.1
|
275
285
|
- test/resources/testproject-android/TestProject.dpr
|
276
286
|
- test/resources/testproject-android/TestProject.rc
|
277
287
|
- test/resources/testproject-android/TestProject.res
|