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

Build more directories in stages 2 and 3.

Browse Source 
tools/bootcheck:
    Build the deep_profiler and mfilterjavac directories in stage 2.

    Build the slice, profiler, deep_profiler and mfilterjavac directories
    in stage 3. (We already used to build slice and profiler in stage 2.)

    Compare target language files in the stage 2 and stage 3 versions
    of the slice, profiler, deep_profiler and mfilterjavac directories,
    to make bootcheck a tougher test. This requires copying these directories
    to stage 3, instead of just linking them.

    Don't make dependencies in a directory if we had already done them
    earlier.

mfilterjavac/Mmakefile:
    Add targets for building C# and Java files.

slice/Mmakefile:
    Include the modules of the mcov and mtc_diff programs in the
    existing targets for building C, C# and Java files.

deep_profiler/Mmakefile:
profiler/Mmakefile:
    These makefiles already had targets for building C# and Java files.
    Fix grammar and/or indentation.

compiler/Mmakefile:
    Fix grammar and/or indentation.
This commit is contained in:
Zoltan Somogyi
2019-06-25 14:22:53 +02:00
parent 4b1a657cc3
commit 4bf9dd6ca3
6 changed files with 194 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mfilterjavac/Mmakefile
View File

@@ -1,5 +1,5 @@
#-----------------------------------------------------------------------------#
# vim: ts=8 sw=8 noexpandtab
# vim: ts=8 sw=8 noexpandtab ft=make
#-----------------------------------------------------------------------------#
# Copyright (C) 2013 The University of Melbourne.
# This file may only be copied under the terms of the GNU General
@@ -20,9 +20,9 @@ include $(MERCURY_DIR)/Mmake.common
# create a missing optional params file.
Mmake.mfilterjavac.params:
# Module-specific options should go in Mercury.options so they
# can be found by `mmc --make'. But this hasn't been used in this directory
# so it's commented out.
# Module-specific options should go in Mercury.options so they can be found
# by `mmc --make'. But this hasn't been used in this directory so far,
# so it is commented out.
# include Mercury.options
MAIN_TARGET = all
@@ -78,7 +78,7 @@ mfilterjavac: $(RUNTIME_DIR)/lib$(RT_LIB_NAME).$A
mfilterjavac: $(LIBRARY_DIR)/lib$(STD_LIB_NAME).$A
endif
$(cs_subdir)mfilterjavac.c: $(UTIL_DIR)/mkinit$(EXT_FOR_EXE)
$(cs_subdir)mfilterjavac.c: $(UTIL_DIR)/mkinit$(EXT_FOR_EXE)
#-----------------------------------------------------------------------------#
@@ -121,9 +121,11 @@ dates:
#-----------------------------------------------------------------------------#
.PHONY: os cs
.PHONY: os cs css javas
os: $(mfilterjavac.os) $(os_subdir)mfilterjavac_init.o
cs: $(mfilterjavac.cs) $(cs_subdir)mfilterjavac_init.c
css: $(mfilterjavac.css)
javas: $(mfilterjavac.javas)
#-----------------------------------------------------------------------------#
@@ -133,7 +135,7 @@ realclean_local:
#-----------------------------------------------------------------------------#
# Installation target
# Installation target.
# See the comment above the 'install_compiler' target in compiler/Mmakefile
# for the reasons why we handle the java grade specially here.