Merged Ursula branch

Version 1.55. Tagged as 'Edit-1_55'

!MkClean,fd7

@@ -14,3 +14,4 @@
 |
 Dir <Obey$Dir>
 amu_machine clean
+stripdepnd Makefile

Makefile

@@ -33,6 +33,8 @@ ROM_MODULE = aof.Edit
 RDIR       = Resources
 LDIR       = LocalRes:
 
+MSGS       = Resources.GenMessage
+
 #
 # Export Paths for Messages module
 #
@@ -79,7 +81,7 @@ FILES =\
  abs.!RunImage\
  ${RDIR}.Export\
  ${LDIR}!Help\
- ${LDIR}Messages\
+ ${MSGS} \
  ${LDIR}Templates
 
 # Include these in the ROM module
@@ -114,13 +116,13 @@ install: ${FILES}
 	${CP} ${RDIR}.!Run         ${INSTDIR}.!Run      ${CPFLAGS}
 	${CP} abs.!RunImage        ${INSTDIR}.!RunImage ${CPFLAGS}
 	${CP} ${RDIR}.Export       ${INSTDIR}.Export    ${CPFLAGS}
-	${CP} ${LDIR}Messages      ${INSTDIR}.Messages  ${CPFLAGS}
+	${CP} ${MSGS}              ${INSTDIR}.Messages  ${CPFLAGS}
 	${CP} ${LDIR}Templates     ${INSTDIR}.Templates ${CPFLAGS}
 	Access ${INSTDIR}.!Boot      lr/r
 	Access ${INSTDIR}.!Help      lr/r
 	Access ${INSTDIR}.!Run       lr/r
 	Access ${INSTDIR}.!RunImage  lr/r
-	Access ${INSTDIR}.Export    lr/r
+	Access ${INSTDIR}.Export     lr/r
 	Access ${INSTDIR}.Messages   lr/r
 	Access ${INSTDIR}.Templates  lr/r
 	@echo ${COMPONENT}: Application installed (Disc)
@@ -129,13 +131,13 @@ install_rom: ${ROM_MODULE}
 	${CP} ${ROM_MODULE} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
 	@echo ${COMPONENT}: Module installed (ROM)
 
-resources:
+resources: ${MSGS}
 	${MKDIR} ${RESDIR}
 	${MKDIR} ${RESAPP}
 	${CP} ${RDIR}.!Boot     ${RESAPP}.!Boot ${CPFLAGS}
 	${CP} ${LDIR}!Help      ${RESAPP}.!Help ${CPFLAGS}
 	${CP} ${RDIR}.ROM.!Run  ${RESAPP}.!Run  ${CPFLAGS}
-	${CP} ${LDIR}Messages   ${RESDIR}.Messages ${CPFLAGS}
+	${CP} ${MSGS}           ${RESDIR}.Messages ${CPFLAGS}
 	${CP} ${LDIR}Templates  ${RESDIR}.Templates ${CPFLAGS}
 	@echo ${COMPONENT}: resource files copied to Messages module
 
@@ -147,8 +149,8 @@ clean:
 	${RM} abs.!RunImage
 	${RM} ${ROM_MODULE}
 	${RM} ${MODULE}
+	${RM} ${MSGS}
 	${RM} s.ModuleWrap
-	${RM} s.AppName
 	@echo ${COMPONENT}: cleaned
 
 #
@@ -175,14 +177,14 @@ rom_link:
 	${CP} linked.${COMPONENT} ${LINKDIR}.${COMPONENT} ${CPFLAGS}
 	@echo ${COMPONENT}: rom_link complete
 
-oz.ModuleWrap: s.ModuleWrap s.AppName ${RESFILES}
+oz.ModuleWrap: s.ModuleWrap s.AppName ${MSGS} ${RESFILES}
 	${AS} ${AFLAGS} s.ModuleWrap $@
 
 s.ModuleWrap: ${WRAPPER}
 	${CP} ${WRAPPER} $@ ${CPFLAGS}
 
-s.AppName: ${LDIR}Messages
-	awk -f awk.AppName ${LDIR}Messages > $@
+${MSGS}: ${LDIR}Messages awk.Version
+	awk -f awk.Version ${LDIR}Messages > $@
 
 #---------------------------------------------------------------------------
 # Debugging version:

VersionASM

+;
+; 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    "1.55"
+Module_Version          SETA    155
+Module_MinorVersion     SETS    ""
+Module_Date             SETS    "12 May 2000"
+Module_FullVersion      SETS    "1.55"
+                        END

VersionNum

+/* (1.55)
+ *
+ * This file is automatically maintained by srccommit, do not edit manually.
+ *
+ */
+#define Module_MajorVersion_CMHG        1.55
+#define Module_MinorVersion_CMHG        
+#define Module_Date_CMHG                12 May 2000
+
+#define Module_MajorVersion             "1.55"
+#define Module_Version                  155
+#define Module_MinorVersion             ""
+#define Module_Date                     "12 May 2000"
+
+#define Module_FullVersion              "1.55"

awk/AppName

-# Generate an assembler header file containing ApplicationName
-# and ApplicationVersion using information in the Messages file.
-# Component version and date need only be updated in Messages file
-#
-
-BEGIN {
-    found = 0
-}
-
-{
-    if (!found) {
-        split($1, Id, ":")
-        if (Id[1] == "EditId") {
-            found = 1
-            split($2, Date, "-")
-        }
-    }
-}
-
-END {
-    printf("; AppName - generated from Messages, used by ModuleWrap\n")
-    printf("\n")
-    printf("                   GBLS    ApplicationName\n")
-    printf("                   GBLS    ApplicationVersion\n")
-    printf("\n")
-    printf("ApplicationName    SETS    \"Edit\"\n")
-    printf("ApplicationVersion SETS    \"%s %s %s 19%s\"\n", Id[2], Date[1], Date[2], Date[3])
-    printf("\n")
-    printf("                   END\n")
-}
-

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_Date_CMHG") {
+            Date = Version[3] "-" Version[4] "-" substr(Version[5],3,2);
+        }
+        if (Version[2] == "Module_MajorVersion_CMHG") {
+            VString = Version[3];
+        }
+    }
+}
+
+/^EditId/ { printf("EditId:%s (%s)\n", VString, Date); done = 1; next; }
+
+{ print }
+
+END {
+    if (!done) {
+        printf("EditId:%s (%s)\n", VString, Date);
+    }
+}
+

s/AppName

+; Copyright 2000 Pace Micro Technology plc
+;
+; 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.
+;
+; AppName - generated from Messages, used by ModuleWrap
+
+                   GBLS    ApplicationName
+                   GBLS    ApplicationVersion
+
+                   GET     VersionASM
+
+ApplicationName    SETS    "Edit"
+ApplicationVersion SETS    "$Module_MajorVersion ($Module_Date)"
+
+                   END