Version number now extracted from the VersionNum file and inserted into messages at build time.

Saving palette files now preserve the attributes if a file of the same name
already existed in the target directory.
New tool sprites (and corresponding changed Templates)
Now strips dependencies when cleaned.

Version 1.95. Tagged as 'Paint-1_95'

!MkClean,fd7

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

Makefile

@@ -33,6 +33,8 @@ ROM_MODULE = aof.Paint
 RDIR       = Resources
 LDIR       = ${RDIR}.${LOCALE}
 
+MSGS       = Resources.GenMessage
+
 #
 # Export Paths for Messages module
 #
@@ -77,7 +79,7 @@ FILES = \
  ${RDIR}.!Boot\
  ${LDIR}.!Help\
  ${LDIR}.!Run\
- ${LDIR}.Messages\
+ ${MSGS} \
  ${LDIR}.Sprites\
  ${LDIR}.Templates\
  abs.!RunImage
@@ -86,7 +88,7 @@ FILESD = \
  ${RDIR}.!Boot\
  ${LDIR}.!Help\
  ${LDIR}.!Run\
- ${LDIR}.Messages\
+ ${MSGS} \
  ${LDIR}.Sprites\
  ${LDIR}.Templates\
  abs.!RunImageD
@@ -139,7 +141,7 @@ install: ${FILES}
 	${CP} ${LDIR}.!Help      ${INSTDIR}.!Help      ${CPFLAGS}
 	${CP} ${LDIR}.!Run       ${INSTDIR}.!Run       ${CPFLAGS}
 	${CP} abs.!RunImage      ${INSTDIR}.!RunImage  ${CPFLAGS}
-	${CP} ${LDIR}.Messages   ${INSTDIR}.Messages   ${CPFLAGS}
+	${CP} ${MSGS}            ${INSTDIR}.Messages   ${CPFLAGS}
 	${CP} ${LDIR}.Sprites    ${INSTDIR}.Sprites    ${CPFLAGS}
 	${CP} ${LDIR}.Templates  ${INSTDIR}.Templates  ${CPFLAGS}
 	Access ${INSTDIR}.!Boot      lr/r
@@ -172,14 +174,14 @@ 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}.Sprites   ${RESDIR}.Sprites   ${CPFLAGS}
 	${CP} ${LDIR}.Templates ${RESDIR}.Templates ${CPFLAGS}
 	@echo ${COMPONENT}: resource files copied to Messages module
@@ -194,6 +196,7 @@ clean:
 	${RM} abs.!RunImage
 	${RM} abs.!RunImageD
 	${RM} ${ROM_MODULE}
+	${RM} ${MSGS}
 	${RM} ${MODULE}
 	@echo ${COMPONENT}: cleaned
 
@@ -225,7 +228,7 @@ clean_all:
         ${APP}.!RunImage \
         debug.${APP}.!RunImage \
         ${ROM_MODULE} ${MODULE} \
-        ${ASMS} s.AppName s.ModuleWrap s.ResFiles \
+        ${ASMS} s.Appname s.ModuleWrap s.ResFiles \
         ${DFILES} ${INSTDIR}.!Boot ${INSTDIR}.!Help ${INSTDIR}.!Run \
         ${INSTDIR}.!RunImage ${INSTDIR}.Messages ${INSTDIR}.Sprites \
         ${INSTDIR}.Templates
@@ -250,18 +253,21 @@ rom_link:
 	${CP} linked.${COMPONENT} ${LINKDIR}.${COMPONENT} ${CPFLAGS}
 	@echo ${COMPONENT}: rom_link complete
 
-oz.ModuleWrap: s.ModuleWrap ${RESFILES} s.AppName s.Resfiles
+oz.ModuleWrap: s.ModuleWrap ${MSGS} s.AppName ${RESFILES} s.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 > $@
 
 s.ResFiles: asm.ResFiles
 	${CP} asm.ResFiles $@ ${CPFLAGS}
 
+s.AppName: asm.AppName
+	${CP} asm.AppName $@ ${CPFLAGS}
+
 #---------------------------------------------------------------------------
 # debugging version:
 #

VersionASM

 ;
 ; This file is automatically maintained by srccommit, do not edit manually.
-; Last processed by srccommit version: 1.62.
+; Last processed by srccommit version: 1.68.
 ;
                         GBLS    Module_MajorVersion
                         GBLA    Module_Version
@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "1.94"
-Module_Version          SETA    194
+Module_MajorVersion     SETS    "1.95"
+Module_Version          SETA    195
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "20 Apr 2000"
-Module_ApplicationDate  SETS    "20-Apr-20"
+Module_Date             SETS    "13 Jan 2003"
+Module_ApplicationDate  SETS    "13-Jan-03"
 Module_ComponentName    SETS    "Paint"
 Module_ComponentPath    SETS    "RiscOS/Sources/Apps/Paint"
-Module_FullVersion      SETS    "1.94"
-Module_HelpVersion      SETS    "1.94 (20 Apr 2000)"
+Module_FullVersion      SETS    "1.95"
+Module_HelpVersion      SETS    "1.95 (13 Jan 2003)"
                         END

VersionNum

-/* (1.94)
+/* (1.95)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
- * Last processed by srccommit version: 1.62.
+ * Last processed by srccommit version: 1.68.
  *
  */
-#define Module_MajorVersion_CMHG        1.94
+#define Module_MajorVersion_CMHG        1.95
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                20 Apr 2000
+#define Module_Date_CMHG                13 Jan 2003
 
-#define Module_MajorVersion             "1.94"
-#define Module_Version                  194
+#define Module_MajorVersion             "1.95"
+#define Module_Version                  195
 #define Module_MinorVersion             ""
-#define Module_Date                     "20 Apr 2000"
+#define Module_Date                     "13 Jan 2003"
 
-#define Module_ApplicationDate          "20-Apr-00"
+#define Module_ApplicationDate          "13-Jan-03"
 
 #define Module_ComponentName            "Paint"
 #define Module_ComponentPath            "RiscOS/Sources/Apps/Paint"
 
-#define Module_FullVersion              "1.94"
-#define Module_HelpVersion              "1.94 (20 Apr 2000)"
-#define Module_LibraryVersionInfo       "1:94"
+#define Module_FullVersion              "1.95"
+#define Module_HelpVersion              "1.95 (13 Jan 2003)"
+#define Module_LibraryVersionInfo       "1:95"

asm/AppName

+; AppName - generated from Messages, used by ModuleWrap
+
+                   GBLS    ApplicationName
+                   GBLS    ApplicationVersion
+
+                   GET     VersionASM
+
+ApplicationName    SETS    "Paint"
+ApplicationVersion SETS    "$Module_MajorVersion ($Module_Date)"
+
+                   END

awk/Version

+#
+# Output a messages file,with the ID token replaced with the date taken from the VersionNum file
+#
+
+BEGIN {
+    while (getline < "VersionNum" > 0) {
+        split($0, Version);
+        if (Version[1] == "#define") {
+            if (Version[2] == "Module_ApplicationDate") {
+                Date = substr(Version[3], 2, length(Version[3]) -2 );
+            }
+            if (Version[2] == "Module_MajorVersion_CMHG") {
+                VString = Version[3];
+            }
+        }
+    }
+}
+
+/^PntID/ { printf("PntID:%s (%s)\n", VString, Date); done = 1; next; }
+
+{ print }
+
+END {
+    if (!done) {
+        printf("PntID:%s (%s)\n", VString, Date);
+    }
+}

c/Menus

@@ -606,7 +606,7 @@ static BOOL save_sprite_palette (char *filename, void *shandle)
 { main_sprite *sprite = (main_sprite *) shandle;
   char palette [6*256];
   os_regset r;
-  int len;
+  int len, oldattribs = -1;
   BOOL saved;
 
   ftracef1 ("save_sprite_palette %s\n", filename);
@@ -616,14 +616,27 @@ static BOOL save_sprite_palette (char *filename, void *shandle)
   if (len == 6*16) len += 6*4;
 
   build_sprite_palette_file (sprite, palette);
-  r.r [0] = 10;
+
+  r.r [0] = 17; /* Read cat info */
   r.r [1] = (int) filename;
+  (void) os_swix (OS_File, &r);
+  /* if something is already there,remember its attributes */
+  if (r.r [0] != 0) oldattribs = r.r [5];
+
+  r.r [0] = 10;
   r.r [2] = 0xFED;
   r.r [4] = (int) &palette;
   r.r [5] = (int) &palette + len;
 
   visdelay_begin ();
   saved = wimpt_complain (os_swix (OS_File, &r)) == NULL;
+
+  if (oldattribs != -1) {
+    r.r [0] = 4; /* Write attribs */
+    r.r [5] = oldattribs;
+    (void) os_swix (OS_File, &r);
+  };
+
   visdelay_end ();
 
   return saved;