Commit d8dc5b93 authored by Timothy E Baldwin's avatar Timothy E Baldwin Committed by ROOL
Browse files

Fix InstallTools race (mostly)

Obey$Dir can change during a Obey file run in a Taskwindow,
in particular writing to the output stream can trigger the
loading of a Taskwindow server such as !Edit.
parent 853541f9
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
| See the License for the specific language governing permissions and | See the License for the specific language governing permissions and
| limitations under the License. | limitations under the License.
| |
Set Build$LibDir <Obey$Dir>
Echo This script will take the main build tools from a current copy of the Acorn Echo This script will take the main build tools from a current copy of the Acorn
Echo C/C++ tools suite (as installed from CD) and install the main tools into the Echo C/C++ tools suite (as installed from CD) and install the main tools into the
Echo Shared Source RISC OS build directory so that you can build Shared Source RISC Echo Shared Source RISC OS build directory so that you can build Shared Source RISC
...@@ -19,7 +21,7 @@ Echo OS components. ...@@ -19,7 +21,7 @@ Echo OS components.
Echo Echo
Echo Checking environment... Echo Checking environment...
IfThere <Obey$Dir>.Acorn Then Else Error This script must be run from within the Shared Source RISC OS 'Library' directory. IfThere <Build$LibDir>.Acorn Then Else Error This script must be run from within the Shared Source RISC OS 'Library' directory.
Echo Echo
Echo Checking that the AcornC/C++ directory has been 'seen' by the filer... Echo Checking that the AcornC/C++ directory has been 'seen' by the filer...
...@@ -27,56 +29,56 @@ If "<SetPaths32$Dir>" = "" Then Error Please make sure you have run the AcornC/C ...@@ -27,56 +29,56 @@ If "<SetPaths32$Dir>" = "" Then Error Please make sure you have run the AcornC/C
Echo Echo
Echo Installing Acorn Make Utility... Echo Installing Acorn Make Utility...
Copy <SetPaths32$Dir>.Lib32.amu <Obey$Dir>.Acorn.amu A~C~D~FLN~P~Q~R~S~T~V Copy <SetPaths32$Dir>.Lib32.amu <Build$LibDir>.Acorn.amu A~C~D~FLN~P~Q~R~S~T~V
Echo Echo
Echo Installing C++... Echo Installing C++...
Copy <SetPaths32$Dir>.Lib32.c++ <Obey$Dir>.Acorn.c++ A~C~D~FLN~P~Q~R~S~T~V Copy <SetPaths32$Dir>.Lib32.c++ <Build$LibDir>.Acorn.c++ A~C~D~FLN~P~Q~R~S~T~V
Echo Echo
Echo Installing the C Compiler... Echo Installing the C Compiler...
Copy <SetPaths32$Dir>.Lib32.cc <Obey$Dir>.Acorn.cc A~C~D~FLN~P~Q~R~S~T~V Copy <SetPaths32$Dir>.Lib32.cc <Build$LibDir>.Acorn.cc A~C~D~FLN~P~Q~R~S~T~V
Echo Echo
Echo Installing C Front... Echo Installing C Front...
Copy <SetPaths32$Dir>.Lib32.cfront <Obey$Dir>.Acorn.cfront A~C~D~FLN~P~Q~R~S~T~V Copy <SetPaths32$Dir>.Lib32.cfront <Build$LibDir>.Acorn.cfront A~C~D~FLN~P~Q~R~S~T~V
Echo Echo
Echo Installing the C Module Header Generator... Echo Installing the C Module Header Generator...
Copy <SetPaths32$Dir>.Lib32.cmhg <Obey$Dir>.Acorn.cmhg A~C~D~FLN~P~Q~R~S~T~V Copy <SetPaths32$Dir>.Lib32.cmhg <Build$LibDir>.Acorn.cmhg A~C~D~FLN~P~Q~R~S~T~V
Echo Echo
Echo Installing the Acorn Object File Decoder... Echo Installing the Acorn Object File Decoder...
Copy <SetPaths32$Dir>.Lib32.decaof <Obey$Dir>.Acorn.decaof A~C~D~FLN~P~Q~R~S~T~V Copy <SetPaths32$Dir>.Lib32.decaof <Build$LibDir>.Acorn.decaof A~C~D~FLN~P~Q~R~S~T~V
Echo Echo
Echo Installing the Library File Processor... Echo Installing the Library File Processor...
Copy <SetPaths32$Dir>.Lib32.libfile <Obey$Dir>.Acorn.libfile A~C~D~FLN~P~Q~R~S~T~V Copy <SetPaths32$Dir>.Lib32.libfile <Build$LibDir>.Acorn.libfile A~C~D~FLN~P~Q~R~S~T~V
Echo Echo
Echo Installing the Linker... Echo Installing the Linker...
Copy <SetPaths32$Dir>.Lib32.link <Obey$Dir>.Acorn.link A~C~D~FLN~P~Q~R~S~T~V Copy <SetPaths32$Dir>.Lib32.link <Build$LibDir>.Acorn.link A~C~D~FLN~P~Q~R~S~T~V
Echo Echo
Echo Installing the Object Assembler... Echo Installing the Object Assembler...
Copy <SetPaths32$Dir>.Lib32.objasm <Obey$Dir>.Acorn.objasm A~C~D~FLN~P~Q~R~S~T~V Copy <SetPaths32$Dir>.Lib32.objasm <Build$LibDir>.Acorn.objasm A~C~D~FLN~P~Q~R~S~T~V
Echo Echo
Echo Installing the Object File Statistics Tool... Echo Installing the Object File Statistics Tool...
Copy <SetPaths32$Dir>.Lib32.objsize <Obey$Dir>.Acorn.objsize A~C~D~FLN~P~Q~R~S~T~V Copy <SetPaths32$Dir>.Lib32.objsize <Build$LibDir>.Acorn.objsize A~C~D~FLN~P~Q~R~S~T~V
Echo Echo
Echo Installing the Resource Area Generator... Echo Installing the Resource Area Generator...
Copy <SetPaths32$Dir>.Lib32.ResGen <Obey$Dir>.Acorn.ResGen A~C~D~FLN~P~Q~R~S~T~V Copy <SetPaths32$Dir>.Lib32.ResGen <Build$LibDir>.Acorn.ResGen A~C~D~FLN~P~Q~R~S~T~V
Echo Echo
Echo Installing the pre-built C++ libraries... Echo Installing the pre-built C++ libraries...
CDir <Obey$Dir>.^.Export CDir <Build$LibDir>.^.Export
CDir <Obey$Dir>.^.Export.APCS-32 CDir <Build$LibDir>.^.Export.APCS-32
CDir <Obey$Dir>.^.Export.APCS-32.Lib CDir <Build$LibDir>.^.Export.APCS-32.Lib
Set C++Lib$Dir <SetPaths32$Dir>.^.Libraries.c++lib Set C++Lib$Dir <SetPaths32$Dir>.^.Libraries.c++lib
IfThere <C++Lib$Dir> Then Else Set C++Lib$Dir <SetPaths32$Dir>.^.Export.APCS-32.Lib.c++lib IfThere <C++Lib$Dir> Then Else Set C++Lib$Dir <SetPaths32$Dir>.^.Export.APCS-32.Lib.c++lib
Copy <C++Lib$Dir> <Obey$Dir>.^.Export.APCS-32.Lib.c++lib A~C~D~FLN~P~QR~S~T~V Copy <C++Lib$Dir> <Build$LibDir>.^.Export.APCS-32.Lib.c++lib A~C~D~FLN~P~QR~S~T~V
Unset C++Lib$Dir Unset C++Lib$Dir
Echo Echo
......
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