[m-rev.] for review: make `--use-subdirs' the default

[Simon Taylor]

Estimated hours taken: 1.5
Branches: main

compiler/options.m:
scripts/mmake.in:
	Make `--use-subdirs' the default.

NEWS:
doc/user_guide.texi:
	Document the change.

Index: NEWS
===================================================================
RCS file: /home/mercury1/repository/mercury/NEWS,v
retrieving revision 1.257
diff -u -u -r1.257 NEWS
--- NEWS	13 May 2002 03:19:43 -0000	1.257
+++ NEWS	17 May 2002 08:04:47 -0000
@@ -16,6 +16,7 @@
 * A new optional warning: `--warn-non-tail-recursion'.
 * A new optimization: `--constraint-propagation'.
 * Support for arbitrary mappings from module name to source file name. 
+* `--use-subdirs' is now the default.
 
 Major improvements to the Mercury debugger, including:
 * Support for source-linked debugging using vim (rather than emacs).
@@ -264,6 +265,10 @@
   dependencies the command `mmc -f SOURCES' must be run, where `SOURCES'
   is a list of the names of all of the source files.  If the names of the
   source files all match the contained module names, `mmc -f' need not be run.
+
+* `--use-subdirs' is now the default.  With `--use-subdirs', intermediate
+  files are generated in a `Mercury' subdirectory to avoid cluttering up
+  the user's source directory.
 
 * We've added a new compiler option `--warn-non-tail-recursion', which
   causes the compiler to issue a warning about any directly recursive
Index: compiler/options.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/options.m,v
retrieving revision 1.372
diff -u -u -r1.372 options.m
--- compiler/options.m	13 May 2002 18:22:25 -0000	1.372
+++ compiler/options.m	16 May 2002 15:19:35 -0000
@@ -1080,7 +1080,7 @@
 	libgrades		-	accumulating([]),
 	options_files		-	accumulating(["Mercury.options"]),
 	options_search_directories -	accumulating(["."]),
-	use_subdirs		-	bool(no),
+	use_subdirs		-	bool(yes),
 	search_directories 	-	accumulating(["."]),
 	intermod_directories	-	accumulating([]),
 	use_search_directories_for_intermod
@@ -3428,9 +3428,9 @@
 		"\tDon't add arguments to `--search-directory' to the list",
 		"\tof directories to search for `.opt' files - use only the",
 		"\tdirectories given by `--intermod-directory'.",
-		"--use-subdirs",
-		"\tGenerate intermediate files in a `Mercury' subdirectory,",
-		"\trather than generating them in the current directory."
+		"--no-use-subdirs",
+		"\tGenerate intermediate files in the current directory,",
+		"\trather than then in a `Mercury' subdirectory."
 	]).
 
 :- pred options_help_misc(io__state::di, io__state::uo) is det.
Index: doc/user_guide.texi
===================================================================
RCS file: /home/mercury1/repository/mercury/doc/user_guide.texi,v
retrieving revision 1.311
diff -u -u -r1.311 user_guide.texi
--- doc/user_guide.texi	13 May 2002 18:22:33 -0000	1.311
+++ doc/user_guide.texi	17 May 2002 09:04:52 -0000
@@ -157,12 +157,8 @@
 
 The Mercury implementation uses a variety of intermediate files, which
 are described below.  But all you really need to know is how to name
-source files.  For historical reasons, the default behaviour is for
-intermediate files to be created in the current directory, but if you
-use the @samp{--use-subdirs} option to @samp{mmc} or @samp{mmake}, all
- at findex --use-subdirs
-these intermediate files will be created in a @file{Mercury}
-subdirectory, where you can happily ignore them.
+source files.  All of these intermediate files will be created in a
+ at file{Mercury} subdirectory, where you can happily ignore them.
 Thus you may wish to skip the rest of this chapter.
 
 In cases where the source file name and module name don't match,
@@ -5696,14 +5692,14 @@
 Append the arguments of all -I options to the list of directories
 to be searched for @samp{.opt} files.
 
- at item --use-subdirs
- at findex --use-subdirs
+ at item --no-use-subdirs
+ at findex --no-use-subdirs
 @cindex File names
 @cindex Directories
 @cindex Subdirectories
 @cindex @file{Mercury} subdirectory
-Create intermediate files in a @file{Mercury} subdirectory,
-rather than in the current directory.
+Create intermediate files in the current directory,
+rather than in a @file{Mercury} subdirectory,
 
 @end table
 
Index: scripts/mmake.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/mmake.in,v
retrieving revision 1.41
diff -u -u -r1.41 mmake.in
--- scripts/mmake.in	16 May 2002 06:48:43 -0000	1.41
+++ scripts/mmake.in	17 May 2002 08:47:07 -0000
@@ -22,11 +22,9 @@
 	--use-mmc-make:
 		Use \`mmc --make' to build Mercury targets.
 		Implies \`--use-subdirs'.
-	--use-subdirs:
-		Build intermediate files in a \`Mercury' subdirectory,
-		rather than in the current directory.
-		(If the current directory already contains a \`Mercury'
-		subdirectory, then this option is the default.)
+	--no-use-subdirs:
+		Build intermediate files in the current directory
+		rather than in a \`Mercury' subdirectory,
 	--target asm:
 		Compile directly to assembler, rather than going via C.
 	--target c:
@@ -81,11 +79,7 @@
 include_makefile=
 verbose=false
 save_makefile=false
-if [ -d Mercury ]; then
-	use_subdirs=${MMAKE_USE_SUBDIRS=yes}
-else
-	use_subdirs=${MMAKE_USE_SUBDIRS=no}
-fi
+use_subdirs=${MMAKE_USE_SUBDIRS=yes}
 use_mmc_make=${MMAKE_USE_MMC_MAKE=no}
 warn_undefined_vars=true
 target_asm=${MMAKE_TARGET_ASM=default}
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------