Skip to content

Commit 58c374d

Browse files
terryburtonterryburton
committed
Whitespace
1 parent a5ecaec commit 58c374d

3 files changed

Lines changed: 96 additions & 96 deletions

File tree

‎build/make_deps.pl‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
close($fh);
2121

2222
(my $begin, $_, my $resource, my $meta, $_, my $end) = $src =~ /
23-
(^%\ --BEGIN\ (ENCODER|RENDERER|RESOURCE)\ ([\w-]+?)--$)
24-
(.*?)
25-
(^[^%].*?)
26-
(^%\ --END\ \2\ \3--$)
23+
(^%\ --BEGIN\ (ENCODER|RENDERER|RESOURCE)\ ([\w-]+?)--$)
24+
(.*?)
25+
(^[^%].*?)
26+
(^%\ --END\ \2\ \3--$)
2727
/msgx;
2828

2929
$resource = 'uk.co.terryburton.bwipp' if $resource eq 'preamble';
@@ -34,32 +34,32 @@
3434
(my $provfile) = $upr =~ /^$resource=(.*)$/m;
3535

3636
while (my $targetdir = shift @ARGV) {
37-
my @reqs_list = split /\s+/, $reqs;
38-
next unless @reqs_list; # Skip if no dependencies
39-
my $reqfiles = "$targetdir/$provfile : |";
40-
foreach my $req (@reqs_list) {
41-
$req = 'uk.co.terryburton.bwipp' if $req eq 'preamble';
42-
(my $reqfile) = $upr =~ /^$req=(.*)$/m;
43-
$reqfiles .= " $targetdir/$reqfile";
44-
}
45-
print "$reqfiles\n";
37+
my @reqs_list = split /\s+/, $reqs;
38+
next unless @reqs_list; # Skip if no dependencies
39+
my $reqfiles = "$targetdir/$provfile : |";
40+
foreach my $req (@reqs_list) {
41+
$req = 'uk.co.terryburton.bwipp' if $req eq 'preamble';
42+
(my $reqfile) = $upr =~ /^$req=(.*)$/m;
43+
$reqfiles .= " $targetdir/$reqfile";
44+
}
45+
print "$reqfiles\n";
4646
}
4747

4848
# Standalone dependency rules (only for encoders, not preamble)
4949
if ($resource ne 'uk.co.terryburton.bwipp') {
50-
for my $standalonedir ('build/standalone', 'build/standalone_package') {
51-
my $resdir = $standalonedir eq 'build/standalone'
52-
? 'build/resource/Resource' : 'build/packaged_resource/Resource';
53-
my $reqfiles = "$standalonedir/$resource.ps :";
54-
foreach my $req (split /\s+/, $reqs) {
55-
$req = 'uk.co.terryburton.bwipp' if $req eq 'preamble';
56-
(my $reqfile) = $upr =~ /^$req=(.*)$/m;
57-
$reqfiles .= " $resdir/$reqfile";
50+
for my $standalonedir ('build/standalone', 'build/standalone_package') {
51+
my $resdir = $standalonedir eq 'build/standalone'
52+
? 'build/resource/Resource' : 'build/packaged_resource/Resource';
53+
my $reqfiles = "$standalonedir/$resource.ps :";
54+
foreach my $req (split /\s+/, $reqs) {
55+
$req = 'uk.co.terryburton.bwipp' if $req eq 'preamble';
56+
(my $reqfile) = $upr =~ /^$req=(.*)$/m;
57+
$reqfiles .= " $resdir/$reqfile";
58+
}
59+
# Include the encoder itself as a dependency
60+
$reqfiles .= " $resdir/$provfile";
61+
print "$reqfiles\n";
5862
}
59-
# Include the encoder itself as a dependency
60-
$reqfiles .= " $resdir/$provfile";
61-
print "$reqfiles\n";
62-
}
6363
}
6464

6565
exit 0;

‎build/make_monolithic.pl‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -30,37 +30,37 @@
3030

3131
while ($upr =~ /^(.*)=(.*)$/mg) {
3232

33-
my $srcfile = "src/$1.ps.src";
34-
$srcfile = 'src/preamble.ps.src' if $1 eq 'uk.co.terryburton.bwipp';
35-
my $resfile = "$resourcedir/$2";
36-
37-
open($fh, '<', $srcfile) || die "Unable to open source file: $srcfile";
38-
my $src = join('', <$fh>);
39-
close $fh;
40-
41-
(my $begin, $_, $_, my $meta, my $end) = $src =~ /
42-
(^%\ --BEGIN\ (ENCODER|RENDERER|RESOURCE)\ ([\w-]+?)--$)
43-
(.*?)
44-
^[^%].*?
45-
(^%\ --END\ \2\ \3--$)
46-
/msgx;
47-
48-
open($fh, '<', $resfile) || die "Unable to open resource file: $resfile";
49-
my $res = join('', <$fh>);
50-
close $fh;
51-
$res =~ /
52-
(^%%BeginResource:\ [\w\.]+\ [\w\.-]+?\ .*?$)
53-
.*
54-
(^%%BeginData:.*?$
55-
.*
56-
^%%EndResource$)
57-
/msgx;
58-
my $body = "$1\n$2\n";
59-
60-
print $begin;
61-
print $meta;
62-
print $body;
63-
print "$end\n\n";
33+
my $srcfile = "src/$1.ps.src";
34+
$srcfile = 'src/preamble.ps.src' if $1 eq 'uk.co.terryburton.bwipp';
35+
my $resfile = "$resourcedir/$2";
36+
37+
open($fh, '<', $srcfile) || die "Unable to open source file: $srcfile";
38+
my $src = join('', <$fh>);
39+
close $fh;
40+
41+
(my $begin, $_, $_, my $meta, my $end) = $src =~ /
42+
(^%\ --BEGIN\ (ENCODER|RENDERER|RESOURCE)\ ([\w-]+?)--$)
43+
(.*?)
44+
^[^%].*?
45+
(^%\ --END\ \2\ \3--$)
46+
/msgx;
47+
48+
open($fh, '<', $resfile) || die "Unable to open resource file: $resfile";
49+
my $res = join('', <$fh>);
50+
close $fh;
51+
$res =~ /
52+
(^%%BeginResource:\ [\w\.]+\ [\w\.-]+?\ .*?$)
53+
.*
54+
(^%%BeginData:.*?$
55+
.*
56+
^%%EndResource$)
57+
/msgx;
58+
my $body = "$1\n$2\n";
59+
60+
print $begin;
61+
print $meta;
62+
print $body;
63+
print "$end\n\n";
6464

6565
}
6666

‎build/make_resource.pl‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
($outfile) = $outfile =~ /(.*)/; # Untaint
2323

2424
END {
25-
if ($? != 0) {
26-
unlink("$outfile.tmp");
27-
unlink($outfile);
28-
}
25+
if ($? != 0) {
26+
unlink("$outfile.tmp");
27+
unlink($outfile);
28+
}
2929
}
3030

3131
(my $resdir) = $outfile =~ m#^(build/[^/]+)/#;
@@ -44,10 +44,10 @@ END
4444
close $fh;
4545

4646
$template =~ /
47-
^%\ --BEGIN\ (ENCODER|RENDERER|RESOURCE)\ ([\w-]+?)--$
48-
(.*?)
49-
(^[^%].*?)
50-
^%\ --END\ \1\ \2--$
47+
^%\ --BEGIN\ (ENCODER|RENDERER|RESOURCE)\ ([\w-]+?)--$
48+
(.*?)
49+
(^[^%].*?)
50+
^%\ --END\ \1\ \2--$
5151
/msgx;
5252

5353
my $resource = $2;
@@ -59,11 +59,11 @@ END
5959

6060
my $neededresources = '';
6161
foreach (split /\s+/, $reqs) {
62-
if ($_ eq 'preamble') {
63-
$neededresources.="Category/uk.co.terryburton.bwipp ";
64-
} else {
65-
$neededresources.="uk.co.terryburton.bwipp/$_ ";
66-
}
62+
if ($_ eq 'preamble') {
63+
$neededresources.="Category/uk.co.terryburton.bwipp ";
64+
} else {
65+
$neededresources.="uk.co.terryburton.bwipp/$_ ";
66+
}
6767
}
6868
$neededresources =~ s/\s+$//;
6969

@@ -74,8 +74,8 @@ END
7474
my $category = 'uk.co.terryburton.bwipp';
7575
my $key = $resource;
7676
if ($resource eq 'preamble') {
77-
$category = 'Category';
78-
$key = 'uk.co.terryburton.bwipp';
77+
$category = 'Category';
78+
$key = 'uk.co.terryburton.bwipp';
7979
}
8080

8181
my $vmusage = '0 0';
@@ -84,40 +84,40 @@ END
8484
my $qualifier = "0.0 $yyyy$mm$dd" . sprintf("%02d",$rr || 0);
8585

8686
{
87-
use File::Temp qw(tempfile);
88-
my ($vmusage_fh, $vmusagefile) = tempfile('vmusage.XXXXXX', DIR => '/tmp', UNLINK => 1);
89-
($vmusagefile) = $vmusagefile =~ /(.*)/; # Untaint
87+
use File::Temp qw(tempfile);
88+
my ($vmusage_fh, $vmusagefile) = tempfile('vmusage.XXXXXX', DIR => '/tmp', UNLINK => 1);
89+
($vmusagefile) = $vmusagefile =~ /(.*)/; # Untaint
9090

91-
my $oldpwd = getcwd();
92-
($oldpwd) = $oldpwd =~ /(.*)/; # Untaint
93-
chdir("$resdir/Resource") or die "Cannot chdir to $resdir/Resource: $!";
91+
my $oldpwd = getcwd();
92+
($oldpwd) = $oldpwd =~ /(.*)/; # Untaint
93+
chdir("$resdir/Resource") or die "Cannot chdir to $resdir/Resource: $!";
9494

95-
open(my $gs_fh, '-|', $gs, '-P', '-dNOSAFER', '-dQUIET', '-dNOPAUSE', '-dBATCH', '-sDEVICE=nullpage', "-sInputFilename=$abspath/$outfile.tmp", "-sOutputFilename=$abspath/$outfile", "-sVMusageFilename=$vmusagefile", "-sCategory=$category", "-sKey=$key", "-sVMusage=$vmusage", "-sQualifier=$qualifier", "-sVersion=$version", "-sNeededResources=$neededresources", "-sPostWatermark=$category/$key $qualifier", "../../$packager")
96-
or die "Cannot execute gs: $!";
97-
print while <$gs_fh>;
98-
close $gs_fh or die 'GS create resource error';
95+
open(my $gs_fh, '-|', $gs, '-P', '-dNOSAFER', '-dQUIET', '-dNOPAUSE', '-dBATCH', '-sDEVICE=nullpage', "-sInputFilename=$abspath/$outfile.tmp", "-sOutputFilename=$abspath/$outfile", "-sVMusageFilename=$vmusagefile", "-sCategory=$category", "-sKey=$key", "-sVMusage=$vmusage", "-sQualifier=$qualifier", "-sVersion=$version", "-sNeededResources=$neededresources", "-sPostWatermark=$category/$key $qualifier", "../../$packager")
96+
or die "Cannot execute gs: $!";
97+
print while <$gs_fh>;
98+
close $gs_fh or die 'GS create resource error';
9999

100-
chdir($oldpwd) or die "Cannot chdir back to $oldpwd: $!";
101-
unlink("$outfile.tmp");
100+
chdir($oldpwd) or die "Cannot chdir back to $oldpwd: $!";
101+
unlink("$outfile.tmp");
102102

103-
open(my $vm_fh, '-|', $gs, '-dQUIET', '-dNOPAUSE', '-dBATCH', '-sDEVICE=nullpage', '--', $vmusagefile, '2>&1')
104-
or die "Cannot execute gs for VMusage: $!";
105-
my $vmout = do { local $/; <$vm_fh> };
106-
close $vm_fh or die "GS measure VMusage error: $vmout";
107-
($vmusage) = $vmout =~ /VMusage \((\d+ \d+)\) def/ or die 'Failed to determine VMusage';
103+
open(my $vm_fh, '-|', $gs, '-dQUIET', '-dNOPAUSE', '-dBATCH', '-sDEVICE=nullpage', '--', $vmusagefile, '2>&1')
104+
or die "Cannot execute gs for VMusage: $!";
105+
my $vmout = do { local $/; <$vm_fh> };
106+
close $vm_fh or die "GS measure VMusage error: $vmout";
107+
($vmusage) = $vmout =~ /VMusage \((\d+ \d+)\) def/ or die 'Failed to determine VMusage';
108108

109-
# $vmusagefile auto-deleted when $vmusage_fh goes out of scope
109+
# $vmusagefile auto-deleted when $vmusage_fh goes out of scope
110110
}
111111

112112
# Stamp VMusage into the resource
113113
{
114-
$^I = '';
115-
@ARGV = ($outfile);
116-
while (<>) {
117-
s/%%VMusage: \d+ \d+/%%VMusage: $vmusage/g;
118-
s/%%BeginResource: (.*) \d+ \d+/%%BeginResource: $1 $vmusage/g;
119-
print;
120-
}
114+
$^I = '';
115+
@ARGV = ($outfile);
116+
while (<>) {
117+
s/%%VMusage: \d+ \d+/%%VMusage: $vmusage/g;
118+
s/%%BeginResource: (.*) \d+ \d+/%%BeginResource: $1 $vmusage/g;
119+
print;
120+
}
121121
}
122122

123123
$? = 0; # Mark successful completion

0 commit comments

Comments
 (0)