Commit 456920be authored by Steve Revill's avatar Steve Revill
Browse files

Brought into line with current STB Baseline builds.

Detail:
    * Updated the resources to include the current !Boot and the CopyLocal script
  * Adjusted the Makefile so STB builds also include the 'Pong' tool
Admin:
  Builds correctly.

Version 5.35. Tagged as 'Internet-5_35'
parent c2d4f050
......@@ -13,4 +13,4 @@
| limitations under the License.
|
Dir <Obey$Dir>
amu_machine install INSTDIR=<Install$Dir> OPTIONS=STB
amu_machine install INSTDIR=<Install$Dir>.Baseline.!STBBoot.Resources OPTIONS=STB
......@@ -37,7 +37,7 @@ RESD = ${RESDIR}.Internet
# Generic options:
#
MKDIR = cdir
MKDIR = mkdir -p
ATTR = -attr
CP = copy
RM = remove
......@@ -57,7 +57,9 @@ COMMONFILES=\
${SDIR}.showstat.ShowStat\
${SDIR}.sysctl.SysCtl\
${SDIR}.traceroute.TraceRoute\
${SDIR}.utils.utl.X\
${SDIR}.utils.utl.X
STBFILES=${SDIR}.pong.Pong
DISCFILES= ${RDIR}.!Boot\
${LDIR}.!Help\
......@@ -84,7 +86,8 @@ DISCFILES= ${RDIR}.!Boot\
FILES=\
${COMMONFILES} \
${DISCFILES}
${DISCFILES} \
${STBFILE}
NETUTILS = \
${SDIR}.arp.ARP \
......@@ -130,12 +133,17 @@ install_common: ${COMMONFILES}
${CP} ${SDIR}.traceroute.TraceRoute ${INSTAPP}.bin.TraceRoute ${CPFLAGS}
${CP} ${SDIR}.utils.utl.X ${INSTAPP}.bin.X ${CPFLAGS}
install_STB:
${MKDIR} ${INSTAPP}.etc
${CP} LocalUserIFRes:!Boot ${INSTAPP}.!Boot ${CPFLAGS}
${CP} ${RDIR}.files.Hosts ${INSTAPP}.etc.hosts ${CPFLAGS}
${CP} ${RDIR}.files.protocols ${INSTAPP}.etc.protocols ${CPFLAGS}
${CP} ${RDIR}.files.services ${INSTAPP}.etc.services ${CPFLAGS}
install_STB: ${STBFILES}
${MKDIR} ${INSTAPP}.files
${CP} LocalUserIFRes:!Boot ${INSTAPP}.!Boot ${CPFLAGS}
${CP} LocalUserIFRes:CopyLocal ${INSTAPP}.CopyLocal ${CPFLAGS}
${CP} LocalUserIFRes:RTime ${INSTAPP}.bin.RTime ${CPFLAGS}
${CP} ${SDIR}.pong.Pong ${INSTAPP}.bin.Pong ${CPFLAGS}
${CP} ${RDIR}.files.Hosts ${INSTAPP}.files.Hosts ${CPFLAGS}
${CP} LocalUserIFRes:MimeMap ${INSTAPP}.files.MimeMap ${CPFLAGS}
${CP} ${RDIR}.files.Networks ${INSTAPP}.files.Networks ${CPFLAGS}
${CP} ${RDIR}.files.Protocols ${INSTAPP}.files.Protocols ${CPFLAGS}
${CP} ${RDIR}.files.Services ${INSTAPP}.files.Services ${CPFLAGS}
install_: ${DISCFILES} dirs
${CP} ${RDIR}.!Boot ${INSTAPP}.!Boot ${CPFLAGS}
......
If "<OS$Version>" = "" Then Obey
| Set the Inet:system variables for backwards compatibility
Set Inet$Dir <Obey$Dir>
Set Inet$Path <Inet$Dir>.
| Set-up the Inet$Dir and Inet$Path system variables
Set Inet$Dir <Obey$Dir>
If "<Inet$Path>" <> "" AND OS$Version < 400 Then Set Inet$Path <Inet$Dir>.,<Inet$Path>
If "<Inet$Path>" <> "" AND OS$Version > 399 Then Set Inet$Path <Inet$Path>,<Inet$Dir>.
If "<Inet$Path>" = "" Then Set Inet$Path <Inet$Dir>.
| Create a copy of the Inet:etc directory in CacheFS (FCopy is used because *Copy fails)
WimpSlot -min 256K -max 256K
FCopy STBLibrary:FCopy Cache:$.FCopy
Access Cache:$.FCopy Lwr/r
CDir Cache:$.Inet
Access Cache:$.Inet LRW/r
CDir Cache:$.Inet.etc
Access Cache:$.Inet.etc LRW/r
Cache:$.FCopy Inet:etc.hosts Cache:$.Inet.etc.hosts
Access Cache:$.Inet.etc.hosts Lrw/r
Cache:$.FCopy Inet:etc.protocols Cache:$.Inet.etc.protocols
Access Cache:$.Inet.etc.protocols Lrw/r
Cache:$.FCopy Inet:etc.services Cache:$.Inet.etc.services
Access Cache:$.Inet.etc.services Lrw/r
Wipe Cache:$.FCopy ~cf~v
| Point the InetDBase path at the CacheFS Inet:etc and this Inet:etc
Set InetDBase$Path Cache:$.Inet.etc.,Inet:etc.,<InetDBase$Path>
| Add the Inet:files directory onto the InetDBase: path
Set InetDBase$Path Inet:files.,<InetDBase$Path>
Set Inet$MimeMappings InetDBase:MimeMap
| Give each STB a unique host name of the form: STB<ip addr in hex>
If "<Inet$HostName>" = "" Then Set Inet$HostName STB<Inet$LocalAddr>
If "<Inet$HostName>" = "ARM_NoName" Then Set Inet$HostName STB<Inet$LocalAddr>
If "<Inet$HostName>" = "ARM_NoName" Then Set Inet$HostName STB<STB$MACAddress>
If "<Inet$HostName>" = "" Then Set Inet$HostName STB<STB$MACAddress>
| Add the Inet:bin and ROM Resources Inet:bin directories to the Run path
If OS$Version < 400 Then Modify -with Run$Path -add "<Inet$Dir>.bin.," -after "STBUtilities:,"
If OS$Version > 399 Then Set Run$Path <Run$Path>,<Inet$Dir>.bin.
| Add the Inet:bin directory to the run path
Do Modify -with Run$Path -add "Inet:bin.," -before "%."
| If we're booting over the network, copy important files into CacheFS
If "<Obey$Dir>" LEFT 10 <> "Resources:" Then Run <Obey$Dir>.CopyLocal
| Create a copy of the Inet:files directory in CacheFS (FCopy is used because *Copy fails)
WimpSlot -min 256K -max 256K
CDir Cache:$.Inet
Access Cache:$.Inet LRW/r
CDir Cache:$.Inet.files
Access Cache:$.Inet.files LRW/r
FCopy <Inet$Dir>.files.Hosts Cache:$.Inet.files.Hosts
Access Cache:$.Inet.files.Hosts Lrw/r
FCopy <Inet$Dir>.files.Protocols Cache:$.Inet.files.Protocols
Access Cache:$.Inet.files.Protocols Lrw/r
FCopy <Inet$Dir>.files.Services Cache:$.Inet.files.Services
Access Cache:$.Inet.files.Services Lrw/r
| Point the InetDBase path at the CacheFS Inet:files and this Inet:files
Set InetDBase$Path Cache:$.Inet.files.,<InetDBase$Path>
# > Inet:Files.MimeMap
# Mapping of content types to file types
#
# Lines starting with a '#' are comments, blank lines are ignored.
#
# A '*' is a wild before or after the / or for the RISC OS file type
# The first match that does not map to a wildcard if the one that is used.
#
# If the file type name is not known but a hex value is given that type
# is used, otherwise it is not considered a match.
#
# MIME type RISC OS Hex Extensions...
#
text/plain Text FFF .txt
text/html html FAF .html .htm .iso-html
text/richtext RTF c32 .rtx
text/* text FFF
image/gif GIF 695 .gif
image/jpeg JPEG c85 .jpeg .jpg .jfif .jpe
image/pjpeg JPEG c85 .pjpeg .pjpg
image/tiff TIFF ff0 .tiff .tif
image/xbm XBitMap b61 .xbm
image/x-xbitmap XBitMap b61
image/x-xpixmap XPM 301 .xpm
image/png PNG b60 .png
image/x-png PNG b60
image/x-photo-cd PhotoCD be8 .pcd
image/x-MS-bmp BMP 69C .bmp
video/mpeg MPEG bf8 .mpeg .mpg .mpv
video/x-mpeg2 MPEG bf8
video/quicktime AVI fb2 .mov
video/avi AVI fb2 .avi
video/x-msvideo AVI fb2
video/acorn-replay ARMovie ae7 .replay .rpl
x-world/x-vrml VRML b29 .wrl
model/vrml VRML b29 .wrl
audio/basic WaveForm fb1 .au .snd
audio/wav WaveForm fb1 .wav
audio/x-wav WaveForm fb1
audio/aiff AIFF fc2 .aifc .aif .aiff
audio/x-aiff AIFF fc2
audio/mpeg AMPEG 1ad .mpa .mp3
audio/x-mpeg AMPEG 1ad
audio/x-pn-realaudio RealAud f88
audio/x-pn-realaudio-plugin RealAud f88
audio/x-realaudio RealAud f88 .ram .rpm .ra
audio/midi MIDI fd4 .midi .mid
audio/x-midi MIDI fd4 .midi .mid
audio/* GenSound f96 .voc
audio/audiompeg AMPEG 1ad .mp3
application/x-tar tar c46 .tar
application/x-director Director ae3 .dxr .dcr .dir
application/x-dvi DVI ce4 .dvi
application/x-latex latex 2a8 .ltx
application/x-tex tex ce5 .tex
application/x-tex tex 2a7 .tex
application/postscript PoScript ff5 .ps .eps .prn
application/octet-stream Data ffd
application/zip Archive ddc .zip .arc .spk .lha .arj .lzh .z .Z
application/java-vm Java ae4 .class
application/msword MSWord ae6 .doc
application/gzip GZip f89 .gz .tgz
application/dos MSDOSexe fd9 .exe .com
application/nc-smartcard SCBBlk F94 .scb
application/nc-download NCDown F93 .ncd
application/x-ica ICA AD0 .ica
application/x-cts CTS ABC .cts
application/riscos * *
multipart/x-mixed-replace Data FFD
message/* Text fff
*/* data FFD
/* (5.34)
/* (5.35)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 5.34
#define Module_MajorVersion_CMHG 5.35
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 03 Jul 2001
#define Module_Date_CMHG 06 Oct 2001
#define Module_MajorVersion "5.34"
#define Module_Version 534
#define Module_MajorVersion "5.35"
#define Module_Version 535
#define Module_MinorVersion ""
#define Module_Date "03 Jul 2001"
#define Module_Date "06 Oct 2001"
#define Module_ApplicationDate2 "03-Jul-01"
#define Module_ApplicationDate4 "03-Jul-2001"
#define Module_ApplicationDate2 "06-Oct-01"
#define Module_ApplicationDate4 "06-Oct-2001"
#define Module_ComponentName "Internet"
#define Module_ComponentPath "RiscOS/Sources/SystemRes/Internet"
#define Module_FullVersion "5.34"
#define Module_HelpVersion "5.34 (03 Jul 2001)"
#define Module_FullVersion "5.35"
#define Module_HelpVersion "5.35 (06 Oct 2001)"
#define Module_LibraryVersionInfo "5:35"
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