GitLab

Utilise Install_Log command (from Installer-0_18) to log the source directory
for a Merge. If the command does not exist, it does not give error.

During testing of the above change, a bug in the !Font merge process
was found that can cause it to put merged fonts in totally the wrong place.

The function static_ReadVariables() in Main.c, if APP=FONTMERGE, uses the
value of Font$Path to set Destination (the merge target) from the third path
element from the end, which assumes it is the system !Fonts.

However, if a
    *FontInstall mydirectory.
was done before the *FontInstall in BootResources:!Fonts, then Font$Path will
be set to 4 elements, eg:
    ADFS::SSD.$.!BOOT.Resources.!Fonts.,
    mydirectory.,
    <Font$Prefix>.,
    Resources:$.Fonts.
so any new fonts wrongly go into mydirectory.

The fix now finds the first directory seen which ends in ".!Fonts.", which is
the LAST one in the path string. This is better, though not totally foolproof.

Version 2.12. Tagged as 'Config2PluginxxxxMerge-2_12'

Intercept merges destined for !Boot.Choices and replace the destination path
with one derived from Choices$Dir. In the default case this is a no-op, but if
Choices are relocated to a !Choices app we want to retarget those.

Version 2.10. Tagged as 'Config2PluginxxxxMerge-2_10'

Too many arguments harmlessly passed to _swix.
Submission from Willi Theiss.

Version 2.08. Tagged as 'xxxxMerge-2_08'

Detail:
  c/Merge - for operation_merge, check whether there was an error before trying to look up the error number
Admin:
  Tested on BB-xM with high processor vectors


Version 2.06. Tagged as 'xxxxMerge-2_06'

Makefile tweaks
As featured on disc image accompanying RISC OS 5.00

Version 2.02. Tagged as 'xxxxMerge-2_02'

Bugfix: if the user clicked Agenda then Merge, the log directory wasn't being unset after the operation was complete. (Simple Merge operations were not affected.)

Initial import of Configure plug-ins '!BootMerge', '!FontMerge' and '!SysMerge' to CVS, this time in the correct place.

Note that !BootMerge and !FontMerge plug in to !BootSetup and !FontSetup
respectively, and all three plug-ins share the same source code.