Commit 90af2706 authored by David Cotton's avatar David Cotton
Browse files

Merged the latest changes on Spinner branch.

Detail:
	Needed the localres alterations off the Spinner branch that had been
added since the branch was last merged.
	Added strdepend to the clean phase.

Admin:
	Built locally and on STB build machine.

Version 2.56. Tagged as 'Desktop-2_56'
parent 417ea70b
......@@ -29,6 +29,7 @@ MKDIR = cdir
AS = aasm
CP = copy
RM = remove
STRIP = stripdepnd
CCFLAGS = -c -depend !Depend -IC:
ASFLAGS = -depend !Depend -Stamp -quit -module -To $@ -From
CPFLAGS = ~cfr~v
......@@ -55,14 +56,25 @@ install_rom: ${TARGET}
clean:
${RM} ${TARGET}
${STRIP}
@echo ${COMPONENT}: cleaned
resources:
${MKDIR} ${RESDIR}.${COMPONENT}
${CP} Resources.${LOCALE}.Messages ${RESDIR}.${COMPONENT}.Messages ${CPFLAGS}
${CP} Resources.${LOCALE}.Templates ${RESDIR}.${COMPONENT}.Templates ${CPFLAGS}
resources: resources-${CMDHELP}
@echo ${COMPONENT}: resource files copied
resources_common:
${MKDIR} ${RESDIR}.${COMPONENT}
TokenCheck LocalRes:Messages
${CP} LocalRes:Messages ${RESDIR}.${COMPONENT}.Messages ${CPFLAGS}
${CP} LocalRes:Templates ${RESDIR}.${COMPONENT}.Templates ${CPFLAGS}
resources-None: resources_common
@
resources-: resources_common
TokenCheck LocalRes:CmdHelp
print LocalRes:CmdHelp { >> ${RESDIR}.${COMPONENT}.Messages }
${TARGET}: ${SOURCE}
${AS} ${ASFLAGS} ${SOURCE}
......
No preview for this file type
......@@ -6,9 +6,9 @@
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
Module_MajorVersion SETS "2.55"
Module_Version SETA 255
Module_MajorVersion SETS "2.56"
Module_Version SETA 256
Module_MinorVersion SETS ""
Module_Date SETS "17 Aug 1999"
Module_FullVersion SETS "2.55"
Module_Date SETS "15 Nov 1999"
Module_FullVersion SETS "2.56"
END
/* (2.55)
/* (2.56)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 2.55
#define Module_MajorVersion_CMHG 2.56
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 17 Aug 1999
#define Module_Date_CMHG 15 Nov 1999
#define Module_MajorVersion "2.55"
#define Module_Version 255
#define Module_MajorVersion "2.56"
#define Module_Version 256
#define Module_MinorVersion ""
#define Module_Date "17 Aug 1999"
#define Module_Date "15 Nov 1999"
#define Module_FullVersion "2.55"
#define Module_FullVersion "2.56"
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