Commit 0538bbba authored by Ben Avison's avatar Ben Avison
Browse files

Build fix

Detail:
  Some users reported problems building the sources if they had other
  installations of perl on their build machine. The build system was using a
  mixture of "perl" and "<Perl$Dir>.perl" to invoke the interpreter, and
  sometimes but not always using "do" to expand system variables on the
  command line. This has now been standardised to use "do <Perl$Dir>.perl in
  all cases, and where possible, to use the makefile macro ${PERL}.
Admin:
  Checked that a Tungsten build still works on a build machine with no other
  perl installation. "perl" was aliased to an error to ensure it wasn't used.

Version 5.35, 4.79.2.102. Tagged as 'Kernel-5_35-4_79_2_102'
parent 40949773
......@@ -38,6 +38,7 @@ LD = link
CP = copy
RM = remove
WIPE = -wipe
PERL = do <Perl$Dir>.perl
CCFLAGS = -c -depend !Depend -IC:
ASFLAGS = -depend !Depend ${THROWBACK} -Stamp -quit -To $@ -From
ARMASMFLAGS = -depend !Depend -g ${THROWBACK} -cpu 5TE
......@@ -168,11 +169,11 @@ ${EXP_HDR}.OSEntries: hdr.OSEntries
${C_EXP_HDR}.RISCOS: hdr.RISCOS
${MKDIR} ${C_EXP_HDR}
perl Build:Hdr2H hdr.RISCOS $@
${PERL} Build:Hdr2H hdr.RISCOS $@
${C_EXP_HDR}.HALEntries: hdr.HALEntries
${MKDIR} ${C_EXP_HDR}
perl Build:Hdr2H hdr.HALEntries $@
${PERL} Build:Hdr2H hdr.HALEntries $@
${C_EXP_HDR}.HALDevice: o.Global.h.HALDevice h.HALDevice
${CP} h.HALDevice $@ ${CPFLAGS}
......@@ -181,7 +182,7 @@ ${C_EXP_HDR}.HALDevice: o.Global.h.HALDevice h.HALDevice
o.Global.h.HALDevice: hdr.HALDevice
${MKDIR} o.Global.h
dir o
perl Build:Hdr2H ^.hdr.HALDevice Global.h.HALDevice
${PERL} Build:Hdr2H ^.hdr.HALDevice Global.h.HALDevice
back
BBETYPE = kernel
......
......@@ -13,11 +13,11 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35"
Module_Version SETA 535
Module_MinorVersion SETS "4.79.2.101"
Module_Date SETS "23 Apr 2009"
Module_ApplicationDate SETS "23-Apr-09"
Module_MinorVersion SETS "4.79.2.102"
Module_Date SETS "07 Jun 2009"
Module_ApplicationDate SETS "07-Jun-09"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
Module_FullVersion SETS "5.35 (4.79.2.101)"
Module_HelpVersion SETS "5.35 (23 Apr 2009) 4.79.2.101"
Module_FullVersion SETS "5.35 (4.79.2.102)"
Module_HelpVersion SETS "5.35 (07 Jun 2009) 4.79.2.102"
END
......@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
#define Module_MinorVersion_CMHG 4.79.2.101
#define Module_Date_CMHG 23 Apr 2009
#define Module_MinorVersion_CMHG 4.79.2.102
#define Module_Date_CMHG 07 Jun 2009
#define Module_MajorVersion "5.35"
#define Module_Version 535
#define Module_MinorVersion "4.79.2.101"
#define Module_Date "23 Apr 2009"
#define Module_MinorVersion "4.79.2.102"
#define Module_Date "07 Jun 2009"
#define Module_ApplicationDate "23-Apr-09"
#define Module_ApplicationDate "07-Jun-09"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
#define Module_FullVersion "5.35 (4.79.2.101)"
#define Module_HelpVersion "5.35 (23 Apr 2009) 4.79.2.101"
#define Module_FullVersion "5.35 (4.79.2.102)"
#define Module_HelpVersion "5.35 (07 Jun 2009) 4.79.2.102"
#define Module_LibraryVersionInfo "5:35"
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