From ea25b6c85adbeaecb0fa1c696817d846e20b2d04 Mon Sep 17 00:00:00 2001
From: Ben Avison <bavison@gitlab.riscosopen.org>
Date: Sun, 7 Jun 2009 17:03:15 +0000
Subject: [PATCH] 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 4.73. Tagged as 'BuildSys-4_73'
---
ImageName/!NewMajor,feb | 2 +-
ImageName/!NewMinor,feb | 2 +-
ImageName/!NewVer,feb | 2 +-
ImageName/!Query,feb | 2 +-
Makefiles/StdTools | 4 ++--
VersionNum | 20 ++++++++++----------
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/ImageName/!NewMajor,feb b/ImageName/!NewMajor,feb
index f7ca082..6807794 100644
--- a/ImageName/!NewMajor,feb
+++ b/ImageName/!NewMajor,feb
@@ -12,4 +12,4 @@
| See the License for the specific language governing permissions and
| limitations under the License.
|
-perl <obey$dir>.ImageName -newmajor -test
+do <Perl$Dir>.perl <obey$dir>.ImageName -newmajor -test
diff --git a/ImageName/!NewMinor,feb b/ImageName/!NewMinor,feb
index 935b646..4752ecd 100644
--- a/ImageName/!NewMinor,feb
+++ b/ImageName/!NewMinor,feb
@@ -12,4 +12,4 @@
| See the License for the specific language governing permissions and
| limitations under the License.
|
-perl <obey$dir>.ImageName -newminor -test
+do <Perl$Dir>.perl <obey$dir>.ImageName -newminor -test
diff --git a/ImageName/!NewVer,feb b/ImageName/!NewVer,feb
index 852000b..263f3e5 100644
--- a/ImageName/!NewVer,feb
+++ b/ImageName/!NewVer,feb
@@ -12,4 +12,4 @@
| See the License for the specific language governing permissions and
| limitations under the License.
|
-perl <obey$dir>.ImageName -test
+do <Perl$Dir>.perl <obey$dir>.ImageName -test
diff --git a/ImageName/!Query,feb b/ImageName/!Query,feb
index 5ed90c1..3803f6a 100644
--- a/ImageName/!Query,feb
+++ b/ImageName/!Query,feb
@@ -12,5 +12,5 @@
| See the License for the specific language governing permissions and
| limitations under the License.
|
-perl <obey$dir>.ImageName -query -test
+do <Perl$Dir>.perl <obey$dir>.ImageName -query -test
echo Next version: <Build$ImageName>
\ No newline at end of file
diff --git a/Makefiles/StdTools b/Makefiles/StdTools
index f04c4b4..3ebe87f 100644
--- a/Makefiles/StdTools
+++ b/Makefiles/StdTools
@@ -41,13 +41,13 @@ ECHO = echo
FILTERCOMP = ${PERL} Build:FilterComp
FILTERCOMP2 = ${PERL} Build:FilterComp2
GETVERSION = ${PERL} Build:GetVersion
-HDR2H = perl Build:Hdr2H
+HDR2H = ${PERL} Build:Hdr2H
LD = link
MAKE = amu
MODGEN = modgen
MODSQZ = modsqz
NOP = @|
-PERL = ${DO} perl
+PERL = ${DO} <Perl$Dir>.perl
RESGEN = resgen
RM = remove
SETTYPE = settype
diff --git a/VersionNum b/VersionNum
index c45909d..a4d658b 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,23 +1,23 @@
-/* (4.72)
+/* (4.73)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
-#define Module_MajorVersion_CMHG 4.72
+#define Module_MajorVersion_CMHG 4.73
#define Module_MinorVersion_CMHG
-#define Module_Date_CMHG 10 May 2009
+#define Module_Date_CMHG 07 Jun 2009
-#define Module_MajorVersion "4.72"
-#define Module_Version 472
+#define Module_MajorVersion "4.73"
+#define Module_Version 473
#define Module_MinorVersion ""
-#define Module_Date "10 May 2009"
+#define Module_Date "07 Jun 2009"
-#define Module_ApplicationDate "10-May-09"
+#define Module_ApplicationDate "07-Jun-09"
#define Module_ComponentName "BuildSys"
#define Module_ComponentPath "castle/RiscOS/BuildSys"
-#define Module_FullVersion "4.72"
-#define Module_HelpVersion "4.72 (10 May 2009)"
-#define Module_LibraryVersionInfo "4:72"
+#define Module_FullVersion "4.73"
+#define Module_HelpVersion "4.73 (07 Jun 2009)"
+#define Module_LibraryVersionInfo "4:73"
--
GitLab