TAB/whitespace policing - no functional changes

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16383 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dave Chapman 2008-02-23 10:03:51 +00:00
parent b68a762aef
commit a32de4f25f

View file

@ -13,7 +13,7 @@ $ROOT="..";
if($ARGV[0] eq "-r") { if($ARGV[0] eq "-r") {
$ROOT=$ARGV[1]; $ROOT=$ARGV[1];
shift @ARGV; shift @ARGV;
shift @ARGV; shift @ARGV;
} }
my $verbose; my $verbose;
@ -27,7 +27,7 @@ my $firmdir="$ROOT/firmware";
my $wpslist=$ARGV[0]; my $wpslist=$ARGV[0];
my $target = $ARGV[1]; my $target = $ARGV[1];
my $cppdef = $target; my $cppdef = $target;
my @depthlist = ( 16, 8, 4, 2, 1 ); my @depthlist = ( 16, 8, 4, 2, 1 );
if(!$wpslist) { if(!$wpslist) {
@ -37,7 +37,8 @@ if(!$wpslist) {
exit; exit;
} }
sub getlcdsizes { sub getlcdsizes
{
my ($remote) = @_; my ($remote) = @_;
open(GCC, ">gcctemp"); open(GCC, ">gcctemp");
@ -65,7 +66,7 @@ STOP
close(GCC); close(GCC);
my $c="cat gcctemp | gcc $cppdef -I. -I$firmdir/export -E -P -"; my $c="cat gcctemp | gcc $cppdef -I. -I$firmdir/export -E -P -";
#print "CMD $c\n"; #print "CMD $c\n";
open(GETSIZE, "$c|"); open(GETSIZE, "$c|");
@ -91,7 +92,8 @@ STOP
return ($height, $width, $depth); return ($height, $width, $depth);
} }
sub mkdirs { sub mkdirs
{
my $wpsdir = $wps; my $wpsdir = $wps;
$wpsdir =~ s/\.(r|)wps//; $wpsdir =~ s/\.(r|)wps//;
mkdir ".rockbox/wps", 0777; mkdir ".rockbox/wps", 0777;
@ -106,40 +108,44 @@ sub mkdirs {
} }
} }
sub copybackdrop { sub copybackdrop
#copy the backdrop file into the build dir {
$dst = $backdrop; #copy the backdrop file into the build dir
$dst =~ s/(\.[0-9]*x[0-9]*x[0-9]*)//; $dst = $backdrop;
$cmd = "cp $ROOT/$backdrop .rockbox/$dst"; $dst =~ s/(\.[0-9]*x[0-9]*x[0-9]*)//;
`$cmd`; $cmd = "cp $ROOT/$backdrop .rockbox/$dst";
`$cmd`;
} }
sub copythemefont { sub copythemefont
#copy the font specified by the theme {
#copy the font specified by the theme
$o=$font;
$o =~ s/\.fnt/\.bdf/; $o=$font;
`mkdir .rockbox/fonts/ >/dev/null 2>&1`; $o =~ s/\.fnt/\.bdf/;
$cmd ="$ROOT/tools/convbdf -f -o \".rockbox/fonts/$font\" \"$ROOT/fonts/$o\" "; `mkdir .rockbox/fonts/ >/dev/null 2>&1`;
`$cmd`; $cmd ="$ROOT/tools/convbdf -f -o \".rockbox/fonts/$font\" \"$ROOT/fonts/$o\" ";
`$cmd`;
} }
sub copythemeicon { sub copythemeicon
#copy the icon specified by the theme {
#copy the icon specified by the theme
$iconset =~ /\/(.*icons\/(.*))/i;
`cp $ROOT/icons/$2 $1`; $iconset =~ /\/(.*icons\/(.*))/i;
`cp $ROOT/icons/$2 $1`;
} }
sub copythemeviewericon { sub copythemeviewericon
#copy the viewer icon specified by the theme {
#copy the viewer icon specified by the theme
$viewericon =~ /\/(.*icons\/(.*))/i;
`cp $ROOT/icons/$2 $1`; $viewericon =~ /\/(.*icons\/(.*))/i;
`cp $ROOT/icons/$2 $1`;
} }
sub copywps
sub copywps { {
# we assume that we copy the WPS files from the same dir the WPSLIST # we assume that we copy the WPS files from the same dir the WPSLIST
# file is located in # file is located in
my $dir; my $dir;
@ -214,10 +220,10 @@ MOO
push @out, "statusbar: $statusbar\n"; push @out, "statusbar: $statusbar\n";
} }
if($backdrop) { if($backdrop) {
#clip resolution from filename # clip resolution from filename
$backdrop =~ s/(\.[0-9]*x[0-9]*x[0-9]*)//; $backdrop =~ s/(\.[0-9]*x[0-9]*x[0-9]*)//;
push @out, "backdrop: /.rockbox/$backdrop\n"; push @out, "backdrop: /.rockbox/$backdrop\n";
} }
if($lineselectstart && $main_depth > 2) { if($lineselectstart && $main_depth > 2) {
push @out, "line selector start color: $lineselectstart\n"; push @out, "line selector start color: $lineselectstart\n";
} }
@ -273,7 +279,7 @@ while(<WPS>) {
undef $wps; undef $wps;
undef $wps_prefix; undef $wps_prefix;
undef $rwps; undef $rwps;
undef $width; undef $width;
undef $height; undef $height;
undef $font; undef $font;
undef $fgcolor; undef $fgcolor;
@ -290,7 +296,7 @@ while(<WPS>) {
undef $viewericon; undef $viewericon;
undef $lineselecttextcolor; undef $lineselecttextcolor;
undef $filetylecolor; undef $filetylecolor;
next; next;
} }
if($within) { if($within) {
@ -298,11 +304,11 @@ while(<WPS>) {
# Get the required width and height # Get the required width and height
my ($rheight, $rwidth, $rdepth); my ($rheight, $rwidth, $rdepth);
if($isrwps) { if($isrwps) {
($rheight, $rwidth, $rdepth) = ($rheight, $rwidth, $rdepth) =
($remote_height, $remote_width, $remote_depth); ($remote_height, $remote_width, $remote_depth);
} }
else { else {
($rheight, $rwidth, $rdepth) = ($rheight, $rwidth, $rdepth) =
($main_height, $main_width, $main_depth); ($main_height, $main_width, $main_depth);
} }
@ -317,7 +323,7 @@ while(<WPS>) {
# If this WPS installable on this platform, one of the following # If this WPS installable on this platform, one of the following
# two files will be present # two files will be present
foreach $d (@depthlist) { foreach $d (@depthlist) {
next if ($d > $rdepth); next if ($d > $rdepth);
$req_g = $rwidth . "x" . $rheight . "x" . $d; $req_g = $rwidth . "x" . $rheight . "x" . $d;
@ -328,16 +334,16 @@ while(<WPS>) {
$req_g = $req_g . "." . $main_width . "x" . $main_height . "x" . "$main_depth"; $req_g = $req_g . "." . $main_width . "x" . $main_height . "x" . "$main_depth";
$req_g_wps = $wps_prefix . "." . $req_g . ".wps"; $req_g_wps = $wps_prefix . "." . $req_g . ".wps";
last if (-e "$wpsdir/$req_g_wps"); last if (-e "$wpsdir/$req_g_wps");
} }
} }
$req_t_wps = $wps_prefix . ".txt" . ".wps"; $req_t_wps = $wps_prefix . ".txt" . ".wps";
#print "LCD: $wps wants $height x $width\n"; #print "LCD: $wps wants $height x $width\n";
#print "LCD: is $rheight x $rwidth\n"; #print "LCD: is $rheight x $rwidth\n";
#print "gwps: $wpsdir/$req_g_wps" . "\n"; #print "gwps: $wpsdir/$req_g_wps" . "\n";
if (-e "$wpsdir/$req_g_wps" || -e "$wpsdir/$req_t_wps" ) { if (-e "$wpsdir/$req_g_wps" || -e "$wpsdir/$req_t_wps" ) {
# #
# The target model has an LCD that is suitable for this # The target model has an LCD that is suitable for this
# WPS # WPS
@ -351,7 +357,7 @@ while(<WPS>) {
copywps(); copywps();
} }
else { else {
#print "(${wps_prefix}-${rwidth}x${rheight}x$rdepth) "; #print "(${wps_prefix}-${rwidth}x${rheight}x$rdepth) ";
#print "Skip $wps due to size restraints\n"; #print "Skip $wps due to size restraints\n";
} }
$within = 0; $within = 0;
@ -377,13 +383,13 @@ while(<WPS>) {
} }
elsif($l =~ /^Width\.${main_width}x${main_height}x$main_depth: (.*)/i) { elsif($l =~ /^Width\.${main_width}x${main_height}x$main_depth: (.*)/i) {
$width = $1; $width = $1;
} }
elsif($l =~ /^Height: (.*)/i) { elsif($l =~ /^Height: (.*)/i) {
$height = $1; $height = $1;
} }
elsif($l =~ /^Height\.${main_width}x${main_height}x$main_depth: (.*)/i) { elsif($l =~ /^Height\.${main_width}x${main_height}x$main_depth: (.*)/i) {
$height = $1; $height = $1;
} }
elsif($l =~ /^Font: (.*)/i) { elsif($l =~ /^Font: (.*)/i) {
$font = $1; $font = $1;
} }
@ -402,55 +408,52 @@ while(<WPS>) {
} }
elsif($l =~ /^Statusbar\.${main_width}x${main_height}x$main_depth: (.*)/i) { elsif($l =~ /^Statusbar\.${main_width}x${main_height}x$main_depth: (.*)/i) {
$statusbar = $1; $statusbar = $1;
} }
elsif($l =~ /^Backdrop: (.*)/i) { elsif($l =~ /^Backdrop: (.*)/i) {
$backdrop = $1; $backdrop = $1;
copybackdrop(); copybackdrop();
} }
elsif($l =~ /^Backdrop\.${main_width}x${main_height}x$main_depth: (.*)/i) { elsif($l =~ /^Backdrop\.${main_width}x${main_height}x$main_depth: (.*)/i) {
$backdrop = $1; $backdrop = $1;
copybackdrop(); copybackdrop();
} }
elsif($l =~ /^line selector start color: (.*)/i) { elsif($l =~ /^line selector start color: (.*)/i) {
$lineselectstart = $1; $lineselectstart = $1;
} }
elsif($l =~ /^line selector end color: (.*)/i) { elsif($l =~ /^line selector end color: (.*)/i) {
$lineselectend = $1; $lineselectend = $1;
} }
elsif($l =~ /^selector type: (.*)/i) { elsif($l =~ /^selector type: (.*)/i) {
$selecttype = $1; $selecttype = $1;
} }
elsif($l =~ /^selector type\.${main_width}x${main_height}x$main_depth: (.*)/i) { elsif($l =~ /^selector type\.${main_width}x${main_height}x$main_depth: (.*)/i) {
$selecttype = $1; $selecttype = $1;
} }
elsif($l =~ /^iconset: (.*)/i) { elsif($l =~ /^iconset: (.*)/i) {
$iconset = $1; $iconset = $1;
copythemeicon(); copythemeicon();
} }
elsif($l =~ /^iconset\.${main_width}x${main_height}x$main_depth: (.*)/i) { elsif($l =~ /^iconset\.${main_width}x${main_height}x$main_depth: (.*)/i) {
$iconset = $1; $iconset = $1;
copythemeicon(); copythemeicon();
} }
elsif($l =~ /^viewers iconset: (.*)/i) { elsif($l =~ /^viewers iconset: (.*)/i) {
$viewericon = $1; $viewericon = $1;
copythemeviewericon(); copythemeviewericon();
} }
elsif($l =~ /^viewers iconset\.${main_width}x${main_height}x$main_depth: (.*)/i) { elsif($l =~ /^viewers iconset\.${main_width}x${main_height}x$main_depth: (.*)/i) {
$viewericon = $1; $viewericon = $1;
copythemeviewericon(); copythemeviewericon();
} }
elsif($l =~ /^line selector text color: (.*)/i) { elsif($l =~ /^line selector text color: (.*)/i) {
$lineselecttextcolor = $1; $lineselecttextcolor = $1;
} }
elsif($l =~ /^filetype colours: (.*)/i) { elsif($l =~ /^filetype colours: (.*)/i) {
$filetylecolor = $1; $filetylecolor = $1;
} }
else{ else{
#print "Unknown line: $l!\n"; #print "Unknown line: $l!\n";
} }
} }
} }