Skip to content

GitLab

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

Moved to srccommit. 

  Merged Ursula branch.
  32-bit compatible.
Admin:
  Tested in Ursula build.

Version 2.71. Tagged as 'Alarm-2_71'
parent ee11fe8c
Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 66 deletions
!MkClean,fd7
View file @ e5c5fc6c
......@@ -14,3 +14,4 @@
|
Dir <Obey$Dir>
amu_machine clean
stripdepnd Makefile
Makefile
View file @ e5c5fc6c
......@@ -29,7 +29,9 @@ COMPONENT = Alarm
APP = !${COMPONENT}
ROM_MODULE = rm.${COMPONENT}
RDIR = Resources
LDIR = ${RDIR}.${LOCALE}
LDIR = LocalRes:
MSGS = Resources.GenMessage
#
# Export Paths for Messages module
......@@ -54,13 +56,13 @@ WFLAGS = ~c~v
FILES =\
${RDIR}.!Boot \
${LDIR}.!Help \
${LDIR}!Help \
${RDIR}.!Run \
${RDIR}.!RunImage \
${RDIR}.Alarms \
${RDIR}.Code \
${LDIR}.Messages \
${LDIR}.Templates
${MSGS} \
${LDIR}Templates
# Resources to be included in the ROM module (not in Messages module}
RESFILES =\
......@@ -80,13 +82,13 @@ install: ${FILES}
${MKDIR} ${INSTDIR}.${APP}
|
${CP} ${RDIR}.!Boot ${INSTDIR}.${APP}.!Boot ${CPFLAGS}
${CP} ${LDIR}.!Help ${INSTDIR}.${APP}.!Help ${CPFLAGS}
${CP} ${LDIR}!Help ${INSTDIR}.${APP}.!Help ${CPFLAGS}
${CP} ${RDIR}.!Run ${INSTDIR}.${APP}.!Run ${CPFLAGS}
${CP} ${RDIR}.!RunImage ${INSTDIR}.${APP}.!RunImage ${CPFLAGS}
${CP} ${RDIR}.Alarms ${INSTDIR}.${APP}.Alarms ${CPFLAGS}
${CP} ${RDIR}.Code ${INSTDIR}.${APP}.Code ${CPFLAGS}
${CP} ${LDIR}.Messages ${INSTDIR}.${APP}.Messages ${CPFLAGS}
${CP} ${LDIR}.Template3D ${INSTDIR}.${APP}.Templates ${CPFLAGS}
${CP} ${MSGS} ${INSTDIR}.${APP}.Messages ${CPFLAGS}
${CP} ${LDIR}Template3D ${INSTDIR}.${APP}.Templates ${CPFLAGS}
|
Access ${INSTDIR}.${APP}.* lr/r
Access ${INSTDIR}.${APP}.Alarms wr/r
......@@ -97,18 +99,18 @@ install_rom: ${ROM_MODULE}
${CP} ${ROM_MODULE} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
@echo ${COMPONENT}: Module installed {ROM}
resources: ${LDIR}.!RunLink ${RDIR}.Code
resources: ${RDIR}.!RunLink ${MSGS} ${RDIR}.Code
${MKDIR} ${RESAPP}
${MKDIR} ${RESDIR}
|
${CP} ${RDIR}.!Boot ${RESAPP}.!Boot ${CPFLAGS}
${CP} ${LDIR}.!Help ${RESAPP}.!Help ${CPFLAGS}
${CP} ${LDIR}!Help ${RESAPP}.!Help ${CPFLAGS}
${CP} ${RDIR}.ROM.!Run ${RESAPP}.!Run ${CPFLAGS}
|
${CP} ${LDIR}.!RunLink ${RESDIR}.!RunLink ${CPFLAGS}
${CP} ${RDIR}.!RunLink ${RESDIR}.!RunLink ${CPFLAGS}
${CP} ${RDIR}.Code ${RESDIR}.Code ${CPFLAGS}
${CP} ${LDIR}.Messages ${RESDIR}.Messages ${CPFLAGS}
${CP} ${LDIR}.Template3D ${RESDIR}.Templates ${CPFLAGS}
${CP} ${MSGS} ${RESDIR}.Messages ${CPFLAGS}
${CP} ${LDIR}Template3D ${RESDIR}.Templates ${CPFLAGS}
|
@echo ${COMPONENT}: resource files copied to Messages module
......@@ -116,7 +118,7 @@ clean:
${RM} ${ROM_MODULE}
${RM} ${RDIR}.!RunImage
${RM} ${RDIR}.Code
${RM} s.Version
${RM} ${MSGS}
${WIPE} crunched.* ${WFLAGS}
@echo ${COMPONENT}: cleaned
......@@ -130,11 +132,11 @@ ResVsn:
# Static dependencies:
#
${ROM_MODULE}: s.Main s.Version ${RESFILES}
${ROM_MODULE}: s.Main ${MSGS} ${RESFILES}
${AS} ${AFLAGS} -from s.Main -to $@
s.Version: ${LDIR}.Messages
awk -f awk.Version ${LDIR}.Messages > $@
${MSGS}: LocalRes:Messages VersionASM
awk -f awk.Version LocalRes:Messages > $@
${RDIR}.!RunImage: crunched.!RunImage
${SQUISH} ${SQFLAGS} -from crunched.!RunImage -to $@
......@@ -142,7 +144,7 @@ ${RDIR}.!RunImage: crunched.!RunImage
crunched.!RunImage: bas.!RunImage
crunch.!RunImage; BASIC
${LDIR}.!RunLink: bas.!RunLink
${RDIR}.!RunLink: bas.!RunLink
${SQUISH} ${SQFLAGS} -from bas.!RunLink -to $@
# Note! name of output file (Resources.Code) is in AlarmSrc
......
Resources/UK/Messages
View file @ e5c5fc6c
TaskID:Alarm
AlarmID:2.70 (13-Feb-95)
AlarmID:Inserted by awk script during build
TZSwtch:Switch between %0 and %1 automatically:
Unexp:Unexpected error :- %0 (%1)
......@@ -7,11 +7,11 @@ BNF:Corrupt %0 block not freed
BNE:Corrupt %0 block not extended
ODD1:Block %0: %1
`C:currently selected
`a:allows you to
`c:that the computer will
`d:defer by a number of
`r:set the repeat interval to
`C:currently selected
`a:allows you to
`c:that the computer will
`d:defer by a number of
`r:set the repeat interval to
`s:the selected alarm
`2:beyond the year 2247
......@@ -20,16 +20,6 @@ Time02:%W3, %ZDY%ST
Time03:%MO
Time04:%CE%YR
AlarmH2:\TAlarm icon.|M\Sset an alarm.
AlarmH3:This \w `aset an alarm.
AlarmH5:This \w `achange an alarm.
AlarmH6:This \w `aset the clock.
AlarmH7:This \w `afind an alarm.
AlarmH8:\Wdisplaying an alarm which has gone off.
AlarmH9:This \w displays information about Alarm.
AlarmHA:\Wthe alarm browser. It `amanipulate the alarms.|MDouble-click \s on an alarm to change it.
AlarmHB:This \w `achange the setup for !Alarm.
FN1:Selection
FN2:Alarms
......@@ -81,6 +71,17 @@ BrwsM6:alarm
BrwsT3:delete `s?
BrwsT4:delete `ss?
#{HelpTokens}
AlarmH2:\TAlarm icon.|M\Sset an alarm.
AlarmH3:This \w `aset an alarm.
AlarmH5:This \w `achange an alarm.
AlarmH6:This \w `aset the clock.
AlarmH7:This \w `afind an alarm.
AlarmH8:\Wdisplaying an alarm which has gone off.
AlarmH9:This \w displays information about Alarm.
AlarmHA:\Wthe alarm browser. It `amanipulate the alarms.|MDouble-click \s on an alarm to change it.
AlarmHB:This \w `achange the setup for !Alarm.
BHlpA1:\Sset a new alarm.
BHlpA2:\Ract upon `s.
BHlpA3:\Ract upon `ss.
......@@ -192,12 +193,6 @@ FindA3:\T`Cdate for the alarm search.
FindA4:\T`Cmonth for the alarm search.
FindA5:\T`Cyear for the alarm search.
MenuAL:#Alarm,Accept alarm,Cancel alarm,Defer alarm
MenuD1:#How many?,$
MenuD2:#Defer alarm,Minutes,Hours,Days,Weeks,Months,Years
MenuFI:#Alarm,Previous alarm,Next alarm,Find alarm
MenuMM:#Alarm,Info,Alarms...,Setup...,Set clock...,Quit
MnuAL1:\Saccept the current alarm.
MnuAL2:\Scancel the current alarm.
MnuAL3:\Rdefer the current alarm.
......@@ -224,6 +219,13 @@ MnuMM5:\Sset the computer's clock.
MnuMM6:\Squit Alarm.
MnuMM7:\Gyou are currently finding an alarm.
#{Default}
MenuAL:#Alarm,Accept alarm,Cancel alarm,Defer alarm
MenuD1:#How many?,$
MenuD2:#Defer alarm,Minutes,Hours,Days,Weeks,Months,Years
MenuFI:#Alarm,Previous alarm,Next alarm,Find alarm
MenuMM:#Alarm,Info,Alarms...,Setup...,Set clock...,Quit
Drg01:This box `asave data in a file, or transfer it to another application.
Drg02:Click here to save the data with the current filename. If it is not a full pathname, you must drag the icon to a directory first.
Drg03:This shows the filename for this data. If it is not a full pathname, drag the icon into a directory display.
......
VersionASM 0 → 100644
View file @ e5c5fc6c
;
; This file is automatically maintained by srccommit, do not edit manually.
;
GBLS Module_MajorVersion
GBLA Module_Version
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
Module_MajorVersion SETS "2.71"
Module_Version SETA 271
Module_MinorVersion SETS ""
Module_Date SETS "12 May 2000"
Module_FullVersion SETS "2.71"
END
VersionNum 0 → 100644
View file @ e5c5fc6c
/* (2.71)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 2.71
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 12 May 2000
#define Module_MajorVersion "2.71"
#define Module_Version 271
#define Module_MinorVersion ""
#define Module_Date "12 May 2000"
#define Module_FullVersion "2.71"
awk/Version
View file @ e5c5fc6c
......@@ -3,28 +3,24 @@
#
BEGIN {
found = 0
}
{
if (!found) {
split($1, Version, ":")
if (Version[1] == "AlarmID") {
found = 1
split($2, Date, "-")
while (getline < "VersionNum" > 0) {
split($0, Version)
if (Version[2] == "Module_Date_CMHG") {
Date = Version[3] "-" Version[4] "-" Version[5]
}
if (Version[2] == "Module_MajorVersion_CMHG") {
VString = Version[3];
}
}
}
/^AlarmID/ { printf("AlarmID:%s (%s)\n", VString, Date); done = 1; next; }
{ print }
END {
printf("; > Version - generated from Messages, used by s.Main\n")
printf("\n")
printf(" GBLS VString\n")
printf(" GBLS Date\n")
printf("\n")
printf("VString SETS \"%s\"\n", Version[2])
printf("Date SETS \"%s %s 19%s\"\n", Date[1], Date[2], Date[3])
printf("\n")
printf(" END\n")
if (!done) {
printf("AlarmID:%s (%s)\n", VString, Date);
}
}
s/Main
View file @ e5c5fc6c
......@@ -34,7 +34,7 @@ Module_BaseAddr
GET Hdr:Services
GET Hdr:Proc
GET Hdr:ResourceFS
GET s.Version
GET VersionASM
LEADR Module_LoadAddr
......@@ -50,19 +50,32 @@ Module_BaseAddr
DCD App_Title - Module_BaseAddr
DCD App_HelpStr - Module_BaseAddr
DCD 0
[ :LNOT: No32bitCode
DCD 0
DCD 0
DCD 0
DCD 0
DCD 0
DCD App_ModFlag - Module_BaseAddr
]
[ :DEF: ResVsn
App_Title DCB "!$ApplicatioName:CC:Resources",0
App_Title DCB "!$ApplicationName:CC:Resources",0
|
App_Title DCB "!$ApplicationName", 0
]
App_HelpStr DCB "!$ApplicationName", 9, 9, "$VString $Date", 0
App_HelpStr DCB "!$ApplicationName", 9, 9, "$Module_MajorVersion ($Module_Date)", 0
ALIGN
; *****************************************************************************
;
; Module flags. Bit 0 set means module is 32-bit aware and safe
;
[ :LNOT: No32bitCode
App_ModFlag DCD ModuleFlag_32bit
]
; *****************************************************************************
;
; App_Init - Initialisation entry
......@@ -72,8 +85,8 @@ App_Init ENTRY "r0"
ADR R0, resourcefsfiles
SWI XResourceFS_RegisterFiles ; ignore errors (starts on Service_ResourceFSStarting)
EXITS
CLRV
EXIT
; *****************************************************************************
;
......@@ -84,18 +97,27 @@ App_Die ENTRY "r0"
ADR R0, resourcefsfiles
SWI XResourceFS_DeregisterFiles
CLRV
EXITS ; ignore errors (ResourceFS might be dead)
EXIT ; ignore errors (ResourceFS might be dead)
; *****************************************************************************
;
; App_Service - Main entry point for services
;
;Ursula format
App_ServTab
DCD 0 ;flags
DCD App_UService - Module_BaseAddr ;handler
DCD Service_ResourceFSStarting
DCD 0 ;terminator
DCD App_ServTab - Module_BaseAddr ;anchor
App_Service ROUT
MOV r0,r0 ;magic instruction
TEQ R1, #Service_ResourceFSStarting
MOVNE PC, LR
App_UService
; In R2 -> address inside ResourceFS module to call
; R3 = workspace pointer for module
......
s/ResFiles
View file @ e5c5fc6c
......@@ -22,8 +22,8 @@
; module. They can be built into a Resources module by using the
; MakeRes file
ResourceFile Resources.<Locale>.Messages, Resources.$ApplicationName..Messages
ResourceFile Resources.<Locale>.Template3D, Resources.$ApplicationName..Templates
ResourceFile Resources.GenMessages, Resources.$ApplicationName..Messages
ResourceFile LocalRes:Template3D, Resources.$ApplicationName..Templates
|
ResourceFile Resources.!RunImage, Resources.$ApplicationName..!RunImage
ResourceFile Resources.Code, Resources.$ApplicationName..Code
......
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