Merged Spinner branch changes onto trunk (new RCA messages files and Makefile...

Merged Spinner branch changes onto trunk (new RCA messages files and Makefile changes). Convert to srccommit while we're at it.

Removed a few $Revision's to prevent future spurious merge clashes.

Version 4.87. Tagged as 'RISC_OSLib-4_87'

Makefile

@@ -407,8 +407,10 @@ clean_all:
 resources:
 	${MKDIR} ${RESDIR}.${COMPONENT}
 	${MKDIR} ${RESDIR}.CLib
-	${CP} clib.Resources.${LOCALE}.Messages ${RESDIR}.CLib.Messages ${CPFLAGS}
-	${CP} rlib.Resources.${LOCALE}.Messages ${RESDIR}.RISC_OSLib.Messages ${CPFLAGS}
+	IfThere clib.Resources.${LOCALE}.<System>.Messages Then Set MessagesFile clib.Resources.${LOCALE}.<System>.Messages else Set MessagesFile clib.Resources.${LOCALE}.Messages
+	${CP} <MessagesFile> ${RESDIR}.CLib.Messages ${CPFLAGS}
+	IfThere rlib.Resources.${LOCALE}.<System>.Messages Then Set MessagesFile rlib.Resources.${LOCALE}.<System>.Messages else Set MessagesFile rlib.Resources.${LOCALE}.Messages
+	${CP} <MessagesFile> ${RESDIR}.RISC_OSLib.Messages ${CPFLAGS}
 	@echo ${COMPONENT}: resource files copied
 
 dirs:

VersionASM

@@ -5,8 +5,8 @@
 			GBLA    Module_Version
 			GBLS	Module_MinorVersion
 			GBLS	Module_Date
-Module_MajorVersion	SETS    "4.86"
-Module_Version          SETA    486
+Module_MajorVersion	SETS    "4.87"
+Module_Version          SETA    487
 Module_MinorVersion	SETS	""
 Module_Date		SETS    "27 Aug 1998"
 		        END

VersionNum

-/* (4.86)
+/* (4.87)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG     	4.86
+#define Module_MajorVersion_CMHG     	4.87
 #define Module_MinorVersion_CMHG	
 #define Module_Date_CMHG      		27 Aug 1998
 
-#define Module_MajorVersion     	"4.86"
-#define Module_Version                  486
+#define Module_MajorVersion     	"4.87"
+#define Module_Version                  487
 #define Module_MinorVersion		""
 #define Module_Date      		"27 Aug 1998"
 

c/alloc

@@ -14,9 +14,6 @@
  */
 /*
   Title:        alloc - Storage management (dynamic allocation/deallocation)
-  $Revision$  LDS 31-Jul-87 $ BJK 23-Oct-1987
-  $Revision$  LH 22-Dec-1987
-  $Revision$  LH 03-Feb-1988
 
   Copyright (C) Acorn Computers Ltd., 1988
 */

c/armprof

@@ -17,12 +17,6 @@
 /* Copyright (C) Acorn Computers Ltd., 1988, 1990     */
 /* RISCOS-specific profiling support                  */
 
-/*
- * RCS $Revision$
- * Checkin $Date$
- * Revising $Author$
- */
-
 #include <stdio.h>
 
 /* HIDDEN EXPORTS */

h/alloc

@@ -15,7 +15,7 @@
 /*
   Title:        alloc - Storage management (dynamic allocation/deallocation)
   Copyright:    (C) 1987, Acorn Computers Ltd., Cambridge, England.
-  $Revision$  LDS, LH 03-Nov-89
+  Revision: 4.2  LDS, LH 03-Nov-89
 */
 
 #ifndef __alloc__h

rlib/Resources/UK/RCA/Messages

+alarm1:Unable to read monotonic time
+alarm2:Not enough memory to set alarm
+dbox1:Not enough memory to create dialogue box
+dbox2:Templates file not loaded for use with dialogue boxes
+flex1:Flex memory error
+flex2:Not enough memory, or not within *desktop world
+flex3:Flex not initialised
+fontmenu1:Incorrect parameter to font_makemenu
+fontmenu2:Not enough memory for font menu
+fontmenu3:Not enough memory for font identifier
+menu1:Not enough memory for menu
+resspr1:Not enough memory to load sprite file '%s'
+saveas1:To save, drag the icon to a directory display
+template1:Template '%s' not found
+template2:Not enough memory to load templates
+txtopt1:Not enough memory to cache options name
+signal1:Data abort
+signal2:Arithmetic exception
+signal3:Illegal instruction
+signal4:Escape
+signal5:Internal address error
+signal6:Termination request
+wimpt1:The Network Computer has experienced a technical difficulty. Please select continue.
+wimpt2:The Network Computer has experienced a technical difficulty. Please select continue.
+wimpt3:Not enough memory for active windows
+win1:Too many windows
+win2:Not enough memory to change window title
+xferrecv1:Can't transfer file (Scrap directory not set)
+xferrecv2:Data transfer failed
+xfersend2:Selection

rlib/c/alarm

@@ -233,7 +233,6 @@ void alarm_removeall(void *handle)
     }
 }
 
-#ifndef UROM
 BOOL alarm_anypending(void *handle)
 {
   ALARM *p = alarm__pending_list;
@@ -246,4 +245,3 @@ BOOL alarm_anypending(void *handle)
 
   return FALSE;
 }
-#endif

s/version

@@ -12,5 +12,8 @@
 ; See the License for the specific language governing permissions and
 ; limitations under the License.
 ;
-        DCB     "4.86 (27 Jul 1998)"
+
+	GET	VersionASM
+
+        DCB     Module_MajorVersion " (" Module_Date ") " Module_MinorVersion
         END