Commit 8d84772b authored by Ben Avison's avatar Ben Avison Committed by ROOL
Browse files

Make Env files work with default 640K again

Changes in Env 1.40-1.41 require GNU.gawk and amu within the same application
slot at the same time, which exceeds the default 640K WimpSlot. There isn't
actually any need for the awk script to run within a Makefile (it's not
testing the Makefile's behaviour directly) so by moving the lines up to
!Common, the memory usage is reduced.

Version 1.42. Tagged as 'Env-1_42'
parent 1533dafc
......@@ -54,16 +54,14 @@ Set Makefiles$Path <Build$Dir>.BuildSys.Makefiles.
set Install$Dir <Build$Dir>.Install
setmacro Install$Path <Install$Dir>.
|
| Determine whether we have a working or broken amu - if it is working (5.13 or later), the system variable
| BuildSys$AMU$Fixed will be set to "yes" - otherwise "yes". To cope with the broken Makefiles in the build
| tree, for the time being the compatibility option is required for the fixed version of AMU. Older versions
| do not require this fix, but also need to pass environment variables in explicitly.
|
/<Tools$Dir>.Acorn.amu -f <Build$Dir>.Env.Makefile FIXED=yes find-amu-version
set alias$amu_machine amu MACHINE=<Machine> LOCALE=<Locale> SYSTEM=<System> BUILD=<Build> UserIF=<UserIF> APCS=<APCS> %%*0
if "<BuildSys$AMU$Fixed>"="yes" Then set alias$amu_machine amu -E %%*0
|
| Determine amu features
amu -help { > <Wimp$ScrapDir>.amu }
GNU.gawk "NR==2 { print \"Set AMU$Version \" $3*100 }" < <Wimp$ScrapDir>.amu > Pipe:$.amu
Remove <Wimp$ScrapDir>.amu
Obey Pipe:$.amu
SetEval AMU$HasWorkingWildcard <AMU$Version> > 532
|
Set Alias$amu_machine amu -E %%*0
| Locate the export directories and set the tool options
/Build:ToolOptions.<APCS>
......
......@@ -23,14 +23,3 @@ bbe-env: bbe-generic-resources-get-alias
BBE_Export_File !Common
${CP} MakefileBBE ${BBEDIR}.Makefile ${CPFLAGS}
BBE_Export_File VersionNum
# Determine whether the macro processor in amu works or not
FIXED = no
find-amu-version:
@set BuildSys$AMU$Fixed ${FIXED}
@amu -help { > <Wimp$ScrapDir>.amu }
@GNU.gawk "NR==2 { print \"Set AMU$Version \" $3*100 }" { < <Wimp$ScrapDir>.amu > Pipe:$.amu }
@remove <Wimp$ScrapDir>.amu
@obey Pipe:$.amu
@seteval AMU$HasWorkingWildcard <AMU$Version> > 532
/* (1.41)
/* (1.42)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 1.41
#define Module_MajorVersion_CMHG 1.42
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 02 Nov 2019
#define Module_Date_CMHG 12 Nov 2019
#define Module_MajorVersion "1.41"
#define Module_Version 141
#define Module_MajorVersion "1.42"
#define Module_Version 142
#define Module_MinorVersion ""
#define Module_Date "02 Nov 2019"
#define Module_Date "12 Nov 2019"
#define Module_ApplicationDate "02-Nov-19"
#define Module_ApplicationDate "12-Nov-19"
#define Module_ComponentName "Env"
#define Module_FullVersion "1.41"
#define Module_HelpVersion "1.41 (02 Nov 2019)"
#define Module_LibraryVersionInfo "1:41"
#define Module_FullVersion "1.42"
#define Module_HelpVersion "1.42 (12 Nov 2019)"
#define Module_LibraryVersionInfo "1:42"
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