[m-rev.] for review: changes to mmake and bootcheck

[Julien Fischer]

On Mon, 24 Jun 2019, Zoltan Somogyi wrote:

> On Tue, 18 Jun 2019 12:40:20 +0200 (CEST), "Zoltan Somogyi" <zoltan.somogyi at runbox.com> wrote:
>> For bootcheck, my question is not really about the diff, but whether we should
>> build the slice, profiler, deep_profiler and mfilterjavac directories in stage 3?
>> At the moment, we do not, so we do not compare them to stage 2. I think
>> we (I) should fix this. Any objections?
>
> The attached diff extends bootcheck along the lines mentioned above.


> Build more directories in stages 2 and 3.
> 
> 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 bootcheck a tougher test. This requires copying these directories

to make bootcheck

>     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.
> 
> diff --git a/compiler/Mmakefile b/compiler/Mmakefile
> index 98b602806..578f31003 100644
> --- a/compiler/Mmakefile
> +++ b/compiler/Mmakefile


> diff --git a/mfilterjavac/Mmakefile b/mfilterjavac/Mmakefile
> index 5e7e6369d..87a52691c 100644
> --- a/mfilterjavac/Mmakefile
> +++ b/mfilterjavac/Mmakefile

...

> @@ -121,9 +121,12 @@ dates:
>
>  #-----------------------------------------------------------------------------#
> 
> -.PHONY: os cs
> +# XXX Should css and javas build any init files?

No, the Java and C# backends do not use init files.

> +.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)
>
>  #-----------------------------------------------------------------------------#

The rest looks fine.

Julien.