[m-rev.] diff: fix Aditi with --use-subdirs

[Simon Taylor]

Estimated hours taken: 0.2
Branches: main

The Aditi query shell does not know about --use-subdirs,
so put all the files it uses in the current directory.

compiler/modules.m:
	Put `.rlo', `.base_schema' and `.derived_schema' files
	in the current directory.

scripts/Mmake.vars.in:
	Set $(rlos_subdir) to the empty string, even with --use-subdirs.

compiler/rl_out.pp:
	Create the directory when creating the `.derived_schema' file.
	This isn't necessary any more, but will be needed if we ever
	go back to putting the `.derived_schema' file in a sub-directory.


Index: compiler/modules.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/modules.m,v
retrieving revision 1.187
diff -u -u -r1.187 modules.m
--- compiler/modules.m	2001/08/01 09:50:58	1.187
+++ compiler/modules.m	2001/08/06 11:43:42
@@ -776,6 +776,11 @@
 			% requires .h.tmp files to be in the same directory as
 			% the .h files
 			; Ext = ".h.tmp"
+			% The following files are only used by the Aditi
+			% query shell which doesn't know about --use-subdirs.
+			; Ext = ".base_schema"
+			; Ext = ".derived_schema"
+			; Ext = ".rlo"
 			)
 		;
 			% output files intended for use by the user
Index: compiler/rl_out.pp
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/rl_out.pp,v
retrieving revision 1.15
diff -u -u -r1.15 rl_out.pp
--- compiler/rl_out.pp	2001/01/04 05:23:48	1.15
+++ compiler/rl_out.pp	2001/08/06 12:53:31
@@ -1,5 +1,5 @@
 %-----------------------------------------------------------------------------%
-% Copyright (C) 1998-2000 University of Melbourne.
+% Copyright (C) 1998-2001 University of Melbourne.
 % This file may only be copied under the terms of the GNU General
 % Public License - see the file COPYING in the Mercury distribution.
 %-----------------------------------------------------------------------------%
@@ -312,7 +312,7 @@
 	globals__io_lookup_bool_option(generate_schemas, GenSchemas),
 	( { GenSchemas = yes } ->
 		module_name_to_file_name(ModuleName0, ".derived_schema",
-			no, SchemaFileName),
+			yes, SchemaFileName),
 		io__open_output(SchemaFileName, SchemaResult),
 		( { SchemaResult = ok(SchemaStream) } ->
 			io__set_output_stream(SchemaStream, OldStream),
Index: scripts//Mmake.vars.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/Mmake.vars.in,v
retrieving revision 1.54
diff -u -u -r1.54 Mmake.vars.in
--- scripts//Mmake.vars.in	2001/08/03 12:30:53	1.54
+++ scripts//Mmake.vars.in	2001/08/06 11:43:06
@@ -438,7 +438,7 @@
 ss_subdir=$(SUBDIR)ss/
 pic_ss_subdir=$(SUBDIR)pic_ss/
 os_subdir=$(SUBDIR)os/
-rlos_subdir=$(SUBDIR)rlos/
+rlos_subdir=
 ils_subdir=$(SUBDIR)ils/
 dirs_subdir=$(SUBDIR)dirs/
 c_dates_subdir=$(SUBDIR)c_dates/
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------