.gitattributes

 s/** gitlab-language=armasm linguist-language=armasm linguist-detectable=true
-awk/** gitlab-language=awk linguist-language=awk linguist-detectable=true
+bas/** gitlab-language=bbcbasic linguist-language=bbcbasic linguist-detectable=true
 *,ffb gitlab-language=bbcbasic linguist-language=bbcbasic linguist-detectable=true

Makefile

@@ -31,7 +31,7 @@ APP        = !${COMPONENT}
 ROM_MODULE = rm.${COMPONENT}
 RDIR       = Resources
 LDIR       = LocalRes:
-
+MSGVERSION = ${AWK} -f Build:AwkVers
 MSGS       = Resources.GenMessage
 
 #
@@ -40,20 +40,10 @@ MSGS       = Resources.GenMessage
 RESDIR = <resource$dir>.Resources2.${COMPONENT}
 RESAPP = <resource$dir>.Apps.${APP}
 
-#
-# Generic options:
-#
-MKDIR   = do mkdir -p
-ARMASM  = objasm
-CP      = copy
-RM      = remove
-SQUISH    = squish
-WIPE    = -wipe
+include StdTools
 
-AFLAGS  = ${THROWBACK} -depend !Depend -stamp -quit
-CPFLAGS = ~cfr~v
-SQFLAGS = -nolist
-WFLAGS  = ~c~v
+SQUISH    = squish
+SQFLAGS   = -nolist
 
 FILES =\
  ${RDIR}.!Boot \
@@ -63,9 +53,9 @@ FILES =\
  ${RDIR}.Alarms \
  ${RDIR}.Code \
  ${MSGS} \
- ${LDIR}Templates 
+ ${LDIR}Template3D 
 
-# Resources to be included in the ROM module (not in Messages module}
+# Resources to be included in the ROM module (not in Messages module)
 RESFILES =\
  ${RDIR}.code \
  ${RDIR}.!RunImage
@@ -74,10 +64,10 @@ RESFILES =\
 # Main rules:
 #
 all: ${FILES}
-	@echo ${COMPONENT}: Application built (Disc}
+	@echo ${COMPONENT}: Application built (Disc)
 
 rom: ${ROM_MODULE}
-	@echo ${COMPONENT}: Module built (ROM}
+	@echo ${COMPONENT}: Module built (ROM)
 
 install: ${FILES}
 	${MKDIR} ${INSTDIR}.${APP}
@@ -94,21 +84,20 @@ install: ${FILES}
 	Access ${INSTDIR}.${APP}.* lr/r
 	Access ${INSTDIR}.${APP}.Alarms wr/r
 	|
-	@echo ${COMPONENT}: Application installed {Disc}
+	@echo ${COMPONENT}: Application installed (Disc)
 
 install_rom: ${ROM_MODULE}
 	${CP} ${ROM_MODULE} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
 	@echo ${COMPONENT}: Module installed {ROM}
 
-resources: ${RDIR}.!RunLink ${MSGS} ${RDIR}.Code
+resources: ${MSGS} ${RDIR}.Code
 	${MKDIR} ${RESAPP}
 	${MKDIR} ${RESDIR}
 	|
 	${CP} ${RDIR}.!Boot      ${RESAPP}.!Boot     ${CPFLAGS}
 	${CP} ${LDIR}!Help       ${RESAPP}.!Help     ${CPFLAGS}
 	${CP} ${RDIR}.ROM.!Run   ${RESAPP}.!Run      ${CPFLAGS}
-	|
-	${CP} ${RDIR}.!RunLink   ${RESDIR}.!RunLink  ${CPFLAGS}
+	${CP} ${LDIR}!RunLink    ${RESDIR}.!RunLink  ${CPFLAGS}
 	${CP} ${RDIR}.Code       ${RESDIR}.Code      ${CPFLAGS}
 	${CP} ${MSGS}            ${RESDIR}.Messages  ${CPFLAGS}
 	${CP} ${LDIR}Template3D  ${RESDIR}.Templates ${CPFLAGS}
@@ -118,11 +107,11 @@ resources: ${RDIR}.!RunLink ${MSGS} ${RDIR}.Code
 clean:
 	${RM} ${ROM_MODULE}
 	${RM} ${RDIR}.!RunImage
-	${RM} ${RDIR}.!RunLink
 	${RM} ${RDIR}.Code
 	${RM} ${MSGS}
-	${WIPE} o          ${WFLAGS}
-	${WIPE} crunched.* ${WFLAGS}
+	${XWIPE} !Alarm     ${WFLAGS}
+	${XWIPE} o          ${WFLAGS}
+	${XWIPE} crunched.* ${WFLAGS}
 	@echo ${COMPONENT}: cleaned
 
 #
@@ -130,8 +119,8 @@ clean:
 # 
 ResVsn:
 	${MKDIR} o
-	${ARMASM} ${AFLAGS} -o o.AlarmRes s.ResVsn
-	Link -rmf -o rm.AlarmRes o.AlarmRes 
+	${AS} ${ASFLAGS} -o o.AlarmRes s.ResVsn
+	${LD} -rmf -o rm.AlarmRes o.AlarmRes 
 
 #
 # Static dependencies:
@@ -139,11 +128,11 @@ ResVsn:
 
 ${ROM_MODULE}: s.Main ${MSGS} ${RESFILES}
 	${MKDIR} o
-	${ARMASM} ${AFLAGS} -o o.Main s.Main
-	Link -rmf -o $@ o.Main 
+	${AS} ${ASFLAGS} -o o.Main s.Main
+	${LD} -rmf -o $@ o.Main 
 
-${MSGS}: LocalRes:Messages VersionASM
-	GNU.gawk -f awk.Version LocalRes:Messages > $@
+${MSGS}: LocalRes:Messages VersionNum
+	${MSGVERSION} LocalRes:Messages > $@
 
 ${RDIR}.!RunImage: crunched.!RunImage
 	${SQUISH} ${SQFLAGS} -from crunched.!RunImage -to $@
@@ -151,9 +140,6 @@ ${RDIR}.!RunImage: crunched.!RunImage
 crunched.!RunImage: bas.!RunImage
 	crunch.!RunImage; BASIC
 
-${RDIR}.!RunLink: bas.!RunLink
-	${SQUISH} ${SQFLAGS} -from bas.!RunLink -to $@
-
 # Note! name of output file (Resources.Code) is in AlarmSrc
 ${RDIR}.Code: bas.AlarmSrc
 	/bas.AlarmSrc

Resources/UK/!Help

-
-                     !Alarm
-                     ======
-
 The Alarm application displays a clock on the icon
-bar. It can also be used to set 'alarms' to remind
+bar. 
+
+It can also be used to set 'alarms' to remind
 you of further events. You can save the alarms to
 disc, thus allowing the computer to remember them
 from day to day.

Resources/UK/Messages

 TaskID:Alarm
-AlarmID:Inserted by awk script during build
-TZSwtch:Switch between %0 and %1 automatically:
-OptSav:<Choices$Write>.Boot.Predesk.Alarm
+_Version:Inserted by awk script during build
+TZSwtch:Switch between %0 and %1 automatically
 
 #Error message stuff
 Unexp:An unexpected error has occured: %0 (%1). Do you wish to quit?
@@ -12,18 +11,6 @@ BNF:Corrupt %0 block not freed
 BNE:Corrupt %0 block not extended
 ODD1:Block %0: %1
 
-# *************** These strings end with spaces
-# if using messages mode in zap, these will be stripped on
-# saving.
-`C:currently selected 
-`a:allows you to 
-`c:that the computer will 
-`d:defer by a number of 
-`r:set the repeat interval to 
-# *************** End of section
-`s:the selected alarm
-`2:beyond the year 2247
-
 Time01:%Z12:%MI %AM
 Time02:%W3, %ZDY%ST
 Time03:%MO
@@ -82,37 +69,37 @@ BrwsM3:Selection
 BrwsM4:selection
 BrwsM5:Alarm
 BrwsM6:alarm
-BrwsT3:delete `s?
-BrwsT4:delete `ss?
+BrwsT3:delete the selected alarm?
+BrwsT4:delete the selected alarms?
 
 #{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.
+AlarmH3:This \w allows you to set an alarm.
+AlarmH5:This \w allows you to change an alarm.
+AlarmH6:This \w allows you to set the clock.
+AlarmH7:This \w allows you to find 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.
+AlarmHA:\Wthe alarm browser. It allows you to manipulate the alarms.|MDouble-click \s on an alarm to change it.
+AlarmHB:This \w allows you to change the setup for !Alarm.
 
 BHlpA1:\Sset a new alarm.
-BHlpA2:\Ract upon `s.
-BHlpA3:\Ract upon `ss.
+BHlpA2:\Ract upon the selected alarm.
+BHlpA3:\Ract upon the selected alarms.
 BHlpA4:\Sselect all the alarms.
 BHlpA5:\Sdeselect all the alarms.
 BHlpA6:\Robtain a file listing all the set alarms.
 BHlpA7:\Ssave the alarms in the default file.|M\Rsave the alarms elsewhere.
-BHlpB1:\Schange `s.
+BHlpB1:\Schange the selected alarm.
 BHlpB2:\Schange the first selected alarm.
-BHlpB3:\Sdelete `s.
-BHlpB4:\Sdelete `ss.
-BHlpB5:\Robtain a text file listing `s.
-BHlpB6:\Robtain a text file listing `ss.
-BHlpB7:\Robtain a !Alarm file containing `s.
-BHlpB8:\Robtain a !Alarm file containing `ss.
-BHlpB9:\Scopy `s.
-BHlpBA:\Scopy `ss.
+BHlpB3:\Sdelete the selected alarm.
+BHlpB4:\Sdelete the selected alarms.
+BHlpB5:\Robtain a text file listing the selected alarm.
+BHlpB6:\Robtain a text file listing the selected alarms.
+BHlpB7:\Robtain a !Alarm file containing the selected alarm.
+BHlpB8:\Robtain a !Alarm file containing the selected alarms.
+BHlpB9:\Scopy the selected alarm.
+BHlpBA:\Scopy the selected alarms.
 
 SHlp0A:\Smake non-urgent alarms quiet.
 SHlp0B:\Smake non-urgent alarms beep.
@@ -132,41 +119,41 @@ SHlp9B:\Sprevent !Alarm switching the time between GMT and BST automatically.
 SHlpAA:\Talarm beep timeout.
 SHlpBA:\Tuser defined display format.
 SHlpBB:An example of how the display would look is:
-SHlpCA:\Ttime `center BST on.
-SHlpCB:\Ttime `cleave BST on.
-SHlpDA:\Tdate `center BST on.
-SHlpDB:\Tdate `cleave BST on.
-SHlpEA:\Tmonth `center BST in.
-SHlpEB:\Tmonth `cleave BST in.
-SHlpFA:\Tyear `center BST in.
-SHlpFB:\Tyear `cleave BST in.
+SHlpCA:\Ttime that the computer will enter BST on.
+SHlpCB:\Ttime that the computer will leave BST on.
+SHlpDA:\Tdate that the computer will enter BST on.
+SHlpDB:\Tdate that the computer will leave BST on.
+SHlpEA:\Tmonth that the computer will enter BST in.
+SHlpEB:\Tmonth that the computer will leave BST in.
+SHlpFA:\Tyear that the computer will enter BST in.
+SHlpFB:\Tyear that the computer will leave BST in.
 SHlpGA:Click \s for alarms to beep continuously.
 SHlpGB:Click \s for alarms to stop beeping after the number of seconds specified.
 SHlpHA:\Sremove this day from the working week.
 SHlpHB:\Sadd this day to the working week.
-SHlpIA:\Ssave and use the chosen settings and close the window.|M\Ato do this but leave the window open.
-SHlpIB:\Sclose the window, without changing Alarm's configuration.
-HelpA3:\T`Chour at which the alarm will go off.
-HelpA4:\T`Cminute at which the alarm will go off.
-HelpA5:\T`C12 hour time at which the alarm will go off.
+SHlpIA:\Ssave and use the chosen settings and close the \w.|M\Ato do this but leave the \w open.
+SHlpIB:\Sclose the \w, without changing Alarm's configuration.
+HelpA3:\Tcurrently selected hour at which the alarm will go off.
+HelpA4:\Tcurrently selected minute at which the alarm will go off.
+HelpA5:\Tcurrently selected 12 hour time at which the alarm will go off.
 HelpA6:\Smake the alarm urgent.
 HelpA7:\Smake the alarm non-urgent.
-HelpA9:\T`Cdate at which the alarm will go off.
-HelpB4:\T`Cmonth at which the alarm will go off.
-HelpB5:\T`Cday of the week at which the alarm will go off.
-HelpB7:\T`Cyear at which the alarm will go off.
+HelpA9:\Tcurrently selected date at which the alarm will go off.
+HelpB4:\Tcurrently selected month at which the alarm will go off.
+HelpB5:\Tcurrently selected day of the week at which the alarm will go off.
+HelpB7:\Tcurrently selected year at which the alarm will go off.
 HelpB8:\Sposition the caret.|MUse the cursor keys to move the caret.
 HelpB9:\Sposition the caret.|MUse the cursor keys to move the caret or press Return to set the alarm.
 HelpC1:\Smake this a repeating alarm.
 HelpC2:\Smake this a non-repeating alarm.
-HelpC3:\S`rminutes.
-HelpC4:\S`rhours.
-HelpC5:\S`rdays.
-HelpC6:\S`rweeks.
-HelpC7:\S`rmonths.
-HelpC8:\S`ryears.
+HelpC3:\Sset the repeat interval to minutes.
+HelpC4:\Sset the repeat interval to hours.
+HelpC5:\Sset the repeat interval to days.
+HelpC6:\Sset the repeat interval to weeks.
+HelpC7:\Sset the repeat interval to months.
+HelpC8:\Sset the repeat interval to years.
 HelpC9:\Sdecrease the repeat time.
-HelpD1:\T`Crepeat time.
+HelpD1:\Tcurrently selected repeat time.
 HelpD2:\Sincrease the repeat time.
 HelpE1:\Smake this a task alarm.
 HelpE2:\Smake this a normal alarm.
@@ -177,9 +164,9 @@ HelpE6:\Smake this a regular repeating alarm.
 HelpF1:\Schange the offset into the month required.
 HelpF2:\Schange the day required.
 HelpF3:\Schange the number of months that should pass between alarms.
-HelpF4:\T`Coffset into the month.
-HelpF5:\T`Cday for the alarm to repeat on.
-HelpF6:\T`Cnumber of months that should pass between alarms.
+HelpF4:\Tcurrently selected offset into the month.
+HelpF5:\Tcurrently selected day for the alarm to repeat on.
+HelpF6:\Tcurrently selected number of months that should pass between alarms.
 HelpF7:\Smake this a normal repeating alarm.
 
 HelpG1:Year difference.
@@ -189,14 +176,14 @@ HelpG4:Minute difference.
 
 HelpD3:\Sset the alarm to the values you have chosen.
 HelpD7:\Supdate the alarm settings.
-HelpIB:\Sto close the window without setting an alarm.
-HelpIC:\Sto close the window without changing the alarm.
+HelpIB:\Sto close the \w without setting an alarm.
+HelpIC:\Sto close the \w without changing the alarm.
 
-ClockA1:\T`Creplacement time for the computer's clock.
+ClockA1:\Tcurrently selected replacement time for the computer's clock.
 ClockA2:\Sset the computer's clock to the date and time selected.
-ClockA3:\T`Creplacement date for the computer's clock.
-ClockA4:\T`Creplacement month for the computer's clock.
-ClockA5:\T`Creplacement year for the computer's clock.
+ClockA3:\Tcurrently selected replacement date for the computer's clock.
+ClockA4:\Tcurrently selected replacement month for the computer's clock.
+ClockA5:\Tcurrently selected replacement year for the computer's clock.
 ClockA7:\Sincrease the hours.
 ClockA8:\Sdecrease the hours.
 ClockA9:\Sincrease the minutes.
@@ -209,22 +196,22 @@ ClockB6:\Sdecrease the year.
 ClockB7:\Sincrease the year.
 ClockB8:\Sswitch to British Summer Time.
 ClockB9:\Sswitch to Greenwich Mean Time.
-ClockIB:\Sto close the window without changing the computer's clock.
-ClockQ3:\T`Creplacement hour for the computer's clock.
-ClockQ4:\T`Creplacement minute for the computer's clock.
-ClockQ5:\T`Creplacement day of the week for the computer's clock.
-ClockQ6:\T`Creplacement 12 hour time for the computer's clock.
+ClockIB:\Sto close the \w without changing the computer's clock.
+ClockQ3:\Tcurrently selected replacement hour for the computer's clock.
+ClockQ4:\Tcurrently selected replacement minute for the computer's clock.
+ClockQ5:\Tcurrently selected replacement day of the week for the computer's clock.
+ClockQ6:\Tcurrently selected replacement 12 hour time for the computer's clock.
 
-FindA1:\T`Ctime for the alarm search.
+FindA1:\Tcurrently selected time for the alarm search.
 FindA2:\Stry to find an alarm at or after this date & time.
-FindA3:\T`Cdate for the alarm search.
-FindA4:\T`Cmonth for the alarm search.
-FindA5:\T`Cyear for the alarm search.
-FindIB:\Sto close the window if you don't want to find an alarm.
-FindQ3:\T`Chour for the alarm search.
-FindQ4:\T`Cminute for the alarm search.
-FindQ5:\T`Cday of the week for the alarm search.
-FindQ6:\T`C12 hour time for the alarm search.
+FindA3:\Tcurrently selected date for the alarm search.
+FindA4:\Tcurrently selected month for the alarm search.
+FindA5:\Tcurrently selected year for the alarm search.
+FindIB:\Sto close the \w if you don't want to find an alarm.
+FindQ3:\Tcurrently selected hour for the alarm search.
+FindQ4:\Tcurrently selected minute for the alarm search.
+FindQ5:\Tcurrently selected day of the week for the alarm search.
+FindQ6:\Tcurrently selected 12 hour time for the alarm search.
 
 MnuAL1:\Saccept the current alarm.
 MnuAL2:\Scancel the current alarm.
@@ -234,12 +221,12 @@ MnuAM8:\Gyou are currently changing an alarm.
 MnuAM9:\Gthere aren't any alarms set.
 MnuAMA:\Gyou haven't selected any alarms.
 MnuD11:Enter a defer value and press Return.
-MnuD21:\R`dminutes.
-MnuD22:\R`dhours.
-MnuD23:\R`ddays.
-MnuD24:\R`dweeks.
-MnuD25:\R`dmonths.
-MnuD26:\R`dyears.
+MnuD21:\Rdefer by a number of minutes.
+MnuD22:\Rdefer by a number of hours.
+MnuD23:\Rdefer by a number of days.
+MnuD24:\Rdefer by a number of weeks.
+MnuD25:\Rdefer by a number of months.
+MnuD26:\Rdefer by a number of years.
 MnuFI1:\Sgo to the previous alarm.
 MnuFI2:\Sgo to the next alarm.
 MnuFI3:\Ssearch for an alarm.
@@ -259,7 +246,7 @@ MenuD2:#Defer alarm,Minutes,Hours,Days,Weeks,Months,Years
 MenuFI:#Alarm,Previous alarm,Next alarm,Find alarm
 MenuMM:#Alarm,Info,Alarms...,Choices...,Set clock...,Quit
 
-Drg01:This box `asave data in a file, or transfer it to another application.
+Drg01:This box allows you to save 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.
 Drg04:Drag this icon to the directory in which you want to save the file, or drag it to the program into which you want to transfer the data.
@@ -273,12 +260,12 @@ OkayB6:You are already setting an alarm
 OkayB8:You cannot set an alarm while you are changing one
 OkayB9:Alarm is already running
 OkayC1:To save, drag the icon to a directory display
-OkayC3:This alarm will not repeat as it would go `2
-OkayC4:Deferring the alarm by that amount would take it `2, which is not allowed
-OkayC5:An application alarm has just been deleted as it repeated `2
-OkayC6:The task alarm which just went off has been deleted as it repeated `2
+OkayC3:This alarm will not repeat as it would go beyond the year 2247
+OkayC4:Deferring the alarm by that amount would take it beyond the year 2247, which is not allowed
+OkayC5:An application alarm has just been deleted as it repeated beyond the year 2247
+OkayC6:The task alarm which just went off has been deleted as it repeated beyond the year 2247
 OkayC7:This alarm will not repeat as it
-OkayC8:would go `2
+OkayC8:would go beyond the year 2247
 OkayC9:You must have at least one day in a working week
 OkayD1:Cannot find Alarm's Code file
 OkayD2:There is not enough memory available to perform this operation. You need to make %0K more memory available. Quit any unwanted applications or see the RISC OS User Guide for ways to maximise memory.

VersionASM

@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "2.79"
-Module_Version          SETA    279
+Module_MajorVersion     SETS    "2.81"
+Module_Version          SETA    281
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "11 Jun 2009"
-Module_ApplicationDate  SETS    "11-Jun-09"
+Module_Date             SETS    "07 Dec 2011"
+Module_ApplicationDate  SETS    "07-Dec-11"
 Module_ComponentName    SETS    "Alarm"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/Apps/Alarm"
-Module_FullVersion      SETS    "2.79"
-Module_HelpVersion      SETS    "2.79 (11 Jun 2009)"
+Module_FullVersion      SETS    "2.81"
+Module_HelpVersion      SETS    "2.81 (07 Dec 2011)"
                         END

VersionNum

-/* (2.79)
+/* (2.81)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        2.79
+#define Module_MajorVersion_CMHG        2.81
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                11 Jun 2009
+#define Module_Date_CMHG                07 Dec 2011
 
-#define Module_MajorVersion             "2.79"
-#define Module_Version                  279
+#define Module_MajorVersion             "2.81"
+#define Module_Version                  281
 #define Module_MinorVersion             ""
-#define Module_Date                     "11 Jun 2009"
+#define Module_Date                     "07 Dec 2011"
 
-#define Module_ApplicationDate          "11-Jun-09"
+#define Module_ApplicationDate          "07-Dec-11"
 
 #define Module_ComponentName            "Alarm"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Apps/Alarm"
 
-#define Module_FullVersion              "2.79"
-#define Module_HelpVersion              "2.79 (11 Jun 2009)"
-#define Module_LibraryVersionInfo       "2:79"
+#define Module_FullVersion              "2.81"
+#define Module_HelpVersion              "2.81 (07 Dec 2011)"
+#define Module_LibraryVersionInfo       "2:81"

awk/Version

-# Generate an assembler header file containing Version and Date
-# using values set in the Messages file.
-#
-
-BEGIN {
-    while (getline < "VersionNum" > 0) {
-        split($0, Version)
-        if (Version[2] == "Module_ApplicationDate") {
-            Date = substr(Version[3], 2, length(Version[3]) -2 );
-        }
-        if (Version[2] == "Module_MajorVersion_CMHG") {
-            VString = Version[3];
-        }
-    }
-}
-
-/^AlarmID/ { printf("AlarmID:%s (%s)\n", VString, Date); done = 1; next; }
-
-{ print }
-
-END {
-    if (!done) {
-        printf("AlarmID:%s (%s)\n", VString, Date);
-    }
-}
-