Commit 3d810cc5 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Addition of extra sample maestro file and minor admin

* ShostF7 is Fugue number 7 in A major from 24 Preludes and Fugues, opus 87 by Dmitri Shostakovich. Score entered by Richard Hallas, who provides it here in maestro format
* Makefile adjusted to insert build version and date into messages file automatically
* Sources reimported as text to allow easier diffing. For the full history, you'll need to look at "!RunImage,ffb" in the attic
Tested briefly, info box is now right, and tunes are still played.

Version 1.94. Tagged as 'Maestro-1_94'
parent 9b79af29
......@@ -13,4 +13,4 @@
| limitations under the License.
|
Dir <Obey$Dir>
amu_machine install INSTDIR=<install$dir>.HardDisc4.Sound TARGET=Examples
amu_machine install INSTDIR=<install$dir>.HardDisc4.Documents.Music.Maestro TARGET=Examples
s/** gitlab-language=armasm linguist-language=armasm linguist-detectable=true
*,ffb gitlab-language=bbcbasic linguist-language=bbcbasic linguist-detectable=true
bas/** gitlab-language=bbcbasic linguist-language=bbcbasic linguist-detectable=true
......@@ -31,27 +31,18 @@ RDIR = Resources
LDIR = ${RDIR}.${LOCALE}
INSTAPP = ${INSTDIR}.${APP}
include StdTools
SQUISH = squish
SQFLAGS = -nolist
MSGVERSION = ${AWK} -f Build:AwkVers
#
# Modules to load before squishing
#
PDRIVER = <Build$Dir>.Modules.PDriver
PDRIVER2 = <Printers$Dir>.Modules.PDriver
# Generic options:
#
AS = objasm
LD = link
MKDIR = do mkdir -p
CP = copy
RM = remove
SQUISH = squish
WIPE = x wipe
AFLAGS = ${THROWBACK} -depend !Depend -stamp -quit
CPFLAGS = ~cfr~v
SQFLAGS = -nolist
WFLAGS = ~c~v
FILES =\
$(RDIR).!Boot\
$(LDIR).!Help\
......@@ -61,7 +52,7 @@ FILES =\
$(RDIR).!Sprites11\
$(RDIR).!Sprites22\
$(RDIR).EnsureRMA\
$(LDIR).Messages\
$(RDIR).GenMessage\
$(RDIR).Sprites\
$(RDIR).Sprites22\
$(LDIR).Templates
......@@ -91,7 +82,7 @@ install_ install_Maestro: ${FILES}
${CP} ${RDIR}.!Sprites11 ${INSTAPP}.!Sprites11 ${CPFLAGS}
${CP} ${RDIR}.!Sprites22 ${INSTAPP}.!Sprites22 ${CPFLAGS}
${CP} ${RDIR}.EnsureRMA ${INSTAPP}.EnsureRMA ${CPFLAGS}
${CP} ${LDIR}.Messages ${INSTAPP}.Messages ${CPFLAGS}
${CP} ${RDIR}.GenMessage ${INSTAPP}.Messages ${CPFLAGS}
${CP} ${RDIR}.Sprites ${INSTAPP}.Sprites ${CPFLAGS}
${CP} ${RDIR}.Sprites22 ${INSTAPP}.Sprites22 ${CPFLAGS}
${CP} ${LDIR}.Templates ${INSTAPP}.Templates ${CPFLAGS}
......@@ -102,6 +93,7 @@ install_ install_Maestro: ${FILES}
clean:
${RM} ${RDIR}.!RunImage
${RM} ${RDIR}.EnsureRMA
${RM} ${RDIR}.GenMessage
${WIPE} crunched.* ${WFLAGS}
${WIPE} o ${WFLAGS}
@echo ${COMPONENT}: cleaned
......@@ -125,5 +117,8 @@ $(RDIR).EnsureRMA: o.EnsureRMA
${LD} -bin -o $@ o.EnsureRMA
SetType $@ Utility
$(RDIR).GenMessage: $(LDIR).Messages
${MSGVERSION} $(LDIR).Messages > $(RDIR).GenMessage
#---------------------------------------------------------------------------
# Dynamic dependencies:
Version:1.89 (27-Nov-02)
_Version:Substituted by awk
JobFailed:Printer job failed
SpriteName:!Maestro
Maestro:Maestro
......
/* (1.93)
/* (1.94)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.93
#define Module_MajorVersion_CMHG 1.94
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 14 Jan 2012
#define Module_Date_CMHG 05 Sep 2012
#define Module_MajorVersion "1.93"
#define Module_Version 193
#define Module_MajorVersion "1.94"
#define Module_Version 194
#define Module_MinorVersion ""
#define Module_Date "14 Jan 2012"
#define Module_Date "05 Sep 2012"
#define Module_ApplicationDate "14-Jan-12"
#define Module_ApplicationDate "05-Sep-12"
#define Module_ComponentName "Maestro"
#define Module_ComponentPath "castle/RiscOS/Sources/Apps/Maestro"
#define Module_FullVersion "1.93"
#define Module_HelpVersion "1.93 (14 Jan 2012)"
#define Module_LibraryVersionInfo "1:93"
#define Module_FullVersion "1.94"
#define Module_HelpVersion "1.94 (05 Sep 2012)"
#define Module_LibraryVersionInfo "1:94"
This diff is collapsed.
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