Commit cc603b7e authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Install alternate !Internet icons

To save a little disc space the default is the RISC OS 5 cream colour folder, hence only the deltas (Ursula and Morris4) are needed.
Also, use Push/Pull in RMFind, move !Run into LocalRes: because it's english.

Version 5.50. Tagged as 'Internet-5_50'
parent c1699995
......@@ -63,9 +63,10 @@ STBFILES=${SDIR}.pong.Pong
DISCFILES= ${RDIR}.!Boot\
${LDIR}.!Help\
${RDIR}.!Run\
${LDIR}.!Run\
${RDIR}.!Sprites\
${RDIR}.!Sprites22\
${RDIR}.!Sprites11\
${SDIR}.gethost.GetHost\
${SDIR}.ifrconfig.IfRConfig\
${SDIR}.map-mbone.Map-MBone\
......@@ -103,7 +104,7 @@ EMERGENCYUTILS = \
${SDIR}.utils.utl.CheckMem \
${SDIR}.newfiler.NewFiler \
${SDIR}.sysctl.SysCtl \
${RDIR}.!Run \
${LDIR}.!Run \
NETUTILS = \
${SDIR}.arp.ARP \
......@@ -122,7 +123,7 @@ NETUTILS = \
${SDIR}.sysctl.SysCtl \
${SDIR}.traceroute.TraceRoute \
${RDIR}.!Boot \
${RDIR}.!Run \
${LDIR}.!Run \
${RDIR}.!Sprites \
${RDIR}.!Sprites11 \
${RDIR}.!Sprites22 \
......@@ -169,11 +170,16 @@ install_: ${DISCFILES} dirs
${AWK} -f awk.Version ${RDIR}.!Boot > ${INSTAPP}.!Boot
SetType ${INSTAPP}.!Boot Obey
${AWK} -f awk.Version ${LDIR}.!Help > ${INSTAPP}.!Help
${AWK} -f awk.Version ${RDIR}.!Run > ${INSTAPP}.!Run
${AWK} -f awk.Version ${LDIR}.!Run > ${INSTAPP}.!Run
SetType ${INSTAPP}.!Run Obey
${CP} ${RDIR}.!Sprites ${INSTAPP}.!Sprites ${CPFLAGS}
${CP} ${RDIR}.!Sprites11 ${INSTAPP}.!Sprites11 ${CPFLAGS}
${CP} ${RDIR}.!Sprites22 ${INSTAPP}.!Sprites22 ${CPFLAGS}
|
${MKDIR} ${INSTAPP}.Themes
${CP} ${RDIR}.!Sprites ${INSTAPP}.Themes.!Sprites ${CPFLAGS}
${CP} ${RDIR}.!Sprites11 ${INSTAPP}.Themes.!Sprites11 ${CPFLAGS}
${CP} ${RDIR}.!Sprites22 ${INSTAPP}.Themes.!Sprites22 ${CPFLAGS}
${CP} ${LDIR}.Ursula ${INSTAPP}.Themes.Ursula ${CPFLAGS}
${CP} ${LDIR}.Morris4 ${INSTAPP}.Themes.Morris4 ${CPFLAGS}
|
${CP} ${RDIR}.files ${INSTAPP}.files ${CPFLAGS}
${AWK} -f awk.Version ${RDIR}.files.AUNMap > ${INSTAPP}.files.AUNMap
SetType ${INSTAPP}.files.AUNMap Obey
......@@ -207,7 +213,7 @@ resources-:
@echo ${COMPONENT}: No resource files to copy
resources-NetUtils: ${NETUTILS}
${MKDIR} ${RESD}
${MKDIR} ${RESD}.Themes
${MKDIR} ${RESD}.bin
${MKDIR} ${RESD}.files
${CP} ${SDIR}.arp.ARP ${RESD}.bin.ARP ${CPFLAGS}
......@@ -233,11 +239,10 @@ resources-NetUtils: ${NETUTILS}
${CP} ${RDIR}.files.Services ${RESD}.files.Services ${CPFLAGS}
${AWK} -f awk.Version ${RDIR}.!Boot > ${RESD}.!Boot
SetType ${RESD}.!Boot Obey
${AWK} -f awk.Version ${RDIR}.!Run > ${RESD}.!Run
${AWK} -f awk.Version ${LDIR}.!Run > ${RESD}.!Run
SetType ${RESD}.!Run Obey
${CP} ${RDIR}.!Sprites ${RESD}.!Sprites ${CPFLAGS}
${CP} ${RDIR}.!Sprites11 ${RESD}.!Sprites11 ${CPFLAGS}
${CP} ${RDIR}.!Sprites22 ${RESD}.!Sprites22 ${CPFLAGS}
${CP} ${RDIR}.!Sprites ${RESD}.Themes.!Sprites ${CPFLAGS}
${CP} ${RDIR}.!Sprites22 ${RESD}.Themes.!Sprites22 ${CPFLAGS}
resources-EmergencyUtils: ${EMERGENCYUTILS}
${MKDIR} ${RESD}
......@@ -257,7 +262,7 @@ resources-EmergencyUtils: ${EMERGENCYUTILS}
${CP} ${RDIR}.files.Networks ${RESD}.files.Networks ${CPFLAGS}
${CP} ${RDIR}.files.Protocols ${RESD}.files.Protocols ${CPFLAGS}
${CP} ${RDIR}.files.Services ${RESD}.files.Services ${CPFLAGS}
${AWK} -f awk.Version ${RDIR}.!Run > ${RESD}.!Run
${AWK} -f awk.Version ${LDIR}.!Run > ${RESD}.!Run
SetType ${RESD}.!Run Obey
resources-BareMinUtils: ${BAREMINUTILS}
......
......@@ -7,4 +7,4 @@ BOOTVERSION
IF "<Inet$Path>" = "" THEN Set Run$Path <Run$Path>,<Obey$Dir>.bin.
IF "<Inet$Path>" = "" THEN Set Inet$Path <Obey$Dir>.
IF "<InetDBase$Path>" = "" THEN Set InetDBase$Path <Obey$Dir>.files.
X IconSprites <Obey$Dir>.!Sprites
IconSprites <Obey$Dir>.Themes.!Sprites
......@@ -9,9 +9,6 @@ Set Inet$Path <Obey$Dir>.
Set InetDBase$Path <Obey$Dir>.files.
If "<Inet$Started>" = "Yes" THEN Obey
| Emergency utils omit sprites
X IconSprites <Obey$Dir>.!Sprites
Unset Inet$Error
RMEnsure UtilityModule 3.50 Error This Internet application requires RISC OS 3.50 or later to run
......
......@@ -41,7 +41,7 @@
Entry
RMFind
STMFD R13!,{R14}
Push "R14"
MOV R0,R1
; Skip spaces
0 LDRB R2,[R0],#1
......@@ -98,7 +98,7 @@ RMFind
SyntaxError
ADR R0,SyntaxErrorBlock
SWI XOS_GenerateError
LDMFD R13!,{PC}
Pull "PC"
SyntaxErrorBlock
& &DC
......@@ -129,7 +129,7 @@ FinishedParse
SUB R0,R0,#1
BL ConvertVersion
CMPS R0,R10
LDMHSFD R13!,{PC}
Pull "PC",HS
; Right, we're not currently loaded
; Lets enumerate the ROMs
......@@ -155,7 +155,7 @@ NotLoaded
TEQS R5,#0
BNE %B13 ; Haven't finished yet
[ {FALSE}
STMFD R13!,{R0-R2}
Push "R0-R2"
MOV R0,R6
MOV R1,R12
MOV R2,#256
......@@ -168,7 +168,7 @@ NotLoaded
SWI XOS_ConvertHex8
SWI XOS_Write0
SWI XOS_NewLine
LDMFD R13!,{R0-R2}
Pull "R0-R2"
]
CMPS R6,R10
......@@ -183,7 +183,7 @@ NotLoaded
; ROM)
MOV R0,#3
SWI XOS_Module
LDMVSFD R13!,{PC}
Pull "PC",VS
; Ah, but now we've inserted all ones from the ROM. Yuck.
MOV R0,#19
MOV R1,#0
......@@ -195,7 +195,7 @@ NotLoaded
TEQS R4,#0
BNE %B20
; Found a dormant instance of our module - unplug it
STMFD R13!,{R0-R2}
Push "R0-R2"
ADR R0,Unplug
LDMIA R0,{R0,R1}
STMIA R12,{R0,R1}
......@@ -210,7 +210,7 @@ NotLoaded
MOV R0,R2 ; ROM section
MOV R2,#16
SWI XOS_ConvertInteger4
LDMVSFD R13!,{PC}
Pull "PC",VS
MOV R0,R12
[ {FALSE}
SWI XOS_Write0
......@@ -218,15 +218,15 @@ NotLoaded
MOV R0,R12
]
SWI XOS_CLI
LDMFD R13!,{R0-R2}
Pull "R0-R2"
B %B20
29 ADDS R0,R0,#0 ; clear V
LDMFD R13!,{PC}
Pull "PC"
ROUT
CmpNam
STMFD R13!,{R0-R3}
Push "R0-R3"
MOV R0,R9
MOV R1,R3
0 LDRB R2,[R0],#1
......@@ -234,10 +234,10 @@ CmpNam
BIC R2,R2,#&20
BIC R3,R3,#&20
TEQS R2,R3
LDMNEFD R13!,{R0-R3}
Pull "R0-R3",NE
MOVNE PC,LR
TEQS R2,#0
LDMEQFD R13!,{R0-R3}
Pull "R0-R3",EQ
MOVEQ PC,LR
B %B0
......@@ -256,7 +256,7 @@ NotInROM
MOV R0,#1
MOV R1,R11
SWI XOS_Module
LDMVSFD R13!,{PC}
Pull "PC",VS
NoFilename
ADR R0,RMEnsure
......@@ -277,11 +277,11 @@ NoFilename
STRB R1,[R0,#-1]
MOV R0,R12
SWI XOS_CLI
LDMFD R13!,{PC}
Pull "PC"
ROUT
ConvertVersion
STMFD R13!,{R1-R3,LR}
Push "R1-R3,LR"
MOV R3,#16
MOV R2,#0
0 LDRB R1,[R0],#1
......@@ -308,8 +308,8 @@ ConvertVersion
SWI XOS_Write0
MOV R0,LR
]
LDMFD R13!,{R1-R3,PC}
Pull "R1-R3,PC"
= "RMFind 1.02 (27 Apr 2000)"
= "RMFind 1.03 (19 Sep 2012)"
END
/* (5.49)
/* (5.50)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 5.49
#define Module_MajorVersion_CMHG 5.50
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 31 Aug 2012
#define Module_Date_CMHG 19 Sep 2012
#define Module_MajorVersion "5.49"
#define Module_Version 549
#define Module_MajorVersion "5.50"
#define Module_Version 550
#define Module_MinorVersion ""
#define Module_Date "31 Aug 2012"
#define Module_Date "19 Sep 2012"
#define Module_ApplicationDate "31-Aug-12"
#define Module_ApplicationDate "19-Sep-12"
#define Module_ComponentName "Internet"
#define Module_ComponentPath "mixed/RiscOS/Sources/SystemRes/Internet"
#define Module_FullVersion "5.49"
#define Module_HelpVersion "5.49 (31 Aug 2012)"
#define Module_LibraryVersionInfo "5:49"
#define Module_FullVersion "5.50"
#define Module_HelpVersion "5.50 (19 Sep 2012)"
#define Module_LibraryVersionInfo "5:50"
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