[m-rev.] diff: remove support for non-grade specific .init files

[Julien Fischer]

I'll commit this one next week.

Estimated hours taken: 0.5
Branches: main

Remove support for non-grade specific .init files.

browser/Mmakefile:
runtime/Mmakefile:
scripts/Mmake.rules:
compiler/make.program_target.m:
 	Don't install the .init files in a non-grade specific location.

Julien.

Index: browser/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/browser/Mmakefile,v
retrieving revision 1.49
diff -u -r1.49 Mmakefile
--- browser/Mmakefile	23 Nov 2006 04:08:54 -0000	1.49
+++ browser/Mmakefile	30 Nov 2006 14:33:28 -0000
@@ -269,7 +269,6 @@
  .PHONY: install
  install: install_library

-# XXX Trace goal fix.
  .PHONY: install_dirs
  install_dirs:
  	[ -d $(INSTALL_MODULE_DIR) ] || mkdir -p $(INSTALL_MODULE_DIR)
@@ -289,10 +288,8 @@

  else

-# XXX Trace goal fix.
  .PHONY: install_init
  install_init: $(BROWSER_LIB_NAME).init install_dirs
-	cp `vpath_find $(BROWSER_LIB_NAME).init` $(INSTALL_MODULE_DIR)
  	cp `vpath_find $(BROWSER_LIB_NAME).init` $(INSTALL_GRADE_MODULE_DIR)

  .PHONY: install_library
Index: compiler/make.program_target.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/make.program_target.m,v
retrieving revision 1.60
diff -u -r1.60 make.program_target.m
--- compiler/make.program_target.m	23 Nov 2006 06:10:48 -0000	1.60
+++ compiler/make.program_target.m	30 Nov 2006 14:41:28 -0000
@@ -806,14 +806,6 @@
          DepsSuccess = yes,
          DirSucceeded = yes
      ->
-        globals.io_lookup_string_option(install_prefix, Prefix, !IO),
-
-        % XXX Trace goal fix.
-        ModulesDir = Prefix/"lib"/"mercury"/"modules",
-        module_name_to_file_name(MainModuleName, ".init", no, InitFileName,
-            !IO),
-        install_file(InitFileName, ModulesDir, InitSucceeded, !IO),
-
          list.map_foldl2(install_ints_and_headers(LinkSucceeded), AllModules,
              IntsSucceeded, !Info, !IO),

@@ -822,7 +814,6 @@
          install_library_grade_files(LinkSucceeded, Grade, MainModuleName,
              AllModules, GradeSucceeded, !Info, !IO),
          (
-            InitSucceeded = yes,
              bool.and_list(IntsSucceeded) = yes,
              GradeSucceeded = yes
          ->
Index: runtime/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/runtime/Mmakefile,v
retrieving revision 1.135
diff -u -r1.135 Mmakefile
--- runtime/Mmakefile	23 Nov 2006 04:08:55 -0000	1.135
+++ runtime/Mmakefile	30 Nov 2006 14:32:10 -0000
@@ -438,8 +438,6 @@
  .PHONY: install
  install: install_headers install_lib

-# XXX Trace goal fix.
-#
  .PHONY: install_dirs
  install_dirs:
  	-[ -d $(INSTALL_INC_DIR)/machdeps ] || \
@@ -499,11 +497,8 @@
  	cp `vpath_find mercury_conf.h.in` $(INSTALL_RECONF_DIR)/runtime
  	cp `vpath_find $(MACHHDRS)` $(INSTALL_INC_DIR)/machdeps

-# XXX Trace goal fix.
-#
  .PHONY: install_init
  install_init: $(RT_LIB_NAME).init install_dirs
-	cp `vpath_find $(RT_LIB_NAME).init` $(INSTALL_MODULE_DIR)
  	cp `vpath_find $(RT_LIB_NAME).init` $(INSTALL_GRADE_MODULE_DIR)

  .PHONY: install_lib 
Index: scripts/Mmake.rules
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/scripts/Mmake.rules,v
retrieving revision 1.152
diff -u -r1.152 Mmake.rules
--- scripts/Mmake.rules	23 Nov 2006 04:08:55 -0000	1.152
+++ scripts/Mmake.rules	30 Nov 2006 14:38:44 -0000
@@ -473,16 +473,9 @@
  # the `--high-level-code' option.

  .PHONY: lib%.install
-lib%.install: lib%.install_ints lib%.install_hdrs lib%.install_init \
-		lib%.install_library
+lib%.install: lib%.install_ints lib%.install_hdrs lib%.install_library
  	$(MMAKE) lib$*.install_grades || { mercury_cleanup_install && exit 1; }

-# XXX Trace goal fix.
-#
-.PHONY: lib%.install_init
-lib%.install_init: %.init install_lib_dirs
-	$(INSTALL) `vpath_find $*.init` $(INSTALL_MODULE_DIR)
-
  .PHONY: lib%.install_grade_init
  lib%.install_grade_init: %.init install_grade_dirs
  	$(INSTALL) `vpath_find $*.init` $(INSTALL_GRADE_MODULE_DIR)

--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------