Merge

Un-hardwired an interim location for the system definition. Removed a target that is over-ridden in both the platform and package specific files.

Added output of the package definition incorporated for each package.

Added some diagnostic output when the system definition is built from the sources.csv file.

Commented out clean and tools targets. Changed tool2 target into tools2_rel

Removed commented & obsolete code.

Changed preference for selecting package definition files, so that it takes the one from our tree in preference to the one in the package itself. This means that we can just delete items from our tree when we're happy to switch to using the one in the package (as this will vary from package to package). Added sorting of the attributes when outputting the system definition, to match the de facto standard in the system definition we started with.

Add new raptor error category to raptor parser (tool_didnt_return_version)

Set project name and codeline from subproject only if these properties are not found in project's job_props.ant.xml

Merge

Fix again releaseables dir not existing as erroronmissing dir is not supported

If a package does not have a definition in the sources.csv then it won't get built, so don't try to incorporate it into the system definition.

Avoid build failure if releaseable dir is not present

Made error messages more useful.

Should fail the build if we can't generate the system model.

Fixed paths and drives for executing script.