mercurylang/mercury
1
0
Fork 0
mirror of https://github.com/Mercury-Language/mercury.git synced 2026-04-15 01:13:30 +00:00
Code Issues Projects Releases Wiki Activity

Put .mh files into Mercury/mhs subdirectory.

Browse Source 
Put .mh files into a Mercury/mhs subdirectory when --use-subdirs
or --use-grade-subdirs is used.

compiler/file_names.m:
    Replace ext_cur_mh with ext_cur_ngs_max_cur_mh, in the new category
    ext_cur_ngs_max_cur. The new category is similar to that for .mih
    files, except that .mh files are never placed in grade-specific
    subdirectories.

compiler/handle_options.m:
    Add Mercury/mhs subdirs to list of C include directories
    when --use-subdirs or --use-grade-subdirs is in effect.

compiler/write_deps_file.m:
    Add $(mhs_subdir) prefix before %.mh patterns.

    Create a Mercury/mhs -> .. symlink when installing.
    This is required by mmc --make and mmake --use-subdirs.

    Conform to the changes above.

compiler/export.m:
compiler/make.file_names.m:
compiler/make.program_target.m:
compiler/mercury_compile_llds_back_end.m:
compiler/mlds_to_c_file.m:
    Conform to the changes above.

scripts/Mmake.vars.in:
    Define the variable mhs_subdir.

scripts/Mmake.rules:
    Add -I option to find .mh files when --use-subdirs is used.

browser/.mgnuc_copts:
browser/MDB_FLAGS.in:
compiler/.mgnuc_copts:
compiler/COMP_FLAGS.in:
deep_profiler/.mgnuc_copts:
deep_profiler/DEEP_FLAGS.in:
extras/EXTRAS_FLAGS.in:
grade_lib/.mgnuc_copts:
grade_lib/GRADE_LIB_FLAGS.in:
library/.mgnuc_copts:
mdbcomp/.mgnuc_copts:
mdbcomp/MDBCOMP_FLAGS.in:
mfilterjavac/.mgnuc_copts:
mfilterjavac/MFILTERJAVAC_FLAGS.in:
profiler/.mgnuc_copts:
profiler/PROF_FLAGS.in:
slice/.mgnuc_copts:
slice/SLICE_FLAGS.in:
ssdb/.mgnuc_copts:
ssdb/SSDB_FLAGS.in:
tests/.mgnuc_copts.ws:
tests/WS_FLAGS.ws:
trace/.mgnuc_copts:
tools/lmc.in:
    Add -I options to find .mh files when the workspace is built
    with mmake --use-subdirs.

samples/c_interface/standalone_c/Makefile:
    Add option to let the C compiler find the .mh file.

NEWS.md:
    Announce change.

    Delete trailing whitespace.
This commit is contained in:
Peter Wang
2024-07-23 17:44:17 +10:00
parent f7fc1f6e9f
commit 35e76e41e2
36 changed files with 176 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mfilterjavac/.mgnuc_copts
View File

@@ -2,11 +2,15 @@
-I../boehm_gc/include
-I../runtime
-I../library
-I../library/Mercury/mhs
-I../library/Mercury/mihs
-I../mdbcomp
-I../mdbcomp/Mercury/mhs
-I../mdbcomp/Mercury/mihs
-I../browser
-I../browser/Mercury/mhs
-I../browser/Mercury/mihs
-I../ssdb
-I../ssdb/Mercury/mhs
-I../ssdb/Mercury/mihs
-I../trace

3
mfilterjavac/MFILTERJAVAC_FLAGS.in
View File

@@ -22,10 +22,13 @@
--c-include-directory ../boehm_gc/include
--c-include-directory ../runtime
--c-include-directory ../library
--c-include-directory ../library/Mercury/mhs
--c-include-directory ../library/Mercury/mihs
--c-include-directory ../browser
--c-include-directory ../browser/Mercury/mhs
--c-include-directory ../browser/Mercury/mihs
--c-include-directory ../ssdb
--c-include-directory ../ssdb/Mercury/mhs
--c-include-directory ../ssdb/Mercury/mihs
--c-include-directory ../trace
--csharp-flag -keyfile:../mercury.snk