From 9928e3418f67fe6d2f82292ddbddcf56ae20b8f6 Mon Sep 17 00:00:00 2001
From: Jonathan Gordon <rockbox@jdgordon.info>
Date: Tue, 14 Sep 2010 11:56:50 +0000
Subject: Another major skin backend update/hopefully bugfix: Skins are now
 more self contained in the skin manager which in the future might allow on
 demand skin loading (i.e smaller skin buffers) Skin backdrops are also
 managed more intelegently (fixes a bug where you can get a crazy backdrop
 loaded if a .sbs fails to load)

the rockbox_default rescue theme is now called rockbox_failsafe to better express what it actually is.

This commit hopefully/maybe fixes the heavily reported data aborts, so please check if you are getting them

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28073 a1c6a512-1295-4272-9138-f99709370657
---
 tools/buildzip.pl | 43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index e0b0bbb5de..e299d7c02a 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -305,6 +305,47 @@ sub filesize {
     return $size;
 }
 
+sub create_failsafefiles {
+    my ($dir) = @_;
+    my $text = "# Dummy file to allow Rockbox to reset to the default skin config.
+# Do not edit this file.  It's never actually loaded by Rockbox.";
+    open (FOO, ">$dir/wps/rockbox_failsafe.wps");
+    print FOO $text;
+    close(FOO);
+    open (FOO, ">$dir/wps/rockbox_failsafe.rwps");
+    print FOO $text;
+    close(FOO);
+    open (FOO, ">$dir/wps/rockbox_failsafe.sbs");
+    print FOO $text;
+    close(FOO);
+    open (FOO, ">$dir/wps/rockbox_failsafe.rsbs");
+    print FOO $text;
+    close(FOO);
+    open (FOO, ">$dir/wps/rockbox_failsafe.fms");
+    print FOO $text;
+    close(FOO);
+    open (FOO, ">$dir/wps/rockbox_failsafe.rfms");
+    print FOO $text;
+    close(FOO);
+    open (FOO, ">$dir/themes/rockbox_failsafe.cfg");
+    print FOO <<STOP
+# This config has been autogenerated to reload the failsafe setup
+wps: $dir/wps/rockbox_failsafe.wps
+rwps: $dir/wps/rockbox_failsafe.rwps
+sbs: $dir/wps/rockbox_failsafe.sbs
+rsbs: $dir/wps/rockbox_failsafe.rsbs
+fms: $dir/wps/rockbox_failsafe.fms
+rfms: $dir/wps/rockbox_failsafe.rfms
+statusbar: top
+font: 08-Schumacher-Clean.fnt
+foreground color: 000000
+background color: B6C6E5
+selector type: bar (inverse)
+STOP
+;
+    close(FOO);
+}
+
 sub buildzip {
     my ($image, $fonts)=@_;    
     my $libdir = $install;
@@ -508,6 +549,7 @@ STOP
              "$temp_dir/rocks/demos/pictureflow_splash.bmp");
 
     }
+    create_failsafefiles($temp_dir);
 
     if($image) {
         # image is blank when this is a simulator
@@ -572,7 +614,6 @@ STOP
     } else {
         copy("$ROOT/wps/classic_statusbar.112x64x1.sbs", "$temp_dir/wps/classic_statusbar.sbs");
     }
-    system("touch $temp_dir/wps/rockbox_none.sbs");
     if ($remote_depth != $depth) {
 		copy("$ROOT/wps/classic_statusbar.mono.sbs", "$temp_dir/wps/classic_statusbar.rsbs");
 	} else {
-- 
cgit v1.2.3