Skip to content

Commit c2c20c9

Browse files
ocielliottcocielliottc
committed
Replaced tabs with spaces
1 parent d07b201 commit c2c20c9

4 files changed

Lines changed: 98 additions & 98 deletions

File tree

‎modules/TemplateParser.pm‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ use vars qw(@ISA);
3434
# calling perform_ for a nested function are written to the output)
3535
# 5 means that the get_ method performs the get_ and doif_ functionality
3636
#
37-
# Perl Function Parameter Type Return Type
38-
# get_ string string or array
39-
# perform_ array reference array
40-
# doif_ array reference boolean
37+
# Perl Function Parameter Type Return Type
38+
# get_ string string or array
39+
# perform_ array reference array
40+
# doif_ array reference boolean
4141
#
4242
my $get_type = 1 << 0;
4343
my $perform_type = 1 << 1;
@@ -92,7 +92,7 @@ my %keywords = ('if' => 0,
9292
'deref' => 0,
9393
'set' => 0,
9494
'is_relative' => $get_type|$doif_type|$get_combined_type,
95-
'extension' => $get_type,
95+
'extension' => $get_type,
9696
);
9797

9898
my %target_type_vars = ('type_is_static' => 1,
@@ -389,7 +389,7 @@ sub get_value {
389389
if (!defined $value && $name =~ /^(.*)\->(\w+)/) {
390390
my $pre = $1;
391391
my $post = $2;
392-
my $base = $self->get_value($pre);
392+
my $base = $self->get_value($pre);
393393

394394
if (defined $base) {
395395
$value = $self->{'prjc'}->get_special_value(
@@ -2047,8 +2047,8 @@ sub prepare_parameters {
20472047
if (defined $fo) {
20482048
$outdir = $self->tp_dirname($$output[$i]);
20492049
if (!($outdir ne '' && $indir ne $outdir && $fo ne $outdir)) {
2050-
$$output[$i] = ($fo eq '.' ? '' : $fo . '/') .
2051-
$self->tp_basename($$output[$i]);
2050+
$$output[$i] = ($fo eq '.' ? '' : $fo . '/') .
2051+
$self->tp_basename($$output[$i]);
20522052
}
20532053
}
20542054
$$output[$i] =~ s/\//\\/g if ($self->{'cslashes'});

‎modules/WixProjectCreator.pm‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -73,40 +73,40 @@ sub is_culture_code {
7373

7474
# from http://sharpertutorials.com/list-of-culture-codes/
7575
my @culture_codes = (
76-
'af', 'hu-HU', 'af-ZA', 'is', 'sq', 'is-IS',
77-
'sq-AL', 'id', 'ar', 'id-ID', 'ar-DZ', 'it',
78-
'ar-BH', 'it-IT', 'ar-EG', 'it-CH', 'ar-IQ', 'ja',
79-
'ar-JO', 'ja-JP', 'ar-KW', 'kn', 'ar-LB', 'kn-IN',
80-
'ar-LY', 'kk', 'ar-MA', 'kk-KZ', 'ar-OM', 'kok',
81-
'ar-QA', 'kok-IN', 'ar-SA', 'ko', 'ar-SY', 'ko-KR',
82-
'ar-TN', 'ky', 'ar-AE', 'ky-KG', 'ar-YE', 'lv',
83-
'hy', 'lv-LV', 'hy-AM', 'lt', 'az', 'lt-LT',
84-
'az-AZ-Cyrl', 'mk', 'az-AZ-Latn', 'mk-MK', 'eu', 'ms',
85-
'eu-ES', 'ms-BN', 'be', 'ms-MY', 'be-BY', 'mr',
86-
'bg', 'mr-IN', 'bg-BG', 'mn', 'ca', 'mn-MN',
87-
'ca-ES', 'no', 'zh-HK', 'nb-NO', 'zh-MO', 'nn-NO',
88-
'zh-CN', 'pl', 'zh-CHS', 'pl-PL', 'zh-SG', 'pt',
89-
'zh-TW', 'pt-BR', 'zh-CHT', 'pt-PT', 'hr', 'pa',
90-
'hr-HR', 'pa-IN', 'cs', 'ro', 'cs-CZ', 'ro-RO',
91-
'da', 'ru', 'da-DK', 'ru-RU', 'div', 'sa',
92-
'div-MV', 'sa-IN', 'nl', 'sr-SP-Cyrl', 'nl-BE', 'sr-SP-Latn',
93-
'nl-NL', 'sk', 'en', 'sk-SK', 'en-AU', 'sl',
94-
'en-BZ', 'sl-SI', 'en-CA', 'es', 'en-CB', 'es-AR',
95-
'en-IE', 'es-BO', 'en-JM', 'es-CL', 'en-NZ', 'es-CO',
96-
'en-PH', 'es-CR', 'en-ZA', 'es-DO', 'en-TT', 'es-EC',
97-
'en-GB', 'es-SV', 'en-US', 'es-GT', 'en-ZW', 'es-HN',
98-
'et', 'es-MX', 'et-EE', 'es-NI', 'fo', 'es-PA',
99-
'fo-FO', 'es-PY', 'fa', 'es-PE', 'fa-IR', 'es-PR',
100-
'fi', 'es-ES', 'fi-FI', 'es-UY', 'fr', 'es-VE',
101-
'fr-BE', 'sw', 'fr-CA', 'sw-KE', 'fr-FR', 'sv',
102-
'fr-LU', 'sv-FI', 'fr-MC', 'sv-SE', 'fr-CH', 'syr',
103-
'gl', 'syr-SY', 'gl-ES', 'ta', 'ka', 'ta-IN',
104-
'ka-GE', 'tt', 'de', 'tt-RU', 'de-AT', 'te',
105-
'de-DE', 'te-IN', 'de-LI', 'th', 'de-LU', 'th-TH',
106-
'de-CH', 'tr', 'el', 'tr-TR', 'el-GR', 'uk',
107-
'gu', 'uk-UA', 'gu-IN', 'ur', 'he', 'ur-PK',
108-
'he-IL', 'uz', 'hi', 'uz-UZ-Cyrl', 'hi-IN', 'uz-UZ-Latn',
109-
'hu', 'vi');
76+
'af', 'hu-HU', 'af-ZA', 'is', 'sq', 'is-IS',
77+
'sq-AL', 'id', 'ar', 'id-ID', 'ar-DZ', 'it',
78+
'ar-BH', 'it-IT', 'ar-EG', 'it-CH', 'ar-IQ', 'ja',
79+
'ar-JO', 'ja-JP', 'ar-KW', 'kn', 'ar-LB', 'kn-IN',
80+
'ar-LY', 'kk', 'ar-MA', 'kk-KZ', 'ar-OM', 'kok',
81+
'ar-QA', 'kok-IN', 'ar-SA', 'ko', 'ar-SY', 'ko-KR',
82+
'ar-TN', 'ky', 'ar-AE', 'ky-KG', 'ar-YE', 'lv',
83+
'hy', 'lv-LV', 'hy-AM', 'lt', 'az', 'lt-LT',
84+
'az-AZ-Cyrl', 'mk', 'az-AZ-Latn', 'mk-MK', 'eu', 'ms',
85+
'eu-ES', 'ms-BN', 'be', 'ms-MY', 'be-BY', 'mr',
86+
'bg', 'mr-IN', 'bg-BG', 'mn', 'ca', 'mn-MN',
87+
'ca-ES', 'no', 'zh-HK', 'nb-NO', 'zh-MO', 'nn-NO',
88+
'zh-CN', 'pl', 'zh-CHS', 'pl-PL', 'zh-SG', 'pt',
89+
'zh-TW', 'pt-BR', 'zh-CHT', 'pt-PT', 'hr', 'pa',
90+
'hr-HR', 'pa-IN', 'cs', 'ro', 'cs-CZ', 'ro-RO',
91+
'da', 'ru', 'da-DK', 'ru-RU', 'div', 'sa',
92+
'div-MV', 'sa-IN', 'nl', 'sr-SP-Cyrl', 'nl-BE', 'sr-SP-Latn',
93+
'nl-NL', 'sk', 'en', 'sk-SK', 'en-AU', 'sl',
94+
'en-BZ', 'sl-SI', 'en-CA', 'es', 'en-CB', 'es-AR',
95+
'en-IE', 'es-BO', 'en-JM', 'es-CL', 'en-NZ', 'es-CO',
96+
'en-PH', 'es-CR', 'en-ZA', 'es-DO', 'en-TT', 'es-EC',
97+
'en-GB', 'es-SV', 'en-US', 'es-GT', 'en-ZW', 'es-HN',
98+
'et', 'es-MX', 'et-EE', 'es-NI', 'fo', 'es-PA',
99+
'fo-FO', 'es-PY', 'fa', 'es-PE', 'fa-IR', 'es-PR',
100+
'fi', 'es-ES', 'fi-FI', 'es-UY', 'fr', 'es-VE',
101+
'fr-BE', 'sw', 'fr-CA', 'sw-KE', 'fr-FR', 'sv',
102+
'fr-LU', 'sv-FI', 'fr-MC', 'sv-SE', 'fr-CH', 'syr',
103+
'gl', 'syr-SY', 'gl-ES', 'ta', 'ka', 'ta-IN',
104+
'ka-GE', 'tt', 'de', 'tt-RU', 'de-AT', 'te',
105+
'de-DE', 'te-IN', 'de-LI', 'th', 'de-LU', 'th-TH',
106+
'de-CH', 'tr', 'el', 'tr-TR', 'el-GR', 'uk',
107+
'gu', 'uk-UA', 'gu-IN', 'ur', 'he', 'ur-PK',
108+
'he-IL', 'uz', 'hi', 'uz-UZ-Cyrl', 'hi-IN', 'uz-UZ-Latn',
109+
'hu', 'vi');
110110

111111
return 1 if (exists {map { $_ => 1 } @culture_codes}->{$culture_code});
112112
return 0;

‎modules/WorkspaceCreator.pm‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,11 @@ sub parse_line {
216216

217217
## lock the directory
218218
if (-e "$wdir/$lock") {
219-
die "Error: Another instance of MPC is using $wdir, or a previous session failed to remove the lock file $lock\n";
219+
die "Error: Another instance of MPC is using $wdir, or a previous session failed to remove the lock file $lock\n";
220220
}
221221
else {
222-
open (FDL, ">$wdir/$lock") || die "Error reating lock file $lock in $wdir\n";
223-
print FDL "File generated by MPC process ", $$, " on ", scalar (localtime(time())), "\n";
222+
open (FDL, ">$wdir/$lock") || die "Error reating lock file $lock in $wdir\n";
223+
print FDL "File generated by MPC process ", $$, " on ", scalar (localtime(time())), "\n";
224224
close FDL;
225225

226226
$self->diagnostic("Multiprocess MPC created lock file $wdir/$lock");
@@ -1484,7 +1484,7 @@ sub generate_project_files {
14841484
$status = 1;
14851485
}
14861486
else {
1487-
$status = $creator->generate($self->mpc_basename($file));
1487+
$status = $creator->generate($self->mpc_basename($file));
14881488

14891489
## If any one project file fails, then stop
14901490
## processing altogether.
@@ -1696,11 +1696,11 @@ sub generate_project_files_fork {
16961696
## processing altogether.
16971697
if (!$status) {
16981698
# save the status info and exit. the parent will
1699-
# see the error.
1700-
print FD "$status|Unable to process " .
1701-
($file eq '' ? " in $dir" : $file) . "\n";
1699+
# see the error.
1700+
print FD "$status|Unable to process " .
1701+
($file eq '' ? " in $dir" : $file) . "\n";
17021702

1703-
exit(1); # child error
1703+
exit(1); # child error
17041704
}
17051705

17061706
## Get the individual project information and
@@ -1712,33 +1712,33 @@ sub generate_project_files_fork {
17121712
}
17131713

17141714

1715-
print FD "$status|''|$self->{'cacheok'}|$previmpl|$prevcache\n";
1716-
print FD "$ofile|$prkey|$dir|$cwd|$restore\n";
1715+
print FD "$status|''|$self->{'cacheok'}|$previmpl|$prevcache\n";
1716+
print FD "$ofile|$prkey|$dir|$cwd|$restore\n";
17171717

1718-
print FD Dumper ($files_written), "\n";
1719-
print FD Dumper ($gen_proj_info), "\n";
1720-
print FD Dumper ($gen_lib_locs), "\n";
1718+
print FD Dumper ($files_written), "\n";
1719+
print FD Dumper ($gen_proj_info), "\n";
1720+
print FD Dumper ($gen_lib_locs), "\n";
17211721

1722-
# there's a callback that sets the project file list
1723-
# since we can't callback between processes we store
1724-
# the list for later
1725-
print FD Dumper ($self->{'project_file_list'}), "\n";
1722+
# there's a callback that sets the project file list
1723+
# since we can't callback between processes we store
1724+
# the list for later
1725+
print FD Dumper ($self->{'project_file_list'}), "\n";
17261726

17271727
}
17281728
else {
17291729
## Unable to change to the directory.
17301730
## We don't restore the state before we leave,
17311731
## but that's ok since we will be exiting soon.
1732-
print FD "$status|Unable to change directory to $dir\n";
1732+
print FD "$status|Unable to change directory to $dir\n";
17331733

1734-
exit (1); # child error
1734+
exit (1); # child error
17351735
}
17361736

17371737
}
17381738
else {
17391739
## This one was excluded, so status is ok
17401740
## no need to set though since the child will exit.
1741-
#$status = 1;
1741+
#$status = 1;
17421742
}
17431743

17441744
exit(0); # child is finished
@@ -1778,57 +1778,57 @@ sub generate_project_files_fork {
17781778
eval (<FD>);
17791779
my $gen_lib_locs;
17801780
for my $k (sort { substr($a, 0 , index ($a, '|')) <=>
1781-
substr ($b, 0, index ($b, '|')) } keys %$VAR1) {
1781+
substr ($b, 0, index ($b, '|')) } keys %$VAR1) {
17821782

17831783
$gen_lib_locs->{substr ($k, index ($k, '|') + 1)} =
1784-
$VAR1->{$k};
1784+
$VAR1->{$k};
17851785
}
17861786

17871787
# have to reconstitute project_file_list in the same order it was
17881788
# created or else multi-process implicit dependency may differ from
17891789
# single process.
17901790
eval (<FD>);
17911791
for my $k (sort { substr($a, 0 , index ($a, '|')) <=>
1792-
substr ($b, 0, index ($b, '|')) } keys %$VAR1) {
1792+
substr ($b, 0, index ($b, '|')) } keys %$VAR1) {
17931793

17941794
$self->{'project_file_list'}->{substr ($k, index ($k, '|') + 1)} =
1795-
$VAR1->{$k};
1795+
$VAR1->{$k};
17961796
}
17971797

17981798
$self->{'cacheok'} = $cacheok;
17991799
if ($self->cd($dir)) {
18001800
if ($self->{'cacheok'} && defined $allprojects{$prkey}) {
18011801

1802-
$files_written = $allprojects{$prkey};
1803-
$gen_proj_info = $allprinfo{$prkey};
1804-
$gen_lib_locs = $allliblocs{$prkey};
1805-
$status = 1;
1802+
$files_written = $allprojects{$prkey};
1803+
$gen_proj_info = $allprinfo{$prkey};
1804+
$gen_lib_locs = $allliblocs{$prkey};
1805+
$status = 1;
18061806
}
18071807
else {
1808-
# file is already generated. check status
1809-
if (!$status) {
1808+
# file is already generated. check status
1809+
if (!$status) {
18101810

1811-
## We don't restore the state before we leave,
1812-
## but that's ok since we will be exiting right now.
1813-
return $status, $creator, $msg;
1814-
}
1811+
## We don't restore the state before we leave,
1812+
## but that's ok since we will be exiting right now.
1813+
return $status, $creator, $msg;
1814+
}
18151815

1816-
## Get the individual project information and
1817-
## generated file name(s)
1818-
if ($self->{'cacheok'}) {
1816+
## Get the individual project information and
1817+
## generated file name(s)
1818+
if ($self->{'cacheok'}) {
18191819

1820-
$allprojects{$prkey} = $files_written;
1821-
$allprinfo{$prkey} = $gen_proj_info;
1822-
$allliblocs{$prkey} = $gen_lib_locs;
1823-
}
1820+
$allprojects{$prkey} = $files_written;
1821+
$allprinfo{$prkey} = $gen_proj_info;
1822+
$allliblocs{$prkey} = $gen_lib_locs;
1823+
}
18241824

1825-
push(@{$self->{'mpc_to_output'}->{$ofile}}, @$files_written);
1825+
push(@{$self->{'mpc_to_output'}->{$ofile}}, @$files_written);
18261826
}
18271827

18281828
$self->cd($cwd);
18291829
$self->save_project_info($files_written, $gen_proj_info,
1830-
$gen_lib_locs, $dir,
1831-
\@projects, \%pi, \%liblocs);
1830+
$gen_lib_locs, $dir,
1831+
\@projects, \%pi, \%liblocs);
18321832
}
18331833
else {
18341834
## Unable to change to the directory.

‎templates/iar.mpd‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
</option>
5151
<option>
5252
<name>GOutputBinary</name>
53-
<state><%if(exename)%>0<%else%>1<%endif%></state>
53+
<state><%if(exename)%>0<%else%>1<%endif%></state>
5454
</option>
5555
<option>
5656
<name>OGCoreOrChip</name>
@@ -59,7 +59,7 @@
5959
<option>
6060
<name>GRuntimeLibSelect</name>
6161
<version>0</version>
62-
<state>2</state>
62+
<state>2</state>
6363
</option>
6464
<option>
6565
<name>GRuntimeLibSelectSlave</name>
@@ -218,7 +218,7 @@
218218
<data>
219219
<version>35</version>
220220
<wantNonLocal>1</wantNonLocal>
221-
<debug><%debug%></debug>
221+
<debug><%debug%></debug>
222222
<option>
223223
<name>OICompilerExtraOption</name>
224224
<state>1</state>
@@ -308,13 +308,13 @@
308308
</option>
309309
<option>
310310
<name>IExtraOptionsCheck</name>
311-
<state><%if(compile_flags)%>1<%else%>0<%endif%></state>
311+
<state><%if(compile_flags)%>1<%else%>0<%endif%></state>
312312
</option>
313313
<option>
314314
<name>IExtraOptions</name>
315315
<%if(compile_flags)%>
316316
<%foreach(compile_flags)%>
317-
<state><%compile_flag%></state>
317+
<state><%compile_flag%></state>
318318
<%endfor%>
319319
<%else%>
320320
<state></state>
@@ -363,7 +363,7 @@
363363
<option>
364364
<name>CCIncludePath2</name>
365365
<%foreach(includes)%>
366-
<state><%if(is_relative(include))%>$PROJ_DIR$/<%endif%><%include%></state>
366+
<state><%if(is_relative(include))%>$PROJ_DIR$/<%endif%><%include%></state>
367367
<%endfor%>
368368
</option>
369369
<option>
@@ -703,7 +703,7 @@
703703
<debug><%debug%></debug>
704704
<option>
705705
<name>IlinkOutputFile</name>
706-
<state><%full_path(exeout)%>\<%if(exename)%><%exename%><%exe_ext%><%endif%></state>
706+
<state><%full_path(exeout)%>\<%if(exename)%><%exename%><%exe_ext%><%endif%></state>
707707
</option>
708708
<option>
709709
<name>IlinkLibIOConfig</name>
@@ -779,7 +779,7 @@
779779
</option>
780780
<option>
781781
<name>IlinkIcfFile</name>
782-
<state><%if(is_relative(ilinkicffile))%>$PROJ_DIR$/<%endif%><%ilinkicffile%></state>
782+
<state><%if(is_relative(ilinkicffile))%>$PROJ_DIR$/<%endif%><%ilinkicffile%></state>
783783
</option>
784784
<option>
785785
<name>IlinkIcfFileSlave</name>
@@ -834,10 +834,10 @@
834834
<name>IlinkAdditionalLibs</name>
835835
<%if(exename)%>
836836
<%foreach(libs)%>
837-
<state><%lib_prefix%><%lib%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%></state>
837+
<state><%lib_prefix%><%lib%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%></state>
838838
<%endfor%>
839839
<%foreach(lit_libs)%>
840-
<state><%lib_prefix%><%lit_lib%><%lib_ext%></state>
840+
<state><%lib_prefix%><%lit_lib%><%lib_ext%></state>
841841
<%endfor%>
842842
<%foreach(pure_libs)%>
843843
<state><%pure_lib%></state>
@@ -1046,11 +1046,11 @@
10461046
</option>
10471047
<option>
10481048
<name>IarchiveOverride</name>
1049-
<state><%if(staticname)%>1<%else%>0<%endif%></state>
1049+
<state><%if(staticname)%>1<%else%>0<%endif%></state>
10501050
</option>
10511051
<option>
10521052
<name>IarchiveOutput</name>
1053-
<state><%full_path(libout)%>\<%lib_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%></state>
1053+
<state><%full_path(libout)%>\<%lib_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%></state>
10541054
</option>
10551055
</data>
10561056
</settings>

0 commit comments

Comments
 (0)