[m-rev.] for review: fix problems with --search-lib-files-dir

[Julien Fischer]

On Tue, 28 Nov 2006, Peter Wang wrote:

> Estimated hours taken: 4
> Branches: main
>
> Fix problems with the `--search-library-files-directory <dir>' option
> implementation:
>
> - It did not work with the high level C backend because it did not add
>  `<dir>/Mercury/mihs' or `<dir>/Mercury/<grade>/<fullarch>/Mercury/mihs' to
>  be searched for `.mih' files.
>
> - It did not work with intermodule optimisation and --use-grade-subdirs
>  because it did not add grade-dependent directories to be searched for
>  `.opt' and `.trans_opt' files.
>
> Also, it relied on <dir> to contain (symlinks to) libraries of the correct
> grade.  When using --use-grade-subdirs, we now search for libraries in the
> grade-dependent subdirectory under `<dir>/Mercury'.
> To simplify things, we place both static and shared libraries into
> `<dir>/Mercury/<grade>/<fullarch>/Mercury/lib' instead of separate
> `<dir>/Mercury/<grade>/<fullarch>/Mercury/<ext>s' directories.
>
>
> compiler/handle_options.m:
> compiler/options.m:
> 	Make the changes above.
>
> 	Mark a couple of spots which will need to be updated for
> 	grade-dependent `.init' files.
>
> doc/user_guide.texi:
> 	Update documentation for `--search-library-files-directory'.

...

> Index: doc/user_guide.texi
> ===================================================================
> RCS file: /home/mercury/mercury1/repository/mercury/doc/user_guide.texi,v
> retrieving revision 1.499
> diff -u -r1.499 user_guide.texi
> --- doc/user_guide.texi	24 Nov 2006 03:48:15 -0000	1.499
> +++ doc/user_guide.texi	28 Nov 2006 00:25:04 -0000
> @@ -8475,10 +8475,13 @@
> @findex --search-library-files-directory
> @cindex Directories for libraries
> @cindex Search path for libraries
> -Equivalent to adding @var{directory} using all of the
> +Search @var{directory} for uninstalled Mercury library files.

uninstalled suggest that they were installed and then were ...
well uninstalled.  I would say:

 	Search @var{directory} for Mercury library files that
 	have not yet been installed.

> +Similar to adding @var{directory} using all of the

Is it similar or equivalent?

> @samp{--search-directory}, @samp{--intermod-directory},
> @samp{--library-directory}, @samp{--init-file-directory} and
> - at samp{--c-include-directory} options.
> + at samp{--c-include-directory} options, but
> +does the right thing when @samp{--use-subdirs} or
> + at samp{--use-grade-subdirs} options are used.

The rest looks fine.

Julien.
--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------