diff options
| author | John-Mark Bell <jmb@netsurf-browser.org> | 2015-02-28 19:06:38 +0000 |
|---|---|---|
| committer | John-Mark Bell <jmb@netsurf-browser.org> | 2015-02-28 19:07:28 +0000 |
| commit | 21cf3d6186c57047e819d18c83bac9aa5b95cfc3 (patch) | |
| tree | dcc9058a1bff50a2410cea306fbf5baa7566b389 | |
| parent | 74e2c86555ec6695e40c1c2ff57ac79950e8fb48 (diff) | |
| download | netsurf-21cf3d6186c57047e819d18c83bac9aa5b95cfc3.tar.gz netsurf-21cf3d6186c57047e819d18c83bac9aa5b95cfc3.tar.bz2 | |
RISC OS: fix the worst of the !Cache badness.
| -rw-r--r-- | riscos/distribution/!Boot/Resources/!Cache/!Boot,feb | 20 | ||||
| -rw-r--r-- | riscos/distribution/!Boot/Resources/!Cache/!Run,feb | 11 |
2 files changed, 22 insertions, 9 deletions
diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb b/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb index f126ba27a..485bd521d 100644 --- a/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb +++ b/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb @@ -1,3 +1,17 @@ -Set Cache$FromBoot True -If "<Cache$Dir>" = "" Then Run <Obey$Dir>.!Run -Unset Cache$FromBoot
\ No newline at end of file +If (("<Cache$AppDir>" = "") OR ("<Cache$ForceVars>" = "1")) Then Set Cache$AppDir <Obey$Dir> + +IconSprites <Cache$AppDir>.!Sprites + +| Find and set up resource paths +WimpSlot -min 64k -max 64k +Run <Cache$AppDir>.Resources.ResFind CacheApp +If (("<Cache$Meta>" = "") OR ("<Cache$ForceVars>" = "1")) Then Set Cache$Meta CacheAppRes:!Meta + +| Work out where the cache directory should be -- use Choices$User if set or Default, otherwise. +Set Cache$Suffix "<Choices$User>" +If "<Cache$Suffix>" = "" Then Set Cache$Suffix "Default" +If (("<Cache$Dir>" = "") OR ("<Cache$ForceVars>" = "1")) Then Set Cache$Dir "<Cache$AppDir>.Caches.<Cache$Suffix>" +Unset Cache$Suffix + +| Ensure cache directory exists (sadly, unavoidable) +CDir <Cache$Dir> diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Run,feb b/riscos/distribution/!Boot/Resources/!Cache/!Run,feb index a920e39ab..8aead9733 100644 --- a/riscos/distribution/!Boot/Resources/!Cache/!Run,feb +++ b/riscos/distribution/!Boot/Resources/!Cache/!Run,feb @@ -1,10 +1,9 @@ -Set Cache$AppDir <Obey$Dir> -IconSprites <Cache$AppDir>.!Sprites - -Run <Cache$AppDir>.Resources.ResFind CacheApp -Set Cache$Meta CacheAppRes:!Meta +Set Cache$ForceVars 1 +Run <Obey$Dir>.!Boot +Unset Cache$ForceVars RMEnsure SysLog 0.17 IfThere <SysLog$Dir>.!Run Then Run <SysLog$Dir>.!Run RMEnsure SysLog 0.17 Set Cache$SysLogMissing "True" -Run <Cache$AppDir>.!RunImage
\ No newline at end of file +Wimpslot -min 128k -max 128k +Run <Cache$AppDir>.!RunImage |