!Common,feb

@@ -63,7 +63,7 @@ set BASIC$Path     Build:
 Set Apps$Path      <Build$Dir>.Apps.
 Set Makefiles$Path <Build$Dir>.BuildSys.Makefiles.
 |
-set Src$Dir        <Build$Dir>.Sources
+|set Src$Dir        <Build$Dir>.Sources
 set Install$Dir    <Build$Dir>.Install
 
 | Locate the export directories and set the tool options
@@ -102,7 +102,7 @@ set CLIB$Path      <C$CLib>.
 set RISCOSLIB$Path <C$RISC_OSLib>.
 setmacro RISC_OSLib$Path <RISCOSLIB$Path>
 |
-set OSLibDef$Dir   <Src$Dir>.Lib.OSLib.def
+|set OSLibDef$Dir   <Src$Dir>.Lib.OSLib.def
 Set OSLib$Dir <Lib$Dir>.OSLib
 SetMacro OS1$Path <OSLib$Dir>.Core.,<OSLib$Dir>.Computer.,<OSLib$Dir>.User.,<OSLib$Dir>.Toolbox.
 SetMacro OS2$Path <OSLib$Dir>.Core.oslib.,<OSLib$Dir>.Computer.oslib.,<OSLib$Dir>.User.oslib.,<OSLib$Dir>.Toolbox.oslib.
@@ -135,13 +135,13 @@ SetMacro TranslateRes$Path        Translate.<UserIF>.<Locale>.,Translate.<UserIF
 |
 | Location of !Perl, !Builder & !EraseCVS.  Used by AutoBuild.
 |
-Filer_Boot Apps:!Builder
-Filer_Boot Apps:!EraseCVS
-IfThere Apps:!gcc2_95_4 then Filer_Run Apps:!gcc2_95_4
-Filer_Boot Apps:!Perl
+IfThere Apps:!Builder.!Boot   Then Filer_Run Apps:!Builder.!Boot  Else x IconSprites Apps:!Builder.!Sprites
+IfThere Apps:!EraseCVS.!Boot  Then Filer_Run Apps:!EraseCVS.!Boot Else x IconSprites Apps:!EraseCVS.!Sprites
+IfThere Apps:!Perl.!Boot      Then Filer_Run Apps:!Perl.!Boot     Else x IconSprites Apps:!Perl.!Sprites
+IfThere Apps:!gcc2_95_4       Then Filer_Run Apps:!gcc2_95_4
 |
 | Initialise UnixLib tools
 |
 Set UnixEnv$gawk$nonametrans 1
 |
-| End.
+| End.
\ No newline at end of file

!Common.sh

+# Common setup for build environment
+# Include from an Env file, with "RiscOS" as the current directory
+#
+
+[ "$MACHINE" != "" ] || { echo "No build selected - Run an Env file"; exit 1; }
+
+export BUILDDIR=`pwd`
+export TOOLSDIR=$BUILDDIR/Library
+
+export ROOL_BIN=/opt/rool/bin
+[ "$GCCSDK_INSTALL_CROSSBIN" != "" ] || export GCCSDK_INSTALL_CROSSBIN=/opt/gccsdk/cross/bin
+
+# Replace existing entries on PATH to prevent it growing indefinitely
+export PATH=$TOOLSDIR/Build:$TOOLSDIR/Misc:$ROOL_BIN:$GCCSDK_INSTALL_CROSSBIN:`echo -n $PATH | awk 'BEGIN{P="('$TOOLSDIR'|'$ROOL_BIN'|'$GCCSDK_INSTALL_CROSSBIN')";RS=":";ORS=":"}$0!~P' | sed 's/:$//'`
+
+export APPDIR=$BUILDDIR/Apps
+export MAKEFILEDIR=$BUILDDIR/BuildSys/GNUmakefiles
+#export SRCDIR=$BUILDDIR/Sources
+export INSTALLDIR=$BUILDDIR/Install
+
+if [ "$APCS" == "APCS-R" ]; then
+	TOOLOPTIONS="-26bit"
+	ASASM_TOOLOPTIONS="-apcs26 -apcsfpv2"
+	CMUNGE_TOOLOPTIONS="-26bit -apcs 3/26bit/fpe2"
+	GCC_TOOLOPTIONS="-mapcs-26 -march=armv2 -mfpu=fpe2"
+	NCC_TOOLOPTIONS="-APCS 3/26bit/fpe2"
+	OBJASM_TOOLOPTIONS="-APCS 3/26bit"
+elif [ "$APCS" == "APCS-32" ]; then
+	TOOLOPTIONS="-32bit"
+	ASASM_TOOLOPTIONS="-apcs32 -apcsfpv3"
+	CMUNGE_TOOLOPTIONS="-32bit -apcs 3/32bit/fpe3"
+	case "$MACHINE" in
+	'Archimedes')
+		GCC_TOOLOPTIONS="-march=armv2 -mfpu=fpe3"
+		NCC_TOOLOPTIONS="-APCS 3/32bit/fpe3 -memaccess -L22-S22+L41"
+		OBJASM_TOOLOPTIONS="-APCS 3/32bit"
+		;;
+	'Any32')
+		GCC_TOOLOPTIONS="-march=armv3 -mfpu=fpe3"
+		NCC_TOOLOPTIONS="-APCS 3/32bit/fpe3 -cpu 3 -memaccess -L22-S22-L41"
+		OBJASM_TOOLOPTIONS="-APCS 3/32bit -cpu 3"
+		;;
+	'32')
+		GCC_TOOLOPTIONS="-march=armv3 -mfpu=fpe3"
+		NCC_TOOLOPTIONS="-APCS 3/32bit/fpe3 -cpu 3 -memaccess -L22-S22+L41"
+		OBJASM_TOOLOPTIONS="-APCS 3/32bit -cpu 3"
+		;;
+	'Tungsten')
+		GCC_TOOLOPTIONS="-march=armv5te -mfpu=fpe3"
+		NCC_TOOLOPTIONS="-cpu 5TE -memaccess +L22+S22+L41"
+		OBJASM_TOOLOPTIONS="-APCS 3/32bit -cpu 5TE"
+		;;
+	'CortexA8')
+		GCC_TOOLOPTIONS="-march=armv6 -mfpu=fpe3"
+		NCC_TOOLOPTIONS="-APCS 3/32bit/fpe3 -cpu 6 -memaccess +L22+S22-L41"
+		OBJASM_TOOLOPTIONS="-APCS 3/32bit -cpu 5TEJ"
+		;;
+	'CortexA9')
+		GCC_TOOLOPTIONS="-march=armv6 -mfpu=fpe3"
+		NCC_TOOLOPTIONS="-APCS 3/32bit/fpe3 -cpu 6 -memaccess +L22+S22-L41"
+		OBJASM_TOOLOPTIONS="-APCS 3/32bit -cpu 5TEJ"
+		;;
+	*)
+		GCC_TOOLOPTIONS="-march=armv2 -mfpu=fpe3"
+		NCC_TOOLOPTIONS="-APCS 3/32bit/fpe3 -memaccess -L22-S22-L41"
+		OBJASM_TOOLOPTIONS="-APCS 3/32bit"
+		;;
+	esac
+fi
+export TOOLOPTIONS
+export ASASM_TOOLOPTIONS
+export CMUNGE_TOOLOPTIONS
+export GCC_TOOLOPTIONS
+export NCC_TOOLOPTIONS
+export OBJASM_TOOLOPTIONS
+
+export APCSEXPORTDIR=$BUILDDIR/Export/$APCS
+export HDRDIR=$APCSEXPORTDIR/Hdr
+export EXPORTDIR=$HDRDIR/Interface
+export GLOBALHDRDIR=$HDRDIR/Global
+export CEXPORTDIR=$APCSEXPORTDIR/C
+export LIBDIR=$APCSEXPORTDIR/Lib
+
+# This enables you to simply type "make all" from the command line
+alias make="make -I$MAKEFILEDIR --no-print-directory"

ROOL/Binaries,feb

@@ -23,6 +23,7 @@ set System     Ursula
 set UserIF     Iyonix
 set Display    PAL
 set ImageSize  4096K
+set HALSize    64K
 set Build      ROOL.Binaries
 set APCS       APCS-32
 Unset LocaleList

ROOL/Browse,feb

+| Copyright 2008 Castle Technology Ltd
+|
+| Licensed under the Apache License, Version 2.0 (the "License");
+| you may not use this file except in compliance with the License.
+| You may obtain a copy of the License at
+|
+|     http://www.apache.org/licenses/LICENSE-2.0
+|
+| Unless required by applicable law or agreed to in writing, software
+| distributed under the License is distributed on an "AS IS" BASIS,
+| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+| See the License for the specific language governing permissions and
+| limitations under the License.
+|
 | Browse/Phoenix web browser
 |
 set Locale     UK
@@ -9,6 +23,7 @@ set System     Ursula
 set UserIF     Iyonix
 set Display    PAL
 set ImageSize  4096K
+set HALSize    64K
 set Build      ROOL.Browse
 set APCS       APCS-32
 Unset LocaleList

ROOL/BuildEnv,feb

-| Shared Source Export Directory
+| Copyright 2008 Castle Technology Ltd
+|
+| Licensed under the Apache License, Version 2.0 (the "License");
+| you may not use this file except in compliance with the License.
+| You may obtain a copy of the License at
+|
+|     http://www.apache.org/licenses/LICENSE-2.0
+|
+| Unless required by applicable law or agreed to in writing, software
+| distributed under the License is distributed on an "AS IS" BASIS,
+| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+| See the License for the specific language governing permissions and
+| limitations under the License.
+|
+| Build environment
 |
 set Locale     UK
 set Keyboard   All
@@ -9,6 +23,7 @@ set System     Ursula
 set UserIF     Iyonix
 set Display    PAL
 set ImageSize  4096K
+set HALSize    64K
 set Build      ROOL.BuildEnv
 set APCS       APCS-32
 Unset LocaleList

ROOL/BuildHost,feb

+| Copyright 2008 Castle Technology Ltd
+|
+| Licensed under the Apache License, Version 2.0 (the "License");
+| you may not use this file except in compliance with the License.
+| You may obtain a copy of the License at
+|
+|     http://www.apache.org/licenses/LICENSE-2.0
+|
+| Unless required by applicable law or agreed to in writing, software
+| distributed under the License is distributed on an "AS IS" BASIS,
+| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+| See the License for the specific language governing permissions and
+| limitations under the License.
+|
 | Core parts of the build environment - executed by the host system
 |
 set Locale     UK
@@ -9,6 +23,7 @@ set System     Ursula
 set UserIF     Iyonix
 set Display    PAL
 set ImageSize  4096K
+set HALSize    64K
 set Build      ROOL.BuildHost
 set APCS       APCS-32
 Unset LocaleList

ROOL/CTools,feb

+| Copyright 2009 Castle Technology Ltd
+|
+| Licensed under the Apache License, Version 2.0 (the "License");
+| you may not use this file except in compliance with the License.
+| You may obtain a copy of the License at
+|
+|     http://www.apache.org/licenses/LICENSE-2.0
+|
+| Unless required by applicable law or agreed to in writing, software
+| distributed under the License is distributed on an "AS IS" BASIS,
+| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+| See the License for the specific language governing permissions and
+| limitations under the License.
+|
 | Core parts of the build environment - executed by the host system
 |
 set Locale     UK
@@ -9,6 +23,7 @@ set System     Ursula
 set UserIF     Iyonix
 set Display    PAL
 set ImageSize  4096K
+set HALSize    64K
 set Build      ROOL.CTools
 set APCS       APCS-32
 Unset LocaleList

ROOL/CTools.sh

+#!/bin/bash
+# Environment to build core parts of the build environment - executed by the host RISC OS system
+#
+# This can either be applied to the current shell using the "source" command,
+# or executed directly. In the latter case, you will want to describe a
+# a command to be executed by a subshell using the parameters to this script.
+# In either case, the working directory must be set to "RiscOS" on entry.
+
+export LOCALE=UK
+export KEYBOARD=All
+export MACHINE=All
+export SYSTEM=Ursula
+export USERIF=Iyonix
+export DISPLAYTYPE=PAL
+export IMAGESIZE=4096K
+export HALSIZE=64K
+export BUILD=ROOL/CTools
+export APCS=APCS-32
+
+. Env/!Common.sh
+
+[ -z "$@" ] || bash -c "$@"

ROOL/CrossTools.sh

+#!/bin/bash
+# Environment to build cross-compiling versions of the toolchain
+#
+# This can either be applied to the current shell using the "source" command,
+# or executed directly. In the latter case, you will want to describe a
+# a command to be executed by a subshell using the parameters to this script.
+# In either case, the working directory must be set to "RiscOS" on entry.
+
+export LOCALE=UK
+export KEYBOARD=All
+export MACHINE=All
+export SYSTEM=Ursula
+export USERIF=Iyonix
+export DISPLAYTYPE=PAL
+export IMAGESIZE=4096K
+export HALSIZE=64K
+export BUILD=ROOL/CrossTools
+export APCS=Host
+export TOOLCHAIN=GNU
+
+. Env/!Common.sh
+
+[ -z "$@" ] || bash -c "$@"

ROOL/Disc,feb

+| Copyright 2008 Castle Technology Ltd
+|
+| Licensed under the Apache License, Version 2.0 (the "License");
+| you may not use this file except in compliance with the License.
+| You may obtain a copy of the License at
+|
+|     http://www.apache.org/licenses/LICENSE-2.0
+|
+| Unless required by applicable law or agreed to in writing, software
+| distributed under the License is distributed on an "AS IS" BASIS,
+| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+| See the License for the specific language governing permissions and
+| limitations under the License.
+|
 | Main desktop disc image
 |
 set Locale     UK
@@ -9,6 +23,7 @@ set System     Ursula
 set UserIF     Iyonix
 set Display    PAL
 set ImageSize  4096K
+set HALSize    64K
 set Build      ROOL.Disc
 set APCS       APCS-32
 Unset LocaleList

ROOL/IOMD32,feb

@@ -20,9 +20,10 @@ set Keyboard   All
 set Machine    32
 | Software target
 set System     Ursula
-set UserIF     Iyonix
+set UserIF     Sovereign
 set Display    PAL
 set ImageSize  4096K
+set HALSize    64K
 set Build      ROOL.IOMD32
 set APCS       APCS-32
 Unset LocaleList

ROOL/OMAP3,feb

@@ -20,9 +20,10 @@ set Keyboard   All
 set Machine    CortexA8
 | Software target
 set System     Ursula
-set UserIF     Iyonix
+set UserIF     Sovereign
 set Display    PAL
 set ImageSize  4096K
+set HALSize    96K
 set Build      ROOL.OMAP3
 set APCS       APCS-32
 Unset LocaleList

ROOL/BatchTwo,feb → ROOL/OMAP4,feb

-| Copyright 2008 Castle Technology Ltd
+| Copyright 2011 Castle Technology Ltd
 |
 | Licensed under the Apache License, Version 2.0 (the "License");
 | you may not use this file except in compliance with the License.
@@ -12,18 +12,19 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-| Shared Source Export Directory
+| TI OMAP44xx board
 |
 set Locale     UK
 set Keyboard   All
 | Hardware target
-set Machine    All
+set Machine    CortexA9
 | Software target
 set System     Ursula
 set UserIF     Iyonix
 set Display    PAL
 set ImageSize  4096K
-set Build      ROOL.BatchTwo
+set HALSize    64K
+set Build      ROOL.OMAP4
 set APCS       APCS-32
 Unset LocaleList
 |

ROOL/PlingSystem,feb

+| Copyright 2012 Castle Technology Ltd
+|
+| Licensed under the Apache License, Version 2.0 (the "License");
+| you may not use this file except in compliance with the License.
+| You may obtain a copy of the License at
+|
+|     http://www.apache.org/licenses/LICENSE-2.0
+|
+| Unless required by applicable law or agreed to in writing, software
+| distributed under the License is distributed on an "AS IS" BASIS,
+| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+| See the License for the specific language governing permissions and
+| limitations under the License.
+|
+| !System and modules for pre RISC OS 5 users
+|
+set Locale     UK
+set Keyboard   All
+| Hardware target
+set Machine    Archimedes
+| Software target
+set System     Ursula
+set UserIF     Morris4
+set Display    PAL
+set ImageSize  4096K
+set HALSize    64K
+set Build      ROOL.PlingSystem
+set APCS       APCS-R
+Unset LocaleList
+|
+Obey <Obey$Dir>.^.!Common

ROOL/Printers,feb

+| Copyright 2008 Castle Technology Ltd
+|
+| Licensed under the Apache License, Version 2.0 (the "License");
+| you may not use this file except in compliance with the License.
+| You may obtain a copy of the License at
+|
+|     http://www.apache.org/licenses/LICENSE-2.0
+|
+| Unless required by applicable law or agreed to in writing, software
+| distributed under the License is distributed on an "AS IS" BASIS,
+| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+| See the License for the specific language governing permissions and
+| limitations under the License.
+|
 | 32 bit PopUp !Printers system
 |
 set Locale     UK
@@ -9,6 +23,7 @@ set System     Ursula
 set UserIF     Iyonix
 set Display    PAL
 set ImageSize  4096K
+set HALSize    64K
 set Build      ROOL.Printers
 set APCS       APCS-32
 Unset LocaleList

ROOL/BatchOne,feb → ROOL/S3C2440,feb

-| Copyright 2008 Castle Technology Ltd
+| Copyright 2011 Castle Technology Ltd
 |
 | Licensed under the Apache License, Version 2.0 (the "License");
 | you may not use this file except in compliance with the License.
@@ -12,18 +12,19 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-| Shared Source Export Directory
+| Mini2440 board
 |
 set Locale     UK
 set Keyboard   All
 | Hardware target
-set Machine    All
+set Machine    32
 | Software target
 set System     Ursula
 set UserIF     Iyonix
 set Display    PAL
 set ImageSize  4096K
-set Build      ROOL.BatchOne
+set HALSize    64K
+set Build      ROOL.S3C2440
 set APCS       APCS-32
 Unset LocaleList
 |

ROOL/BatchThree,feb → ROOL/S3C6410,feb

-| Copyright 2008 Castle Technology Ltd
+| Copyright 2011 Castle Technology Ltd
 |
 | Licensed under the Apache License, Version 2.0 (the "License");
 | you may not use this file except in compliance with the License.
@@ -12,18 +12,19 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-| Shared Source Export Directory
+| Mini2440 board
 |
 set Locale     UK
 set Keyboard   All
 | Hardware target
-set Machine    All
+set Machine    ARM11ZF
 | Software target
 set System     Ursula
 set UserIF     Iyonix
 set Display    PAL
 set ImageSize  4096K
-set Build      ROOL.BatchThree
+set HALSize    64K
+set Build      ROOL.S3C6410
 set APCS       APCS-32
 Unset LocaleList
 |

ROOL/Tungsten,feb

@@ -12,7 +12,7 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-| Shared Source Export Directory
+| For the Tungsten build
 |
 set Locale     UK
 set Keyboard   All
@@ -23,6 +23,7 @@ set System     Ursula
 set UserIF     Iyonix
 set Display    PAL
 set ImageSize  4096K
+set HALSize    64K
 set Build      ROOL.Tungsten
 set APCS       APCS-32
 Unset LocaleList

VersionNum

-/* (1.08)
+/* (1.16)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        1.08
+#define Module_MajorVersion_CMHG        1.16
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                26 Jun 2009
+#define Module_Date_CMHG                12 Jan 2012
 
-#define Module_MajorVersion             "1.08"
-#define Module_Version                  108
+#define Module_MajorVersion             "1.16"
+#define Module_Version                  116
 #define Module_MinorVersion             ""
-#define Module_Date                     "26 Jun 2009"
+#define Module_Date                     "12 Jan 2012"
 
-#define Module_ApplicationDate          "26-Jun-09"
+#define Module_ApplicationDate          "12-Jan-12"
 
 #define Module_ComponentName            "Env"
 #define Module_ComponentPath            "castle/RiscOS/Env"
 
-#define Module_FullVersion              "1.08"
-#define Module_HelpVersion              "1.08 (26 Jun 2009)"
-#define Module_LibraryVersionInfo       "1:8"
+#define Module_FullVersion              "1.16"
+#define Module_HelpVersion              "1.16 (12 Jan 2012)"
+#define Module_LibraryVersionInfo       "1:16"