[m-rev.] for review: stengthen libgrade detection for C# and Java grades

[Julien Fischer]

On Sun, 22 Jul 2018, Peter Wang wrote:

> On Thu, 19 Jul 2018 22:34:29 -0400 (EDT), Julien Fischer <jfischer at opturion.com> wrote:

>> +:- pred do_detect_libgrade_using_lib_file(bool::in, string::in, string::in,
>> +    io.file_type::in, bool::out, list(string)::in, list(string)::out,
>> +    io::di, io::uo) is det.
>> +
>> +do_detect_libgrade_using_lib_file(VeryVerbose, DirName, GradeFileName,
>> +        GradeFileType, Continue, !GradeOpts, !IO) :-
>> +    (
>> +        GradeFileType = directory,
>>           ( if
>> -            % We do not generate .init files for the Java and C# grades so just
>> -            % check for directories in StdLibDir / "modules" containing
>> -            % the name of their base grade.
>> -            % XXX we should check for the presence of mer_std.{dll,jar}
>> -            % instead.
>> -            %
>> -            ( string.prefix(FileName, "csharp")
>> -            ; string.prefix(FileName, "java")
>> -            )
>> +            csharp_or_java_libgrade_target(GradeFileName, LibFile),
>> +            TargetFile = DirName / GradeFileName / LibFile
>
> Could move this line into the then branch.

Done.

Julien.