Commit bf60bed4 authored by Stewart Brodie's avatar Stewart Brodie
Browse files

Merged Ursula branch.

Moved to srccommit.
Removed auto-generated file.
More tidying up required to get rid of obsolete obey files.

Version 5.54. Tagged as 'NetPrint-5_54'
parent 823627bb
......@@ -6,9 +6,9 @@
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
Module_MajorVersion SETS "5.53"
Module_Version SETA 553
Module_MajorVersion SETS "5.54"
Module_Version SETA 554
Module_MinorVersion SETS ""
Module_Date SETS "17 Aug 1999"
Module_FullVersion SETS "5.53"
Module_FullVersion SETS "5.54"
END
/* (5.53)
/* (5.54)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 5.53
#define Module_MajorVersion_CMHG 5.54
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 17 Aug 1999
#define Module_MajorVersion "5.53"
#define Module_Version 553
#define Module_MajorVersion "5.54"
#define Module_Version 554
#define Module_MinorVersion ""
#define Module_Date "17 Aug 1999"
#define Module_FullVersion "5.53"
#define Module_FullVersion "5.54"
; Copyright 1996 Acorn Computers Ltd
;
; Licensed under the Apache License, Version 2.0 (the "License");
; you may not use this file except in compliance with the License.
; You may obtain a copy of the License at
;
; http://www.apache.org/licenses/LICENSE-2.0
;
; Unless required by applicable law or agreed to in writing, software
; distributed under the License is distributed on an "AS IS" BASIS,
; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
; See the License for the specific language governing permissions and
; limitations under the License.
;
TTL ==> s.HelpTokens
SUBT Strings for Help messages. => &.Arthur.NetPrint.HelpTexts
[ International_Help <> 0
HelpSetPS ;= "HNPRSPS",0
= "HNPRSPS", 0
BadSetPSSyn ;= "SNPRSPS",0
= "SNPRSPS", 0
HelpPS ;= "HNPRPS",0
= "HNPRPS", 0
BadPSSyn ;= "SNPRPS",0
= "SNPRPS", 0
HelpListPS ;= "HNPRLPS",0
= "HNPRLPS", 0
BadListPSSyn ;= "SNPRLPS",0
= "SNPRLPS", 0
HelpForConfigurePS ;= "HNPRCPS",0
= "HNPRCPS", 0
SyntaxOfConfigurePS ;= "SNPRCPS",0
= "SNPRCPS", 0
SyntaxOnlyOfConfigurePS ;= "ConfPS", 0
= "ConfPS", 0
|
HelpSetPS
;= "*"
= "*",TokenEscapeChar,Token0," changes",TokenEscapeChar,Token2
= TokenEscapeChar,Token5," ",TokenEscapeChar,Token26,"r"
= TokenEscapeChar,Token12," ",TokenEscapeChar,Token11," or "
= TokenEscapeChar,Token13,". If no argument"
= TokenEscapeChar,Token41,"supplied",TokenEscapeChar,Token2
= TokenEscapeChar,Token5," setting reverts"
= TokenEscapeChar,Token40,"the initialised state"
= TokenEscapeChar,Token16,"will use configured state if"
= TokenEscapeChar,Token2,"next open (or save) does not explici"
= "tly quote either a ",TokenEscapeChar,Token11," or a "
= TokenEscapeChar,Token13, 13
;= TokenEscapeChar,Token0
;= " changes the current printer server name or number. "
;= "If no argument is supplied the current setting reverts "
;= "to the initialised state and will use configured state "
;= "if the next open (or save) does not explicitly quote "
;= "either a name or a number", 13
BadSetPSSyn
;= "Syntax: *"
= TokenEscapeChar,Token30,"<",TokenEscapeChar,Token26,"r"
= TokenEscapeChar,Token12," ",TokenEscapeChar,Token11,">|<sta"
= TokenEscapeChar,Token9," ",TokenEscapeChar,Token13,">]", 0
;= TokenEscapeChar,Token0
;= " [<printer server name>|<station number>]", 0
HelpPS
;= "*"
= "*",TokenEscapeChar,Token0," selects new "
= TokenEscapeChar,Token8,TokenEscapeChar,Token26,"r"
= TokenEscapeChar,Token12," for",TokenEscapeChar,Token2,"next"
= " use of",TokenEscapeChar,Token2,TokenEscapeChar,Token26,"r"
= TokenEscapeChar,Token12,". If no argument"
= TokenEscapeChar,Token41,"supplied",TokenEscapeChar,Token2
= TokenEscapeChar,Token5," ",TokenEscapeChar,Token26,"r"
= TokenEscapeChar,Token12," ",TokenEscapeChar,Token11," and/or"
= " ",TokenEscapeChar,Token13," are ",TokenEscapeChar,Token26,"d"
= " out, along with",TokenEscapeChar,Token2,"status of that"
= TokenEscapeChar,Token12,".", 13
;= TokenEscapeChar,Token0
;= " selects new default printer server for the next "
;= "use of the printer server. If no argument is supplied "
;= "the current printer server name and/or number are "
;= "printed out, along with the status of that server.", 13
BadPSSyn
;= "Syntax: *"
= TokenEscapeChar,Token30,"<",TokenEscapeChar,Token26,"r"
= TokenEscapeChar,Token12," ",TokenEscapeChar,Token11,">|<sta"
= TokenEscapeChar,Token9," ",TokenEscapeChar,Token13,">]", 0
;= TokenEscapeChar,Token0
;= " [<printer server name>|<station number>]", 0
HelpListPS
;= "*"
= "*",TokenEscapeChar,Token0," shows",TokenEscapeChar,Token2
= TokenEscapeChar,Token11,"s of",TokenEscapeChar,Token38,"the "
= TokenEscapeChar,Token5,"ly available ",TokenEscapeChar,Token26
= "r",TokenEscapeChar,Token12,"s. If",TokenEscapeChar,Token2,"o"
= "p",TokenEscapeChar,Token9,"al argument",TokenEscapeChar,Token41
= "supplied then",TokenEscapeChar,Token2,"status of each"
= TokenEscapeChar,Token12," will also be displayed.", 13
;= TokenEscapeChar,Token0
;= " shows the names of all the currently available printer "
;= "servers. If the optional argument is supplied then the "
;= "status of each server will also be displayed.", 13
BadListPSSyn
;= "Syntax: *"
= TokenEscapeChar,Token30,"-full]", 0
;= TokenEscapeChar,Token0
;= " [-full]", 0
HelpForConfigurePS
;= "*Configure PS sets the default name or number for the "
= TokenEscapeChar,Token10,"PS ",TokenEscapeChar,Token19
= TokenEscapeChar,Token8,TokenEscapeChar,Token11," or "
= TokenEscapeChar,Token13," for",TokenEscapeChar,Token2
= TokenEscapeChar,Token26,"r",TokenEscapeChar,Token12,". This "
= TokenEscapeChar,Token11," or ",TokenEscapeChar,Token13," wil"
= "l be used if",TokenEscapeChar,Token2,"first open (or save) d"
= "oes not explicitly quote either a ",TokenEscapeChar,Token11," "
= "or a ",TokenEscapeChar,Token13, 13
;= "printer server. This name or number will be used if "
;= "the first open (or save) does not explicitly quote "
;= "either a name or a number", 13
SyntaxOfConfigurePS
;= "Syntax: *Configure "
= "Syntax: ",TokenEscapeChar,Token10
SyntaxOnlyOfConfigurePS
;= "PS <printer server name>|<station number>", 0
= "PS <",TokenEscapeChar,Token26,"r",TokenEscapeChar,Token12," "
= TokenEscapeChar,Token11,">|<sta",TokenEscapeChar,Token9," "
= TokenEscapeChar,Token13,">", 0
]
ALIGN
END
......@@ -17,6 +17,7 @@
GET Hdr:ListOpts
GET Hdr:Macros
GET Hdr:System
GET Hdr:Machine.<Machine>
GET Hdr:CMOS
GET Hdr:ModHand
GET Hdr:Services
......@@ -34,7 +35,10 @@
GET Hdr:Proc
GET Hdr:HostFS
GET Time+Date
GET VersionASM
GBLL ReleaseVersion
ReleaseVersion SETL True
; OSS 5.51 Added to new Acorn sources to permit building of RISC OS 2 NetPrint once more.
......@@ -185,18 +189,12 @@ Feature_Extension * (1 :SHL: 7) ; Extension packet (not
Help
DCB ModuleName
DCB 9, "5.", CurrentVersion
[ ReleaseVersion
! 0, "NetPrint version 5.$CurrentVersion$OsString"
|
DCB "/", CurrentIteration
! 0, "NetPrint version 5.$CurrentVersion/$CurrentIteration$OsString"
]
DCB " (", CurrentDate, ")", "$OsString"
[ :LNOT: ReleaseVersion
DCB " assembled at ", CurrentTime, "."
]
DCB TAB, "$Module_MajorVersion ($Module_Date)"
[ Module_MinorVersion <> ""
= " $Module_MinorVersion"
]
DCB 0
ALIGN
InitCode ROUT
......@@ -295,10 +293,20 @@ ErrorNoEconet
Err NoEconet
]
ServiceTable
DCD 0
DCD ServiceMain - ModuleBase
DCD Service_FSRedeclare
DCD Service_ReAllocatePorts
DCD 0
DCD ServiceTable - ModuleBase
Service ROUT
MOV r0, r0
TEQ r1, #Service_FSRedeclare
TEQNE r1, #Service_ReAllocatePorts
MOVNE pc, lr
ServiceMain
TEQ r1, #Service_FSRedeclare
BEQ DoReDeclare
DoReAllocatePorts
......
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