Commit 16faf748 authored by Simon Forrest's avatar Simon Forrest
Browse files

* Removed dependency on obsolete STB flag.

Detail:

  * No longer relies on the STB flag; instead utilises "Hdr:UserIF.<UserIF>"
    to provide the Embedded_UI flag.

Admin:

  * Built and tested on Lazarus 32-bit build.  Code is binary identical
    to previous version in both STB and non-STB cases.

  * Requires HdrSrc 1.17 or later.

Version 2.61. Tagged as 'Desktop-2_61'
parent bb3d348c
...@@ -29,7 +29,6 @@ MKDIR = cdir ...@@ -29,7 +29,6 @@ MKDIR = cdir
AS = aasm AS = aasm
CP = copy CP = copy
RM = remove RM = remove
STRIP = stripdepnd
CCFLAGS = -c -depend !Depend -IC: CCFLAGS = -c -depend !Depend -IC:
ASFLAGS = -depend !Depend -Stamp -quit -module -To $@ -From ASFLAGS = -depend !Depend -Stamp -quit -module -To $@ -From
CPFLAGS = ~cfr~v CPFLAGS = ~cfr~v
...@@ -56,7 +55,6 @@ install_rom: ${TARGET} ...@@ -56,7 +55,6 @@ install_rom: ${TARGET}
clean: clean:
${RM} ${TARGET} ${RM} ${TARGET}
${STRIP}
@echo ${COMPONENT}: cleaned @echo ${COMPONENT}: cleaned
resources: resources-${CMDHELP} resources: resources-${CMDHELP}
......
...@@ -14,3 +14,5 @@ ...@@ -14,3 +14,5 @@
| |
Dir <Obey$Dir> Dir <Obey$Dir>
amu_machine clean amu_machine clean
ifthere Run:stripdepnd then stripdepnd <Obey$Dir>.Makefile
...@@ -8,11 +8,17 @@ ...@@ -8,11 +8,17 @@
GBLS Module_FullVersion GBLS Module_FullVersion
GBLS Module_ApplicationDate2 GBLS Module_ApplicationDate2
GBLS Module_ApplicationDate4 GBLS Module_ApplicationDate4
Module_MajorVersion SETS "2.60" GBLS Module_HelpVersion
Module_Version SETA 260 GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "2.61"
Module_Version SETA 261
Module_MinorVersion SETS "" Module_MinorVersion SETS ""
Module_Date SETS "10 Jul 2000" Module_Date SETS "01 Mar 2001"
Module_ApplicationDate2 SETS "10-Jul-00" Module_ApplicationDate2 SETS "01-Mar-01"
Module_ApplicationDate4 SETS "10-Jul-2000" Module_ApplicationDate4 SETS "01-Mar-2001"
Module_FullVersion SETS "2.60" Module_ComponentName SETS "Desktop"
Module_ComponentPath SETS "RiscOS/Sources/Desktop/Desktop"
Module_FullVersion SETS "2.61"
Module_HelpVersion SETS "2.61 (01 Mar 2001)"
END END
/* (2.60) /* (2.61)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* *
*/ */
#define Module_MajorVersion_CMHG 2.60 #define Module_MajorVersion_CMHG 2.61
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 10 Jul 2000 #define Module_Date_CMHG 01 Mar 2001
#define Module_MajorVersion "2.60" #define Module_MajorVersion "2.61"
#define Module_Version 260 #define Module_Version 261
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "10 Jul 2000" #define Module_Date "01 Mar 2001"
#define Module_ApplicationDate2 "10-Jul-00" #define Module_ApplicationDate2 "01-Mar-01"
#define Module_ApplicationDate4 "10-Jul-2000" #define Module_ApplicationDate4 "01-Mar-2001"
#define Module_FullVersion "2.60" #define Module_ComponentName "Desktop"
#define Module_ComponentPath "RiscOS/Sources/Desktop/Desktop"
#define Module_FullVersion "2.61"
#define Module_HelpVersion "2.61 (01 Mar 2001)"
...@@ -50,6 +50,8 @@ ...@@ -50,6 +50,8 @@
; 15-May-95 RWB Make welcome banner not appear ; 15-May-95 RWB Make welcome banner not appear
; 03-Mar-00 SAR Change Boot$Error box to only have a 'Reboot' button on STBs ; 03-Mar-00 SAR Change Boot$Error box to only have a 'Reboot' button on STBs
; 20-Apr-00 2.58 KJB Made 32-bit compatible. ; 20-Apr-00 2.58 KJB Made 32-bit compatible.
; 26-Feb-01 2.60 SBF Removed dependency on the (now obsolete) STB flag; was all specific
; to the STB/NC user interface. Now uses Embedded_UI flag instead.
;NK version, uses template for welcome banner ;NK version, uses template for welcome banner
...@@ -62,6 +64,7 @@ Module_BaseAddr ...@@ -62,6 +64,7 @@ Module_BaseAddr
GET Hdr:ModHand GET Hdr:ModHand
GET Hdr:Services GET Hdr:Services
GET Hdr:Machine.<Machine> GET Hdr:Machine.<Machine>
GET Hdr:UserIF.<UserIF>
GET Hdr:CMOS GET Hdr:CMOS
GET Hdr:Proc GET Hdr:Proc
GET Hdr:FSNumbers GET Hdr:FSNumbers
...@@ -83,7 +86,7 @@ Module_BaseAddr ...@@ -83,7 +86,7 @@ Module_BaseAddr
GBLL DesktopAllAtOnce GBLL DesktopAllAtOnce
DesktopAllAtOnce SETL {TRUE} DesktopAllAtOnce SETL {TRUE}
GBLL NewBanner GBLL NewBanner
NewBanner SETL {TRUE} :LAND: :LNOT: STB NewBanner SETL {TRUE} :LAND: :LNOT: Embedded_UI
GBLL KeepItUp GBLL KeepItUp
KeepItUp SETL {TRUE} :LAND: NewBanner KeepItUp SETL {TRUE} :LAND: NewBanner
...@@ -260,7 +263,7 @@ appsdir DCB "Resources:$.Apps", 0 ...@@ -260,7 +263,7 @@ appsdir DCB "Resources:$.Apps", 0
plingstar DCB "!*", 0 plingstar DCB "!*", 0
; RWB - Remove welcome screen for STB ; RWB - Remove welcome screen for STB
; NDT - Merged conditionals from RiscOS 3.70 and NCOS 1.06 ; NDT - Merged conditionals from RiscOS 3.70 and NCOS 1.06
[ :LNOT: STB :LAND: :LNOT: NewBanner [ :LNOT: Embedded_UI :LAND: :LNOT: NewBanner
WelcomeString1 DCB "RO3",0 WelcomeString1 DCB "RO3",0
WelcomeString2 DCB "CopyRt",0 WelcomeString2 DCB "CopyRt",0
WelcomeString3 DCB "Init",0 WelcomeString3 DCB "Init",0
...@@ -477,8 +480,8 @@ StartAsTask ...@@ -477,8 +480,8 @@ StartAsTask
SWI XWimp_ReportError SWI XWimp_ReportError
BVS Exit BVS Exit
[ STB [ Embedded_UI
SWI XOS_Reset ; The only button on STB's error box is 'Retry' SWI XOS_Reset ; The only button on STB's error box is 'Retry'
| |
CMP R1, #4 CMP R1, #4
SWICC XOS_Reset ; Retry selected: don't expect to return from this! SWICC XOS_Reset ; Retry selected: don't expect to return from this!
...@@ -507,7 +510,7 @@ StartAsTask ...@@ -507,7 +510,7 @@ StartAsTask
str_floppyboot DCB "Run ADFS::0.$.!Boot",0 str_floppyboot DCB "Run ADFS::0.$.!Boot",0
str_booterror DCB "Boot$Error",0 str_booterror DCB "Boot$Error",0
[ STB [ Embedded_UI
token_booterror DCB "BootErrSTB",0 token_booterror DCB "BootErrSTB",0
token_errorbuttons DCB "ErrButtSTB",0 token_errorbuttons DCB "ErrButtSTB",0
| |
...@@ -535,7 +538,7 @@ NoBootError ...@@ -535,7 +538,7 @@ NoBootError
MOVVS R0,#0 MOVVS R0,#0
BVS NoWelcome BVS NoWelcome
TEQ R1,#0 ; Was it claimed ? TEQ R1,#0 ; Was it claimed ?
[ :LNOT: STB ; RWB - Remove welcome screen [ :LNOT: Embedded_UI ; RWB - Remove welcome screen
MOVEQ R0,#0 MOVEQ R0,#0
BEQ NoWelcome BEQ NoWelcome
...@@ -1057,7 +1060,7 @@ PumpOneDesktopCommand ALTENTRY ...@@ -1057,7 +1060,7 @@ PumpOneDesktopCommand ALTENTRY
; ;
; DisplayWelcomeScreen ; DisplayWelcomeScreen
; ;
[ :LNOT: STB ; RWB - Remove welcome screen [ :LNOT: Embedded_UI ; RWB - Remove welcome screen
^ 0,sp ^ 0,sp
Welcome_font # 4 Welcome_font # 4
Welcome_font1 # 4 Welcome_font1 # 4
......
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