[m-rev.] diff: .NET back-end fixes

[Fergus Henderson]

Estimated hours taken: 3
Branches: main

Various fixes for the .NET back-end.

compiler/Mmakefile:
	For IL grades, use editbin to set the stack size to 100M,
	since the default (1M) is too small.
	Also, don't try to build mlds_to_gcc in IL grades -- gcc.m won't
	compile, because the IL grades don't support the C interface.

library/Mmakefile:
	Add some missing dependencies.

profiler/Mmakefile:
deep_profiler/Mmakefile:
	Conditionalize some dependencies that were bogus for IL grades.

library/.cvsignore:
compiler/.cvsignore:
profiler/.cvsignore:
deep_profiler/.cvsignore:
analysis/.cvsignore:
browser/.cvsignore:
samples/.cvsignore:
	Various minor updates to ignore files produced when building in
	IL grades.

Workspace: /home/fjh/ws/hermes
Index: analysis/.cvsignore
===================================================================
RCS file: /home/mercury1/repository/mercury/analysis/.cvsignore,v
retrieving revision 1.1
diff -u -d -r1.1 .cvsignore
--- analysis/.cvsignore	12 Jan 2003 23:37:46 -0000	1.1
+++ analysis/.cvsignore	15 Feb 2003 23:34:47 -0000
@@ -1,3 +1,5 @@
+*.il
+*.pdb
 *.mh
 mer_analysis.init
 Mercury
Index: browser/.cvsignore
===================================================================
RCS file: /home/mercury1/repository/mercury/browser/.cvsignore,v
retrieving revision 1.17
diff -u -d -r1.17 .cvsignore
--- browser/.cvsignore	29 Aug 2002 04:37:04 -0000	1.17
+++ browser/.cvsignore	15 Feb 2003 23:34:47 -0000
@@ -1,3 +1,5 @@
+*.il
+*.pdb
 *.dep
 *.c
 *.d
Index: compiler/.cvsignore
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/.cvsignore,v
retrieving revision 1.20
diff -u -d -r1.20 .cvsignore
--- compiler/.cvsignore	10 Oct 2002 06:01:48 -0000	1.20
+++ compiler/.cvsignore	15 Feb 2003 23:34:47 -0000
@@ -1,3 +1,5 @@
+*.il
+*__cpp_code.cpp
 *.c
 *.d
 *.h
Index: compiler/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/Mmakefile,v
retrieving revision 1.66
diff -u -d -r1.66 Mmakefile
--- compiler/Mmakefile	13 Feb 2003 08:28:42 -0000	1.66
+++ compiler/Mmakefile	15 Feb 2003 23:34:47 -0000
@@ -185,9 +185,18 @@
 
 LN = ln
 
-mercury_compile: $(MC_PROG)
+ifneq ("$(EXT_FOR_EXE)","")
+.PHONY: mercury_compile
+mercury_compile: mercury_compile$(EXT_FOR_EXE)
+endif
+
+mercury_compile$(EXT_FOR_EXE): $(MC_PROG)$(EXT_FOR_EXE)
 	rm -f mercury_compile$(EXT_FOR_EXE)
 	$(LN) $(MC_PROG)$(EXT_FOR_EXE) mercury_compile$(EXT_FOR_EXE)
+ifeq ($(findstring il,$(GRADE)),il)        
+	# set the stack size to 100M -- the default of 1M is too low
+	-editbin /nologo /stack:100000000 mercury_compile$(EXT_FOR_EXE)
+endif
 
 libmercury_compile.a: lib$(MC_PROG).a
 	rm -f libmercury_compile.a
@@ -208,6 +217,8 @@
 # (We used to just build mlds_to_gcc.err, but that caused bootstrapping problems
 # with the source distribution; using the .c files is little more robust.)
 
+ifneq ($(findstring il,$(GRADE)),il)        
+
 .PHONY: depend
 depend:		mlds_to_gcc.depend
 
@@ -219,6 +230,7 @@
 .PHONY: cs
 cs: 		mlds_to_gcc.c gcc.c
 
+endif
 
 #-----------------------------------------------------------------------------#
 
Index: deep_profiler/.cvsignore
===================================================================
RCS file: /home/mercury1/repository/mercury/deep_profiler/.cvsignore,v
retrieving revision 1.4
diff -u -d -r1.4 .cvsignore
--- deep_profiler/.cvsignore	2 Oct 2002 06:56:46 -0000	1.4
+++ deep_profiler/.cvsignore	15 Feb 2003 23:34:47 -0000
@@ -1,3 +1,5 @@
+*.il
+*.pdb
 *.c
 *.d
 *.h
Index: deep_profiler/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/deep_profiler/Mmakefile,v
retrieving revision 1.8
diff -u -d -r1.8 Mmakefile
--- deep_profiler/Mmakefile	23 Jan 2003 00:24:08 -0000	1.8
+++ deep_profiler/Mmakefile	15 Feb 2003 23:34:47 -0000
@@ -52,13 +52,14 @@
 # Add some additional dependencies, so that Mmake knows to remake the
 # profiler if one of the libraries changes.
 
+ifneq ($(findstring il,$(GRADE)),il)        
 mdprof_cgi:	$(RUNTIME_DIR)/lib$(RT_LIB_NAME).$A
 mdprof_cgi:	$(LIBRARY_DIR)/lib$(STD_LIB_NAME).$A
 mdprof_test:	$(RUNTIME_DIR)/lib$(RT_LIB_NAME).$A
 mdprof_test:	$(LIBRARY_DIR)/lib$(STD_LIB_NAME).$A
-# Should also depend on $(BOEHM_GC_DIR)/libgc(_prof).$A, but only
-# if in .gc(.prof) grade; GNU make does not support dynamic dependencies,
-# so just leave it out.
+# XXX Should also depend on $(BOEHM_GC_DIR)/libgc(_prof).$A, but only
+# if in .gc(.prof) grade.
+endif
 
 $(cs_subdir)mdprof_cgi_init.c:		$(UTIL_DIR)/mkinit
 $(cs_subdir)mdprof_test_init.c:		$(UTIL_DIR)/mkinit
Index: library/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/library/Mmakefile,v
retrieving revision 1.106
diff -u -d -r1.106 Mmakefile
--- library/Mmakefile	13 Feb 2003 08:28:42 -0000	1.106
+++ library/Mmakefile	15 Feb 2003 23:34:47 -0000
@@ -239,6 +239,9 @@
 mercury_mcpp.dll: ../runtime/mercury_mcpp.dll
 	cp ../runtime/mercury_mcpp.dll .
 
+%__csharp_code.dll: $(RUNTIME_DLLS)
+%__cpp_code.dll: $(RUNTIME_DLLS)
+
 builtin__cpp_code.dll : builtin__csharp_code.dll
 exception__csharp_code.dll : exception__cpp_code.dll
 CSHARP_ASSEMBLY_REFS-exception__csharp_code += /addmodule:exception__cpp_code.dll
Index: profiler/.cvsignore
===================================================================
RCS file: /home/mercury1/repository/mercury/profiler/.cvsignore,v
retrieving revision 1.10
diff -u -d -r1.10 .cvsignore
--- profiler/.cvsignore	29 Aug 2002 04:42:14 -0000	1.10
+++ profiler/.cvsignore	15 Feb 2003 23:34:47 -0000
@@ -1,3 +1,5 @@
+*.il
+*.pdb
 *.c
 *.d
 *.h
Index: profiler/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/profiler/Mmakefile,v
retrieving revision 1.22
diff -u -d -r1.22 Mmakefile
--- profiler/Mmakefile	23 Jan 2003 00:24:12 -0000	1.22
+++ profiler/Mmakefile	15 Feb 2003 23:34:47 -0000
@@ -35,11 +35,12 @@
 # Add some additional dependencies, so that Mmake knows to remake the
 # profiler if one of the libraries changes.
 
+ifneq ($(findstring il,$(GRADE)),il)        
 mercury_profile: $(RUNTIME_DIR)/lib$(RT_LIB_NAME).$A
 mercury_profile: $(LIBRARY_DIR)/lib$(STD_LIB_NAME).$A
-# Should also depend on $(BOEHM_GC_DIR)/libgc(_prof).$A, but only
-# if in .gc(.prof) grade; GNU make does not support dynamic dependencies,
-# so just leave it out.
+# XXX Should also depend on $(BOEHM_GC_DIR)/libgc(_prof).$A, but only
+# if in .gc(.prof) grade.
+endif
 
 $(cs_subdir)mercury_profile_init.c: $(UTIL_DIR)/mkinit
 
Index: samples/.cvsignore
===================================================================
RCS file: /home/mercury1/repository/mercury/samples/.cvsignore,v
retrieving revision 1.1
diff -u -d -r1.1 .cvsignore
--- samples/.cvsignore	23 Jan 1996 09:31:06 -0000	1.1
+++ samples/.cvsignore	15 Feb 2003 23:34:47 -0000
@@ -1,2 +1,3 @@
 *.c
+*.il
 all_solutions calculator cat committed_choice eliza hello ultra_sub sort

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------