-
-
Notifications
You must be signed in to change notification settings - Fork 16
/
Copy pathgnupoc-s60_50-patch
8414 lines (7800 loc) · 283 KB
/
gnupoc-s60_50-patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/abld b/abld
new file mode 100644
index 0000000..e273bf3
--- /dev/null
+++ b/abld
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# abld - shell frontend for abld.pl, part of GnuPoc project
+#
+# (c) 2001-2002 Alfred E. Heggestad
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+
+#
+# note: small tweak to get symlinks working. 'pwd' returns the path as seen
+# by `pwd` - but 'cwd' returns the real path, as used by the tool chain.
+# this also works if no symlinks are used:
+#
+# perl -S abld.pl `pwd`/ "$@"
+
+perl -S abld.pl `perl -e 'use Cwd; my $cwd = cwd(); print "$cwd/"'` "$@"
diff --git a/abld.pl b/abld.pl
index 3363ff5..ade2f58 100644
--- a/abld.pl
+++ b/abld.pl
@@ -1,3 +1,5 @@
+#!/usr/bin/perl -w
+#
# ABLD.PL
#
# Copyright (c) 1997-2007 Symbian Software Ltd. All rights reserved.
@@ -14,14 +16,13 @@ BEGIN {
require 5.005_03;
# establish the path to the Perl libraries: currently the same directory as this script
$PerlLibPath = $FindBin::Bin; # X:/epoc32/tools
- $PerlLibPath =~ s/\//\\/g; # X:\epoc32\tools
- $PerlLibPath .= "\\";
+ $PerlLibPath .= "\/";
}
use lib $PerlLibPath;
-use E32env;
-use CheckSource;
-use FCLoggerUTL;
+use e32env;
+use checksource;
+use fcloggerutl;
use featurevariantparser;
# command data structure
@@ -75,7 +76,7 @@ my %Commands=(
FREEZE=>{
program=>1,
remove=>1,
- function=>'Freezes exported functions in a .DEF file',
+ function=>'Freezes exported functions in a .def file',
},
HELP=>{
noplatform=>1,
@@ -84,7 +85,7 @@ my %Commands=(
},
LIBRARY=>{
program=>1,
- function=>'Creates import libraries from the frozen .DEF files',
+ function=>'Creates import libraries from the frozen .def files',
},
LISTING=>{
build=>1,
@@ -156,10 +157,10 @@ my $BldInfDir;
my $PrjBldDir;
BEGIN {
$BldInfDir=shift @ARGV;
- $PrjBldDir=$E32env::Data{BldPath};
- $PrjBldDir=~s-^(.*)\\-$1-o;
+ $PrjBldDir=$e32env::Data{BldPath};
+ $PrjBldDir=~s-^(.*)\/-$1-o;
$PrjBldDir.=$BldInfDir;
- $PrjBldDir=~m-(.*)\\-o; # remove backslash because some old versions of perl can't cope
+ $PrjBldDir=~m-(.*)\/-o; # remove backslash because some old versions of perl can't cope
unless (-d $1) {
die "ABLD ERROR: Project Bldmake directory \"$PrjBldDir\" does not exist\n";
}
@@ -167,12 +168,12 @@ BEGIN {
# check the platform module exists and then load it
BEGIN {
- unless (-e "${PrjBldDir}Platform.pm") {
- die "ABLD ERROR: \"${PrjBldDir}Platform.pm\" not yet created\n";
+ unless (-e "${PrjBldDir}platform.pm") {
+ die "ABLD ERROR: \"${PrjBldDir}platform.pm\" not yet created\n";
}
}
use lib $PrjBldDir;
-use Platform;
+use platform;
# change directory to the BLD.INF directory - we might begin to do
# things with relative paths in the future.
@@ -338,12 +339,12 @@ chdir($BldInfDir) or die "ABLD ERROR: Can't CD to \"$BldInfDir\"\n";
}
COMPARAM1 : {
- if (grep(/^$Plat$/, ('ALL', @Platform::Plats))) {
+ if (grep(/^$Plat$/i, ('ALL', @platform::Plats))) {
last COMPARAM1;
}
if ($Plat =~ /(.*)EDG$/) {
my $SubPlat = $1;
- if (grep(/^$SubPlat$/, ('ALL', @Platform::Plats))) {
+ if (grep(/^$SubPlat$/, ('ALL', @platform::Plats))) {
last COMPARAM1;
}
}
@@ -359,8 +360,8 @@ chdir($BldInfDir) or die "ABLD ERROR: Can't CD to \"$BldInfDir\"\n";
# check whether the platform might in fact be a program, and
# set the platform, build and program accordingly if it is
if ($CommandHash{program}) {
- if (((not $Test) and grep /^$Plat$/, @{$Platform::Programs{ALL}})
- or ($Test and grep /^$Plat$/, @{$Platform::TestPrograms{ALL}})) {
+ if (((not $Test) and grep /^$Plat$/, @{$platform::Programs{ALL}})
+ or ($Test and grep /^$Plat$/, @{$platform::TestPrograms{ALL}})) {
$Program=$Plat;
$Plat='ALL';
$Bld='ALL';
@@ -427,8 +428,8 @@ chdir($BldInfDir) or die "ABLD ERROR: Can't CD to \"$BldInfDir\"\n";
# check whether the build might in fact be a program, and
# set the build and program if it is
if ($CommandHash{program}) {
- if (((not $Test) and grep /^$Bld$/, @{$Platform::Programs{$Plat}})
- or ($Test and grep /^$Bld$/, @{$Platform::TestPrograms{$Plat}})) {
+ if (((not $Test) and grep /^$Bld$/, @{$platform::Programs{$Plat}})
+ or ($Test and grep /^$Bld$/, @{$platform::TestPrograms{$Plat}})) {
$Program=$Bld;
$Bld='ALL';
last COMPARAM2;
@@ -458,13 +459,13 @@ chdir($BldInfDir) or die "ABLD ERROR: Can't CD to \"$BldInfDir\"\n";
# get the program parameter for those commands which require it
if ($CommandHash{program}) {
unless ($Program) {
- unless ($Program=uc shift @ARGV) {
+ unless ($Program=shift @ARGV) {
$Program=''; #default - means ALL
}
else {
# check that the program is supported
- unless (((not $Test) and grep /^$Program$/, @{$Platform::Programs{$Plat}})
- or ($Test and grep /^$Program$/, @{$Platform::TestPrograms{$Plat}})) {
+ unless (((not $Test) and grep /^$Program$/, @{$platform::Programs{$Plat}})
+ or ($Test and grep /^$Program$/, @{$platform::TestPrograms{$Plat}})) {
my $Error="This project does not support $Test program \"$Program\"";
if ($Plat eq 'ALL') {
$Error.=" for any platform\n";
@@ -523,7 +524,7 @@ chdir($BldInfDir) or die "ABLD ERROR: Can't CD to \"$BldInfDir\"\n";
my @Plats;
unless ($CommandHash{noplatform}) {
if ($Plat eq 'ALL') {
- @Plats=@Platform::RealPlats;
+ @Plats=@platform::RealPlats;
# Adjust the "ALL" list according to the availability of compilers
@Plats=grep !/WINSCW$/o, @Plats unless (defined $ENV{MWSym2Libraries});
@Plats=grep !/WINS$/o, @Plats unless (defined $ENV{MSDevDir});
@@ -566,9 +567,10 @@ chdir($BldInfDir) or die "ABLD ERROR: Can't CD to \"$BldInfDir\"\n";
}
foreach $Plat (@Plats) {
+ my $lcplat = lc $Plat;
foreach my $makefileVariation (@{$MakefileVariations{$Plat}}) {
- unless (-e "$PrjBldDir$Plat$makefileVariation$Test.make") {
- die "ABLD ERROR: \"$PrjBldDir$Plat$makefileVariation$Test.make\" not yet created\n";
+ unless (-e "$PrjBldDir$lcplat$makefileVariation$Test.make") {
+ die "ABLD ERROR: \"$PrjBldDir$lcplat$makefileVariation$Test.make\" not yet created\n";
}
}
}
@@ -581,7 +583,7 @@ chdir($BldInfDir) or die "ABLD ERROR: Can't CD to \"$BldInfDir\"\n";
@Commands=@{$CommandHash{subcommands}};
if ($Command eq 'BUILD') { # avoid makefile listings here
if ($Options{what} or $Options{check}) {
- @Commands=grep !/^MAKEFILE$/o, @{$CommandHash{subcommands}};
+ @Commands=grep !/^MAKEFILE$/io, @{$CommandHash{subcommands}};
}
}
}
@@ -642,15 +644,18 @@ chdir($BldInfDir) or die "ABLD ERROR: Can't CD to \"$BldInfDir\"\n";
# handle the exports related calls first
if (($Command)=grep /^(.*EXPORT)$/o, @Commands) { # EXPORT, CLEANEXPORT
- unless (-e "${PrjBldDir}EXPORT$Test.make") {
- die "ABLD ERROR: \"${PrjBldDir}EXPORT$Test.make\" not yet created\n";
+ unless (-e "${PrjBldDir}export$Test.make") {
+ die "ABLD ERROR: \"${PrjBldDir}export$Test.make\" not yet created\n";
}
unless ($Options {checksource}) {
unless ($Options{what} or $Options{check}) {
- push @Calls, "make -r $KeepgoingFlag -f \"${PrjBldDir}EXPORT$Test.make\" $Command$VerboseMacro$KeepgoingMacro";
+# my $Command2 = uc $Command;
+# my $lc_command = lc $Command;
+ my $Command2 = $Command;
+ push @Calls, "make -r $KeepgoingFlag -f \"${PrjBldDir}export$Test.make\" $Command2$VerboseMacro$KeepgoingMacro";
}
else {
- push @Calls, "make -r -f \"${PrjBldDir}EXPORT$Test.make\" WHAT";
+ push @Calls, "make -r -f \"${PrjBldDir}export$Test.make\" WHAT";
}
}
@Commands=grep !/EXPORT$/o, @Commands;
@@ -661,7 +666,7 @@ chdir($BldInfDir) or die "ABLD ERROR: Can't CD to \"$BldInfDir\"\n";
COMMAND: foreach $Command (@Commands) {
if ($Options {checksource} && ($Command eq "TARGET" || $Command eq "SAVESPACE")) {
- push @Calls, "make -r -f \"".$PrjBldDir."EXPORT.make\"".$checksourceMakeVariables."CHECKSOURCE";
+ push @Calls, "make -r -f \"".$PrjBldDir."export.make\"".$checksourceMakeVariables."CHECKSOURCE";
}
my $Plat;
@@ -691,8 +696,9 @@ chdir($BldInfDir) or die "ABLD ERROR: Can't CD to \"$BldInfDir\"\n";
# You get CHECKSOURCE_GENERIC "for free" if no component is specified in the call
if ($Options {checksource} && ($Command eq "TARGET" || $Command eq "SAVESPACE") && $Program) {
+ my $lcplat = lc $Plat;
foreach my $makefileVariation (@{$MakefileVariations{$Plat}}) {
- push @Calls, "make -r -f \"$PrjBldDir$Plat$makefileVariation$Test.make\"".$checksourceMakeVariables."CHECKSOURCE_GENERIC";
+ push @Calls, "make -r -f \"$PrjBldDir$lcplat$makefileVariation$Test.make\"".$checksourceMakeVariables."CHECKSOURCE_GENERIC";
}
}
@@ -714,12 +720,12 @@ chdir($BldInfDir) or die "ABLD ERROR: Can't CD to \"$BldInfDir\"\n";
unless ($Options{what} or $Options{check}) {
if ($Program) { # skip programs if they're not supported for a platform
unless ($Test) {
- unless (grep /^$Program$/, @{$Platform::Programs{$Plat}}) {
+ unless (grep /^$Program$/, @{$platform::Programs{$Plat}}) {
next PLATFORM;
}
}
else {
- unless (grep /^$Program$/, @{$Platform::TestPrograms{$Plat}}) {
+ unless (grep /^$Program$/, @{$platform::TestPrograms{$Plat}}) {
next PLATFORM;
}
}
@@ -736,7 +742,8 @@ chdir($BldInfDir) or die "ABLD ERROR: Can't CD to \"$BldInfDir\"\n";
}
}
foreach my $makefileVariation (@{$MakefileVariations{$Plat}}) {
- push @Calls, "make -r $KeepgoingFlag -f \"$PrjBldDir$Plat$makefileVariation$Test.make\" $Command$Program$CFG$Source$VerboseMacro$KeepgoingMacro$RemoveMacro$NoDependencyMacro$AbldFlagsMacroTmp$CompilerWrapperFlagMacroTemp";
+ my $lcplat = lc $Plat;
+ push @Calls, "make -r $KeepgoingFlag -f \"$PrjBldDir$lcplat$makefileVariation$Test.make\" $Command$Program$CFG$Source$VerboseMacro$KeepgoingMacro$RemoveMacro$NoDependencyMacro$AbldFlagsMacroTmp$CompilerWrapperFlagMacroTemp";
#Compiler Wrapper support
if ( ($Options{wrap}) && ($Command eq "TARGET") )
@@ -746,7 +753,7 @@ chdir($BldInfDir) or die "ABLD ERROR: Can't CD to \"$BldInfDir\"\n";
{
$CFGCOMPWRAP =" CFG=COMPWRAP".$LoopBld;
}
- push @Calls, "make -r $KeepgoingFlag -f \"$PrjBldDir$Plat$makefileVariation$Test.make\""." TARGET$Program$CFGCOMPWRAP";
+ push @Calls, "make -r $KeepgoingFlag -f \"$PrjBldDir$lcplat$makefileVariation$Test.make\""." TARGET$Program$CFGCOMPWRAP";
}
}
next;
@@ -757,23 +764,24 @@ chdir($BldInfDir) or die "ABLD ERROR: Can't CD to \"$BldInfDir\"\n";
}
if ($Program) { # skip programs if they're not supported for a platform
unless ($Test) {
- unless (grep /^$Program$/, @{$Platform::Programs{$Plat}}) {
+ unless (grep /^$Program$/, @{$platform::Programs{$Plat}}) {
next PLATFORM;
}
}
else {
- unless (grep /^$Program$/, @{$Platform::TestPrograms{$Plat}}) {
+ unless (grep /^$Program$/, @{$platform::TestPrograms{$Plat}}) {
next PLATFORM;
}
}
}
my $Makefile='';
- if ($Command=~/MAKEFILE$/o) {
+ if ($Command=~/MAKEFILE$/io) {
$Makefile='MAKEFILE';
}
foreach my $makefileVariation (@{$MakefileVariations{$Plat}}) {
- push @Calls, "make -r -f \"$PrjBldDir$Plat$makefileVariation$Test.make\" WHAT$Makefile$Program $CFG";
+ my $lcplat = lc $Plat;
+ push @Calls, "make -r -f \"$PrjBldDir$lcplat$makefileVariation$Test.make\" WHAT$Makefile$Program $CFG";
}
}
}
@@ -853,7 +861,7 @@ ENDHERESTRING
print
"project platforms:\n",
- " @Platform::Plats\n"
+ " @platform::Plats\n"
;
if (%Platform::FeatureVariantSupportingPlats)
@@ -903,7 +911,7 @@ sub Help ($) {
my %CommandHash=%{$Commands{$Command}};
- print 'ABLD';
+ print 'abld';
unless ($CommandHash{notest}) {
print ' [test]';
}
diff --git a/aiftool b/aiftool
new file mode 100644
index 0000000..5d2ae14
--- /dev/null
+++ b/aiftool
@@ -0,0 +1,74 @@
+#! /bin/bash
+#
+# aiftool - Unix frontend for aiftool.exe
+#
+# (c) 2001-2006 Alfred E. Heggestad
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Arguments:
+#
+# $1 input resource filename
+# $2 input mbmname
+#
+
+usage()
+{
+echo 'AIFTOOL filename mbmname'
+echo 'Use this command to produce an AIF from'
+echo '- a resource file containing language, caption'
+echo ' and capability specifications'
+echo '- a multi-bitmap file containing icons and masks'
+echo ' in various sizes'
+echo 'Specify'
+echo ' filename: the name of the input resource file; the'
+echo ' .rss extension is added by AIFTOOL'
+echo ' mbmname: the name of the input .mbm file: you'
+echo ' must specify the extension'
+}
+
+echo AIF tool
+
+#
+# check arguments - need at least 2 of them
+#
+if [ $# -lt 2 ] ; then usage ; exit 0 ; fi
+if [ $1 = "" ] ; then usage ; exit 0 ; fi
+if [ $1 = "/?" ] ; then usage ; exit 0 ; fi
+if [ $1 = "/h" ] ; then usage ; exit 0 ; fi
+if [ $1 = "/H" ] ; then usage ; exit 0 ; fi
+
+
+#
+# compile the resource file
+#
+echo Compiling resource file
+arm-none-symbianelf-cpp -I. -I../inc -I../../epoc32/include -I$EPOCROOT/epoc32/include -D_UNICODE < $1.rss > $1.rpp
+wine $EPOCROOT/epoc32/tools/rcomp.exe -D_UNICODE -oaif.rsc -h$1.rs~ -i$1.rss -s$1.rpp
+rm -f $1.rs~
+rm -f $1.rpp
+
+#
+# duplicate mbm file
+#
+cp $2 aif.mbm
+
+
+#
+# run Aiftool
+#
+echo Running AIF writer
+#emxaif aif.rsc $2 -o $1.aif
+wine $EPOCROOT/epoc32/release/winc/udeb/aiftool.exe .
+
+#
+# cleanup
+#
+mv out.aif $1.aif
+#rm -f aif.rsc
+#rm -f aif.mbm
+
+# EOF - aiftool
diff --git a/armutl.pm b/armutl.pm
index eb3070e..f10931c 100644
--- a/armutl.pm
+++ b/armutl.pm
@@ -6,7 +6,7 @@
# this package does various ancillary things for armedg modules
-package Armutl;
+package armutl;
require Exporter;
@ISA=qw(Exporter);
@@ -48,7 +48,7 @@ sub InitVersionInfo (){
return $ENV{ARMV5VER};
}
else{
- open ARMCCPIPE, "armcc 2>&1 |";
+ open ARMCCPIPE, "armcc 2>&1 |" or return "";
# Read all output from armcc into array
my @lines=<ARMCCPIPE>;
chomp @lines;
diff --git a/bldmake b/bldmake
new file mode 100644
index 0000000..3619320
--- /dev/null
+++ b/bldmake
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# bldmake - bash interface for bldmake.pl, part of GnuPoc project
+#
+# (c) 2001 Alfred E. Heggestad
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+
+perl -S bldmake.pl "$@"
diff --git a/bldmake.pl b/bldmake.pl
index 3fdebe0..aa431b3 100644
--- a/bldmake.pl
+++ b/bldmake.pl
@@ -1,3 +1,5 @@
+#!/usr/bin/perl -w
+#
# BLDMAKE.PL
#
# Copyright (c) 1997-2008 Symbian Software Ltd. All rights reserved.
@@ -19,22 +21,21 @@ BEGIN {
require 5.005_03;
# establish the path to the Perl libraries: currently the same directory as this script
$PerlLibPath = $FindBin::Bin; # X:/epoc32/tools
- $PerlLibPath =~ s/\//\\/g; # X:\epoc32\tools
- $PerlLibPath .= "\\";
+ $PerlLibPath .= "/";
}
sub ExportDirs ($);
use lib $PerlLibPath;
-use E32env;
-use E32Plat;
-use Modload;
-use Output;
-use Pathutl;
-use E32Variant;
-use Armutl;
-use BPABIutl;
+use e32env;
+use e32plat;
+use modload;
+use output;
+use pathutl;
+use e32variant;
+use armutl;
+use bpabiutl;
use wrappermakefile;
-use CheckSource;
+use checksource;
use File::Path; # for rmtree
use featurevariantparser;
@@ -151,7 +152,7 @@ my @FeatureVariants = featurevariantparser->GetBuildableFeatureVariants();
);
}
print(
- "Macros defined for BLD.INF preprocessing of MMPFILE sections:\n"
+ "Macros defined for bld.inf preprocessing of MMPFILE sections:\n"
);
foreach $PlatName (@PlatList) {
my %Plat;
@@ -166,24 +167,24 @@ my @FeatureVariants = featurevariantparser->GetBuildableFeatureVariants();
}
-# check that the BLD.INF file exists
-# maybe BLDMAKE should allow a path to be specified leading to the BLD.INF file
+# check that the bld.inf file exists
+# maybe BLDMAKE should allow a path to be specified leading to the bld.inf file
my $BldInfPath=&Path_WorkPath;
- unless (-e "${BldInfPath}BLD.INF") {
- &FatalError("Can't find \"${BldInfPath}BLD.INF\"");
+ unless (-e "${BldInfPath}bld.inf") {
+ &FatalError("Can't find \"${BldInfPath}bld.inf\"");
}
- if (!-d $E32env::Data{EPOCPath}){
- &FatalError("Directory \"$E32env::Data{EPOCPath}\" does not exist");
+ if (!-d $e32env::Data{EPOCPath}){
+ &FatalError("Directory \"$e32env::Data{EPOCPath}\" does not exist");
}
# decide the output directory
- my $OutDir=&Path_Chop($E32env::Data{BldPath}).$BldInfPath;
+ my $OutDir=&Path_Chop($e32env::Data{BldPath}).$BldInfPath;
# Work out the path for the IBY files
- my $RomDir=&Path_Chop($E32env::Data{RomPath}).$BldInfPath;
+ my $RomDir=&Path_Chop($e32env::Data{RomPath}).$BldInfPath;
-# Work out the name for the BLD.INF module
+# Work out the name for the bld.inf module
my @Dirs=&Path_Dirs($BldInfPath);
my $Module = pop @Dirs;
if (lc($Module) eq 'group') {
@@ -203,18 +204,18 @@ my @FeatureVariants = featurevariantparser->GetBuildableFeatureVariants();
exit;
}
-# parse BLD.INF - to get the platforms and the export files
- eval { &Load_ModuleL('PREPFILE'); };
+# parse bld.inf - to get the platforms and the export files
+ eval { &Load_ModuleL('prepfile'); };
&FatalError($@) if $@;
my @RealPlats=();
my @Exports=();
my @TestExports=();
if ($Options{v}) {
- print "Reading \"${BldInfPath}BLD.INF\" for platforms and exports\n";
+ print "Reading \"${BldInfPath}bld.inf\" for platforms and exports\n";
}
&ParseBldInf(\@RealPlats, \@Exports, \@TestExports, $BldInfPath,
- $E32env::Data{EPOCIncPath}, $E32env::Data{EPOCPath}, $E32env::Data{EPOCDataPath});
+ $e32env::Data{EPOCIncPath}, $e32env::Data{EPOCPath}, $e32env::Data{EPOCDataPath});
# Add Customizations
my @additions;
@@ -287,7 +288,7 @@ if (0) {
unless ($CLPlat eq 'ALL') {
unless (grep /^$CLPlat$/, @Plats) {
- &FatalError("Platform $CLPlat not supported by \"${BldInfPath}BLD.INF\"\n");
+ &FatalError("Platform $CLPlat not supported by \"${BldInfPath}bld.inf\"\n");
}
@DoPlats=($CLPlat);
@DoRealPlats=$Real{$CLPlat};
@@ -297,20 +298,20 @@ if (0) {
my @ExportDirs=ExportDirs(\@Exports);
my @TestExportDirs=ExportDirs(\@TestExports);
-# parse the BLD.INF file again for each platform supported by the project
+# parse the bld.inf file again for each platform supported by the project
# storing the information in a big data structure
my %AllPlatData;
my %AllPlatTestData;
my $Plat;
if ($Options{v} and $CLPlat ne 'ALL'){
- print "Reading \"${BldInfPath}BLD.INF\" for $CLPlat \n";
+ print "Reading \"${BldInfPath}bld.inf\" for $CLPlat \n";
}
foreach $Plat (@RealPlats) {
if ($Options{v}) {
if ($CLPlat eq 'ALL') {
- print "Reading \"${BldInfPath}BLD.INF\" for $Plat\n";
+ print "Reading \"${BldInfPath}bld.inf\" for $Plat\n";
}
}
my (@PlatData, @PlatTestData);
@@ -340,59 +341,61 @@ if (0) {
}
}
-# create the perl file, PLATFORM.PM, listing the platforms
+# create the perl file, platform.pm, listing the platforms
if ($Options{v}) {
- print "Creating \"${OutDir}PLATFORM.PM\"\n";
+ print "Creating \"${OutDir}platform.pm\"\n";
}
&CreatePlatformPm($OutDir, \@Plats, \@RealPlats, \%Real, \%AllPlatData, \%AllPlatTestData);
-# create the .BAT files required to call ABLD.PL
- if ($Options{v}) {
- print "Creating \"${BldInfPath}ABLD.BAT\"\n";
- }
- &CreatePerlBat($BldInfPath);
+ # Note from alfredh:
+ #
+ # I removed the creation of the abld shell file
+ # because it is not necessary. Instead, the file
+ # is now in /epoc32/tools directory
+ #
# create the makefile for exporting files
if ($Options{v}) {
- print "Creating \"${OutDir}EXPORT.MAKE\"\n";
+ print "Creating \"${OutDir}export.make\"\n";
}
- &CreateExportMak("${OutDir}EXPORT.MAKE", \@Exports, \@ExportDirs);
+ &CreateExportMak("${OutDir}export.make", \@Exports, \@ExportDirs);
# create the makefile for exporting test files
if ($Options{v}) {
- print "Creating \"${OutDir}EXPORTTEST.MAKE\"\n";
+ print "Creating \"${OutDir}exporttest.make\"\n";
}
- &CreateExportMak("${OutDir}EXPORTTEST.MAKE", \@TestExports, \@TestExportDirs);
+ &CreateExportMak("${OutDir}exporttest.make", \@TestExports, \@TestExportDirs);
# create the platform meta-makefiles
foreach my $copyofPlat (@DoPlats) { # Do not use $_ here !!
if ($Options{v}) {
- print "Creating \"$OutDir$copyofPlat.MAKE\"\n";
+ my $tmp = lc $copyofPlat;
+ print "Creating \"$OutDir$tmp.make\"\n";
}
my $realplat = $Real{$copyofPlat};
- &CreatePlatMak($OutDir, $E32env::Data{BldPath}, $AllPlatData{$realplat}, $copyofPlat, $realplat, $RomDir, $Module, $BldInfPath, \@Exports, '');
+ &CreatePlatMak($OutDir, $e32env::Data{BldPath}, $AllPlatData{$realplat}, $copyofPlat, $realplat, $RomDir, $Module, $BldInfPath, \@Exports, '');
if (&Plat_SupportsFeatureVariants($copyofPlat))
{
foreach my $featureVariant (@FeatureVariants)
{
- print "Creating \"$OutDir$copyofPlat.$featureVariant.MAKE\"\n" if ($Options{v});
- &CreatePlatMak($OutDir, $E32env::Data{BldPath}, $AllPlatData{$realplat}, $copyofPlat, $realplat, $RomDir, $Module, $BldInfPath, \@Exports, '', ".$featureVariant");
+ print "Creating \"$OutDir$copyofPlat.$featureVariant.make\"\n" if ($Options{v});
+ &CreatePlatMak($OutDir, $e32env::Data{BldPath}, $AllPlatData{$realplat}, $copyofPlat, $realplat, $RomDir, $Module, $BldInfPath, \@Exports, '', ".$featureVariant");
}
}
}
foreach (@DoPlats) {
if ($Options{v}) {
- print "Creating \"$OutDir${_}TEST.MAKE\"\n";
+ print "Creating \"$OutDir${_}test.make\"\n";
}
- &CreatePlatMak($OutDir, $E32env::Data{BldPath}, $AllPlatTestData{$Real{$_}}, $_, $Real{$_}, $RomDir, $Module, $BldInfPath, \@TestExports, 'TEST');
+ &CreatePlatMak($OutDir, $e32env::Data{BldPath}, $AllPlatTestData{$Real{$_}}, $_, $Real{$_}, $RomDir, $Module, $BldInfPath, \@TestExports, 'TEST');
if (&Plat_SupportsFeatureVariants($_))
{
foreach my $featureVariant (@FeatureVariants)
{
- print "Creating \"$OutDir${_}.".$featureVariant."TEST.MAKE\"\n" if ($Options{v});
- &CreatePlatMak($OutDir, $E32env::Data{BldPath}, $AllPlatTestData{$Real{$_}}, $_, $Real{$_}, $RomDir, $Module, $BldInfPath, \@TestExports, 'TEST', ".$featureVariant");
+ print "Creating \"$OutDir${_}.".$featureVariant."test.make\"\n" if ($Options{v});
+ &CreatePlatMak($OutDir, $e32env::Data{BldPath}, $AllPlatTestData{$Real{$_}}, $_, $Real{$_}, $RomDir, $Module, $BldInfPath, \@TestExports, 'TEST', ".$featureVariant");
}
}
}
@@ -408,7 +411,7 @@ if (0) {
# report any near-fatal errors
if (scalar keys %KeepGoing) {
print STDERR
- "\n${BldInfPath}BLD.INF WARNING(S):\n",
+ "\n${BldInfPath}bld.inf WARNING(S):\n",
sort keys %KeepGoing
;
}
@@ -428,7 +431,7 @@ if (0) {
sub Usage () {
- eval { &Load_ModuleL('E32TPVER'); };
+ eval { &Load_ModuleL('e32tpver'); };
&FatalError($@) if $@;
print
@@ -440,7 +443,7 @@ sub Usage () {
"<command>: (case insensitive)\n",
" BLDFILES - create build batch files\n",
" CLEAN - remove all files bldmake creates\n",
- " INF - display basic BLD.INF syntax\n",
+ " INF - display basic bld.inf syntax\n",
" PLAT - display platform macros\n",
"\n",
"<platform>: (case insensitive)\n",
@@ -457,7 +460,7 @@ sub ShowBldInfSyntax () {
print <<ENDHERE1;
-BLD.INF - Syntax
+bld.inf - Syntax
/* Use C++ comments if required */
// (Curly braces denote optional arguments)
@@ -479,7 +482,7 @@ PRJ_EXPORTS
PRJ_TESTEXPORTS
[<source path>\<source file>] {<destination>}
// list each file exported from source on a separate line
-// {<destination>} defaults to BLD.INF dir
+// {<destination>} defaults to bld.inf dir
PRJ_MMPFILES
[<mmp path>\<mmp file>] {<qualifiers>}
@@ -521,7 +524,7 @@ sub ParseBldInf ($$$$$) {
my ($PlatsRef, $ExportsRef, $TestExportsRef, $BldInfPath, $EPOCIncPath, $EPOCPath, $EPOCDataPath)=@_;
my @Prj2D;
- eval { &Prepfile_ProcessL(\@Prj2D, "${BldInfPath}BLD.INF",$variantMacroHRHFile); };
+ eval { &Prepfile_ProcessL(\@Prj2D, "${BldInfPath}bld.inf",$variantMacroHRHFile); };
&FatalError($@) if $@;
my @SupportedPlats=&Plat_List();
@@ -536,10 +539,11 @@ sub ParseBldInf ($$$$$) {
my $Section=0;
our @PrjFileDie;
my $Line;
- my $CurFile="${BldInfPath}BLD.INF";
+ my $CurFile="${BldInfPath}bld.inf";
LINE: foreach $Line (@Prj2D) {
my $LineNum=shift @$Line;
$_=shift @$Line;
+ $_=~s/\\/\//g; # backwards comp - convert backslash to forward slash
if ($LineNum eq '#') {
$CurFile=$_;
next LINE;
@@ -568,13 +572,13 @@ sub ParseBldInf ($$$$$) {
unshift @$Line, $_;
my $Candidate;
CANDLOOP: foreach $Candidate (@$Line) {
- $Candidate=uc $Candidate;
+ $Candidate=lc $Candidate;
# ignore old WINC target
- if ($Candidate eq 'WINC') {
+ if ($Candidate eq 'winc') {
next CANDLOOP;
}
# expand DEFAULT
- if ($Candidate eq 'DEFAULT') {
+ if ($Candidate eq 'default') {
$DefaultPlatsUsed=1;
my $Default;
foreach $Default (@DefaultPlats) {
@@ -586,7 +590,7 @@ sub ParseBldInf ($$$$$) {
next CANDLOOP;
}
# expand BASEDEFAULT
- if ($Candidate eq 'BASEDEFAULT') {
+ if ($Candidate eq 'basedefault') {
$DefaultPlatsUsed=1;
my $Default;
foreach $Default (@BaseDefaultPlats) {
@@ -626,7 +630,7 @@ sub ParseBldInf ($$$$$) {
push @Plats, 'CWTOOLS';
}
# check platform is supported
- unless (grep /^$Candidate$/, @SupportedPlats) {
+ unless (grep /^$Candidate$/i, @SupportedPlats) {
WarnOrDie(\@PrjFileDie, "$CurFile($LineNum) : Unsupported platform $Candidate specified\n");
next CANDLOOP;
}
@@ -637,7 +641,7 @@ sub ParseBldInf ($$$$$) {
}
# add the platform
unless ($PlatformCheck{$Candidate}) {
- push @Plats, $Candidate;
+ push @Plats, uc $Candidate;
my $SubPlat = sprintf("%sEDG", $Candidate);
push @Plats, $SubPlat
if (grep /^$SubPlat$/, @SupportedPlats);
@@ -674,10 +678,11 @@ sub ParseBldInf ($$$$$) {
if (@$Line) {
# get the destination file if it's specified
$Releasable=shift @$Line;
+ $Releasable=~s/\\/\//g; # force to forward slash
CheckSource_MetaData(%CheckSourceEXPORTSMetaData, $CurFile, "PRJ_".$Section, $Releasable, $LineNum);
$Releasable = &Path_Norm ($Releasable);
- $emReleasable=ucfirst $Releasable;
- if ($emReleasable=~/^([A-Z]):(\\.*)$/) {
+ $emReleasable=$Releasable;
+ if ($emReleasable=~/^([A-Z]):(\/.*)$/i) {
$emReleasable=~s/://;
$Releasable=$EPOCDataPath.$emReleasable;
}
@@ -754,7 +759,7 @@ sub ParseBldInf ($$$$$) {
}
if (@PrjFileDie) {
print STDERR
- "\n${BldInfPath}BLD.INF FATAL ERROR(S):\n",
+ "\n${BldInfPath}bld.inf FATAL ERROR(S):\n",
@PrjFileDie
;
exit 1;
@@ -811,20 +816,20 @@ sub ExportDirs ($) {
sub ParseBldInfPlat ($$$$) {
my ($DataRef, $TestDataRef, $Plat, $BldInfPath, $FeatureVar)=@_;
-# get the platform .MMP macros
+# get the platform .mmp macros
my %Plat;
eval { &Plat_GetL($Plat,\%Plat); };
&FatalError($@) if $@;
-# get the raw data from the BLD.INF file
+# get the raw data from the bld.inf file
my @Prj2D;
- eval { &Prepfile_ProcessL(\@Prj2D, "${BldInfPath}BLD.INF", ($FeatureVar ? $FeatureVar->{VARIANT_HRH} : $variantMacroHRHFile), @{$Plat{MmpMacros}}); };
+ eval { &Prepfile_ProcessL(\@Prj2D, "${BldInfPath}bld.inf", ($FeatureVar ? $FeatureVar->{VARIANT_HRH} : $variantMacroHRHFile), @{$Plat{MmpMacros}}); };
&FatalError($@) if $@;
my %dummy;
my @userIncludes = ('.');
my @systemIncludes = ();
- $CheckSourceBldInfIncludes{$Plat} = CheckSource_Includes("${BldInfPath}BLD.INF", %dummy, $variantMacroHRHFile, @{$Plat{MmpMacros}}, @userIncludes, @systemIncludes, $CheckSource_NoUserSystemDistinction);
+ $CheckSourceBldInfIncludes{$Plat} = CheckSource_Includes("${BldInfPath}bld.inf", %dummy, $variantMacroHRHFile, @{$Plat{MmpMacros}}, @userIncludes, @systemIncludes, $CheckSource_NoUserSystemDistinction);
# process the raw data
my $IsExtensionBlock =0;
@@ -833,7 +838,7 @@ sub ParseBldInfPlat ($$$$) {
my $Section=0;
my @PrjFileDie;
my $Line;
- my $CurFile="${BldInfPath}BLD.INF";
+ my $CurFile="${BldInfPath}bld.inf";
LINE: foreach $Line (@Prj2D) {
my %Data;
@@ -847,13 +852,11 @@ sub ParseBldInfPlat ($$$$) {
$CurFile = &Path_Norm ($CurFile);
-# upper-case all the data here, but record original source case
-# in a hash so that it can be recalled for CheckSource purposes
+# don't upper-case any data here
my %originalSourceCase;
foreach (@$Line) {
- $originalSourceCase{uc $_} = $_; # needed for extension template makefile MACROs
- $_=uc $_;
+ $originalSourceCase{$_} = $_; # needed for extension template makefile MACROs
}
$_=shift @$Line;
@@ -861,8 +864,8 @@ sub ParseBldInfPlat ($$$$) {
# check for section headers - don't test for the right ones here
# because we do that in the first parse function
- if (/^PRJ_(\w*)$/o) {
- $Section=$1;
+ if (/^PRJ_(\w*)$/oi) {
+ $Section=uc $1;
next LINE;
}
@@ -912,7 +915,7 @@ sub ParseBldInfPlat ($$$$) {
&FatalError("$CurFile($LineNum) : No 'start' corresponding to this 'end' in Extension Template section\n");
}
$IsExtensionBlock =0;
- my $OutDir=Path_Chop($E32env::Data{BldPath}).$BldInfPath;
+ my $OutDir=Path_Chop($e32env::Data{BldPath}).$BldInfPath;
# Generate wrapper makefile for this platform.
eval { &Load_ModuleL('WrapperMakefile'); };
&FatalError($@) if $@;
@@ -928,24 +931,24 @@ sub ParseBldInfPlat ($$$$) {
}
}
-# check for MMP sections and get the .MMP file details
+# check for mmp sections and get the .mmp file details
if ($Section=~/^(MMPFILES|TESTMMPFILES)$/o) {
- $Data{Ext}='.MMP';
+ $Data{Ext}='.mmp';
# check for MAKEFILE statements for custom building
my $SubSection = "MMP";
- if (/^MAKEFILE$/o) {
+ if (/^MAKEFILE$/oi) {
$SubSection = $_;
- $Data{Makefile}=2; # hack - treat MAKEFILE=>NMAKEFILE =1;
+ $Data{Makefile}=1;
$_=shift @$Line;
$Data{Ext}=&Path_Split('Ext', $_);
}
- if (/^NMAKEFILE$/o) {
+ if (/^NMAKEFILE$/oi) {
$SubSection = $_;
$Data{Makefile}=2;
$_=shift @$Line;
$Data{Ext}=&Path_Split('Ext', $_);
}
- if (/^GNUMAKEFILE$/o) {
+ if (/^GNUMAKEFILE$/oi) {
$SubSection = $_;
$Data{Makefile}=1;
$_=shift @$Line;
@@ -957,7 +960,7 @@ sub ParseBldInfPlat ($$$$) {
# path considered relative to the current file
$Data{Path}=&Path_Split('Path', &Path_MakeAbs($CurFile, $_));
-# this function doesn't care whether the .MMPs are listed with their extensions or not
+# this function doesn't care whether the .mmp's are listed with their extensions or not
$Data{Base}=&Path_Split('Base', $_);
my $MmpFile= $Data{Path}.$Data{Base};
@@ -968,6 +971,8 @@ sub ParseBldInfPlat ($$$$) {
}
$Check{$MmpFile}="$CurFile: $LineNum";
+ $Data{Base}=~s/\\/\//g; # force to forward slash
+
# check the file exists
unless (-e "$Data{Path}$Data{Base}$Data{Ext}") {
WarnOrDie(\@PrjFileDie, "$CurFile($LineNum) : $Data{Path}$Data{Base}$Data{Ext} does not exist\n");
@@ -978,6 +983,7 @@ sub ParseBldInfPlat ($$$$) {
# process the file's attributes
if ($Section eq 'MMPFILES') {
foreach (@$Line) {
+ #$_ = uc $_; # alfredh: hack TODOAEH
if (/^TIDY$/o) {
$Data{Tidy}=1;
next;
@@ -990,11 +996,11 @@ sub ParseBldInfPlat ($$$$) {
next;
}
- push @PrjFileDie, "$CurFile($LineNum) : Don't understand .MMP file argument \"$_\"\n";
+ push @PrjFileDie, "$CurFile($LineNum) : Don't understand .mmp file argument \"$_\"\n";
}
}
-# process the test .MMP file's attributes
+# process the test .mmp file's attributes
elsif ($Section eq 'TESTMMPFILES') {
foreach (@$Line) {
if (/^TIDY$/o) {
@@ -1016,7 +1022,7 @@ sub ParseBldInfPlat ($$$$) {
$Data{Support}=1;
next;
}
- push @PrjFileDie, "$CurFile($LineNum) : Don't understand test .MMP file argument \"$_\"\n";
+ push @PrjFileDie, "$CurFile($LineNum) : Don't understand test .mmp file argument \"$_\"\n";
}
}
}
@@ -1053,7 +1059,7 @@ sub ParseBldInfPlat ($$$$) {
# exit if there are errors
if (@PrjFileDie) {
print STDERR
- "\n\"${BldInfPath}BLD.INF\" FATAL ERROR(S):\n",
+ "\n\"${BldInfPath}bld.inf\" FATAL ERROR(S):\n",
@PrjFileDie
;
exit 1;
@@ -1088,12 +1094,14 @@ sub CreatePlatformPm ($$$$$$) {
&Output(
- "# Bldmake-generated perl file - PLATFORM.PM\n",
+ "#!/usr/bin/perl -w\n",
+ "#\n",
+ "# Bldmake-generated perl file - platform.pm\n",
"\n",
"# use a perl integrity checker\n",
"use strict;\n",
"\n",
- "package Platform;\n",
+ "package platform;\n",
"\n",
"use vars qw(\@Plats \@RealPlats %Programs %TestPrograms %FeatureVariantSupportingPlats);\n",
"\n",
@@ -1181,8 +1189,8 @@ sub CreatePlatformPm ($$$$$$) {
"1;\n"
);
-# write the PLATFORM.PM file
- &WriteOutFileL($BatchPath."PLATFORM.PM");
+# write the platform.pm file
+ &WriteOutFileL($BatchPath."platform.pm");
}
sub CreatePerlBat ($) {
@@ -1257,10 +1265,9 @@ sub GetArchiveExportList($) {
sub CreateExportMak ($$$) {
my ($Makefile, $ExportsRef, $ExpDirsRef)=@_;
-# create EXPORT.MAKE
+# create export.make
- my $erasedefn = "\@erase";
- $erasedefn = "\@erase 2>>nul" if ($ENV{OS} eq "Windows_NT");
+ my $erasedefn = "\@rm -f";
&Output(
"ERASE = $erasedefn\n",
"\n",
@@ -1291,7 +1298,7 @@ sub CreateExportMak ($$$) {
else {
&Output(
" \n",
- "\t\@echo Nothing to do\n"
+# "\t\@echo Nothing to do\n"
);
}
&Output(
@@ -1352,7 +1359,7 @@ sub CreateExportMak ($$$) {
my $src=&Path_Quote($$ref{Source});
&Output(