Commit c66a2ac4 authored by Robert Sprowson's avatar Robert Sprowson

Import of Ursula and Morris4 themed sprites

Addtionally
* Recovered the PocketFS & Advance patches, there's no reason to hide them, especially as they're mentioned in !Help
* Unsqueeze module made 26/32 bit neutral since this is on the disc image
* RMEnsure in !Run bumped up to make sure the above change is taken
* 2D templates shelved
* Auto insert version number into info box
* Made some Ursula contemporary sprites

Version number bumped (now it's actually displayed) by 1.32 + 0.04 to correspond to Acorn's last version plus 4 commits here.
Tested with a fake !PocketFS application, applying then removing the patch.

Version 1.36. Tagged as 'Patch-1_36'
parent 5b606981
......@@ -23,22 +23,10 @@ APP = !${COMPONENT}
RDIR = Resources
LDIR = ${RDIR}.${LOCALE}
INSTAPP = ${INSTDIR}.${APP}
MSGVERSION = ${AWK} -f Build:AwkVers
MSGS = Resources.GenMessage
# Generic options:
#
AS = objasm
CC = cc
CP = copy
LD = link
MKDIR = do mkdir -p
RM = remove
SQUEEZE = squeeze
XWIPE = x wipe
AFLAGS = -depend !Depend ${THROWBACK} -stamp -quit
CFLAGS = -c -depend !Depend -IC:
CPFLAGS = ~cfr~v
WFLAGS = ~c~v
include StdTools
#
# Libraries
......@@ -59,7 +47,7 @@ FILES =\
$(RDIR).BootStrap\
Library.squeeze\
Modules.UnSqueeze\
$(LDIR).Messages\
${MSGS}\
$(LDIR).ReadMe\
$(LDIR).Templates\
$(RDIR).Transforms
......@@ -85,17 +73,26 @@ install: $(FILES)
CPFDL $(LDIR) !Help
CPFDL $(LDIR) !Run
CPFDL $(RDIR) !RunImage
CPFDL $(RDIR) !Sprites
CPFDL $(RDIR) !Sprites22
CPFDL $(RDIR) !Sprites11
CPFDL $(RDIR) BootStrap
${CP} ${MSGS} $(INSTAPP).Messages ${CPFLAGS}
|
$(MKDIR) $(INSTAPP).Themes.Ursula; Access $(INSTAPP).Themes.Ursula /r
$(MKDIR) $(INSTAPP).Themes.Morris4; Access $(INSTAPP).Themes.Morris4 /r
$(CP) $(RDIR).!Sprites $(INSTAPP).Themes.!Sprites ${CPFLAGS}
$(CP) $(RDIR).!Sprites22 $(INSTAPP).Themes.!Sprites22 ${CPFLAGS}
$(CP) $(RDIR).!Sprites11 $(INSTAPP).Themes.!Sprites11 ${CPFLAGS}
$(CP) $(RDIR).Morris4.!Sprites $(INSTAPP).Themes.Morris4.!Sprites ${CPFLAGS}
$(CP) $(RDIR).Morris4.!Sprites22 $(INSTAPP).Themes.Morris4.!Sprites22 ${CPFLAGS}
$(CP) $(RDIR).Ursula.!Sprites $(INSTAPP).Themes.Ursula.!Sprites ${CPFLAGS}
$(CP) $(RDIR).Ursula.!Sprites22 $(INSTAPP).Themes.Ursula.!Sprites22 ${CPFLAGS}
|
$(MKDIR) $(INSTAPP).Library; Access $(INSTAPP).Library /r
CPFDL @ Library.squeeze
$(MKDIR) $(INSTAPP).Modules; Access $(INSTAPP).Modules /r
CPFDL @ Modules.UnSqueeze
CPFDL $(LDIR) Messages
|
$(MKDIR) $(INSTAPP).Patches; Access $(INSTAPP).Patches /r
CPFDL @ Patches
|
CPFDL $(LDIR) ReadMe
CPFDL $(LDIR) Templates
......@@ -111,6 +108,7 @@ clean:
$(RM) ${RDIR}.!RunImage
$(RM) s.TokHelpSrc
$(RM) Modules.UnSqueeze
$(RM) ${MSGS}
@echo $(COMPONENT): cleaned
#
......@@ -125,7 +123,10 @@ Modules.UnSqueeze: s.UnSqueeze s.TokHelpSrc
$(RDIR).!RunImage: $(OBJS) $(CLIB) $(RLIB)
$(LD) -o $@ $(OBJS) $(CLIB) $(RLIB)
$(SQUEEZE) $@
$(SQZ) $@
${MSGS}: ${LDIR}.Messages VersionNum
${MSGVERSION} ${LDIR}.Messages > $@
#---------------------------------------------------------------------------
# Dynamic dependencies:
# Patch to allow Advance 1.01 to work with StrongARM
# Synchronises dynamic code in !Advance.!RunImage
Application:!Advance &2000
Description:Productivity Suite
Patch:Allows Advance 1.01 to work with StrongARM
File:!Advance.!RunImage &FF8
Transform:Squeeze
Location:&000035F0
ChangeWord:&E1A0F00D &EA0001B7
Location:&00003CC4
ChangeWord:&72616853 &62694C43
ChangeWord:&43206465 &6F6F7420
ChangeWord:&62696C20 &646C6F20
ChangeWord:&79726172 &00000000
ChangeWord:&20736920 &E3A00000
ChangeWord:&2074756F &EF02006E
ChangeWord:&6420666F &E59D0000
ChangeWord:&00657461 &E1A0F00D
# Patch to allow PocketFS to work with RISC OS 3.7
# Fixes bug where 0 is used as 'no iconbar icon' value;
# iconbar icon number can be 0 and sometimes is in 3.7
Application:!PocketFS &2000
Description:Link to PocketBook
Patch:Allows PocketFS 2.03 to work with RISC OS 3.7
File:!PocketFS.!RunImage &FF8
Transform:Copy
Location:&000004F0
ChangeWord:&E58C0024 &E3E00000
ChangeWord:&E3E00000 &E58C0024
Location:&00001C48
ChangeWord:&E3300000 &E3700001
If "<Patch$Path>"="" Then Set Patch$Path <Obey$Dir>.
IconSprites Patch:!Sprites
IconSprites Patch:Themes.!Sprites
Set File$Type_FC3 Patch
Set Alias$@RunType_FC3 Run Patch:!Run
......@@ -7,10 +7,10 @@ RMEnsure FileSwitch 1.98 Error !Patch requires FileSwitch 1.98 or later
RMEnsure SharedCLibrary 3.99 Error !Patch requires SharedCLibrary 3.99 or later
Set Patch$Path <Obey$Dir>.
IconSprites Patch:!Sprites
IconSprites Patch:Themes.!Sprites
Set File$Type_FC3 Patch
Set Alias$@RunType_FC3 Run Patch:!Run
RMEnsure UnSqueeze 1.24 RMLoad Patch:Modules.UnSqueeze
RMEnsure UnSqueeze 1.27 RMLoad Patch:Modules.UnSqueeze
WimpSlot -min 96k -max 96k
Run Patch:!RunImage %*0
......@@ -2,6 +2,7 @@
# MessageTrans messages file for the application patcher.
TaskName:Application Patcher
_Version:Auto inserted
ErrorTitle:Patcher
IcBarSprite:!patch
IcBarMTitl:Patcher
......
/* (0.04)
/* (1.36)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.04
#define Module_MajorVersion_CMHG 1.36
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 29 Aug 2012
#define Module_Date_CMHG 13 May 2013
#define Module_MajorVersion "0.04"
#define Module_Version 4
#define Module_MajorVersion "1.36"
#define Module_Version 136
#define Module_MinorVersion ""
#define Module_Date "29 Aug 2012"
#define Module_Date "13 May 2013"
#define Module_ApplicationDate "29-Aug-12"
#define Module_ApplicationDate "13-May-13"
#define Module_ComponentName "Patch"
#define Module_ComponentPath "castle/RiscOS/Sources/Utilities/Patches/Patch"
#define Module_FullVersion "0.04"
#define Module_HelpVersion "0.04 (29 Aug 2012)"
#define Module_LibraryVersionInfo "0:4"
#define Module_FullVersion "1.36"
#define Module_HelpVersion "1.36 (13 May 2013)"
#define Module_LibraryVersionInfo "1:36"
......@@ -120,6 +120,7 @@ static void icon_bar_menu_proc
if (hit[1] != 0)
{
info_box = dbox_new("ProgInfo");
dbox_setfield(info_box, 4, MSG_LOOKUP0("_Version"));
dbox_show(info_box);
dbox_fillin(info_box);
dbox_dispose(&info_box);
......
......@@ -52,8 +52,6 @@ Module_BaseAddr
DCD 0 ; SWI decode code
DCD 0 ; Messages file
DCD UnSqueeze_ModFlags - Module_BaseAddr
UnSqueeze_ModFlags
DCD ModuleFlag_32bit
]
UnSqueeze_HC_Table
......@@ -64,12 +62,17 @@ UnSqueeze_Title
DCB "UnSqueeze", 0
UnSqueeze_HelpStr
DCB "UnSqueeze", 9, "1.26 (15 Jan 2004)", 0
DCB "UnSqueeze", 9, "1.27 (13 May 2013)", 0
GET TokHelpSrc.s
ALIGN
[ :LNOT: No32bitCode
UnSqueeze_ModFlags
DCD ModuleFlag_32bit
]
; --------------------------------------------------------------------------
; Workspace relative to r11, which contains &8000 ie. our workspace is
......@@ -324,16 +327,8 @@ decomp_slot_ok
; Drop into user mode - the unsqueezing code assumes that it is in user
; mode and anyway it is better to be in user mode (memory protection).
; Put a NOP after the mode change, as the following code access R11
; which is a banked register.
[ No32bitCode
TEQ pc, #0
|
MRS r0, CPSR
BIC r0, r0, #&F
MSR CPSR_c, r0
]
WritePSRc USR_mode, r0
; Put the return instruction and return address into our workspace, along
; with the user mode stack pointer which must also be preserved, and call
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment