[m-rev.] For review: bug fix for generating .dv file in grade Java

James Goddard goddardjames at yahoo.com
Thu Feb 12 18:55:08 AEDT 2004


Estimated hours taken: 1
Branches: main

Bug fix for building dv file in grade Java.

compiler/modules.m:
	Fix a bug in generate_dv_file/6 where pattern matching was being
	used incorrectly to list .class files of inner modules in Java.


diff -u modules.m modules.m
--- modules.m	12 Feb 2004 04:36:44 -0000
+++ modules.m	12 Feb 2004 07:49:13 -0000
@@ -4408,9 +4408,12 @@
 	% within the original .java file.  The filenames of all
 	% these can be matched with `module\$*.class', hence the
 	% "\\$$*.class" below.
+	% If none such files exist, GNU Make will use the pattern verbatim,
+	% so we enclose the pattern in a `wildcard' function to prevent this.
+	io__write_string(DepStream, "$(wildcard "),
 	write_compact_dependencies_list(Modules, "$(classes_subdir)",
 					"\\$$*.class", Basis, DepStream),
-	io__write_string(DepStream, "\n"),
+	io__write_string(DepStream, ")\n"),
 
 	io__write_string(DepStream, MakeVarName),
 	io__write_string(DepStream, ".dirs = "),
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------



More information about the reviews mailing list