[m-rev.] diff: remainder of stage 1 compilation in csharp grade

Julien Fischer juliensf at csse.unimelb.edu.au
Thu Feb 16 11:14:19 AEDT 2012


Branches: main, 11.07

Make the slice, profiler and deep_profiler directories compile in the csharp
grade.

deep_profiler/Mmakefile:
profiler/Mmkefile:
slice/Mmakefile:
 	Point the C# compiler towards the stdlib assembly.

Julien.

Index: deep_profiler/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/deep_profiler/Mmakefile,v
retrieving revision 1.42
diff -u -r1.42 Mmakefile
--- deep_profiler/Mmakefile	9 Jan 2012 00:35:41 -0000	1.42
+++ deep_profiler/Mmakefile	16 Feb 2012 00:11:33 -0000
@@ -78,6 +78,14 @@

  #-----------------------------------------------------------------------------#

+# Tell the C# compiler where the stdlib assembly is.
+#
+ifneq ("$(filter csharp%,$(GRADE))","")
+CSCFLAGS=-lib:../library -r:mer_std.dll
+endif
+
+#-----------------------------------------------------------------------------#
+
  ifneq ("$(filter il% csharp% java% erlang%,$(GRADE))","")
  MLOBJS =
  endif
Index: profiler/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/profiler/Mmakefile,v
retrieving revision 1.37
diff -u -r1.37 Mmakefile
--- profiler/Mmakefile	9 Jan 2012 00:35:41 -0000	1.37
+++ profiler/Mmakefile	16 Feb 2012 00:10:50 -0000
@@ -52,6 +52,12 @@
  MLOBJS =
  endif

+# Tell the C# compiler where the stdlib assembly is.
+#
+ifneq ("$(filter csharp%,$(GRADE))","")
+CSCFLAGS=-lib:../library -r:mer_std.dll
+endif
+
  #-----------------------------------------------------------------------------#

  .PHONY: check
Index: slice/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/slice/Mmakefile,v
retrieving revision 1.26
diff -u -r1.26 Mmakefile
--- slice/Mmakefile	9 Jan 2012 00:35:41 -0000	1.26
+++ slice/Mmakefile	16 Feb 2012 00:10:11 -0000
@@ -72,6 +72,14 @@

  #-----------------------------------------------------------------------------#

+# Tell the C# compiler where the stdlib assembly is.
+#
+ifneq ("$(filter csharp%,$(GRADE))","")
+CSCFLAGS=-lib:../library -r:mer_std.dll
+endif
+
+#-----------------------------------------------------------------------------#
+
  .PHONY: depend
  depend:	$(MDBCOMP_MODULES) $(DEPENDS)


--------------------------------------------------------------------------
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
--------------------------------------------------------------------------



More information about the reviews mailing list