[m-rev.] diff: remove mercury_il.dll hackery

[Tyson Dowd]

Hi,

I've had this change kicking around for a while but I didn't realize
that I hadn't committed it...

===================================================================


Estimated hours taken: 0.5
Branches: main

library/Mmakefile:
	Eliminate the hack used to work around the limitation on the
	number of DLLs that could be installed in the .NET assembly
	cache.  Beta 2 has fixed this bug so we can now generate one DLL
	(or more) for each library file.
	Also remove some unused code that was trying to embed all the
	DLLs into a single DLL -- this doesn't work and I'm not sure
	that you are even supposed to be able to do this.


Index: library/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/library/Mmakefile,v
retrieving revision 1.70
diff -u -r1.70 Mmakefile
--- library/Mmakefile	2001/06/27 05:04:38	1.70
+++ library/Mmakefile	2001/07/17 14:56:13
@@ -236,22 +236,9 @@
 ALL_DLLS=$(CPP_DLLS) $(library.dlls) $(RUNTIME_DLLS) 
 
 ALL_DLLS_BASE  = $(ALL_DLLS:%.dll=%)
-EMBED_ALL_DLLS = $(foreach dll_name,$(ALL_DLLS_BASE),$(EMBED_ONE_DLL))
-EMBED_ONE_DLL  = /embed:$(dll_name).dll,$(dll_name)
 
-# For the moment we generate the library using one big DLL, as there are bugs
-# in the assembly cache installer (gacutil) that prevent us from installing
-# large numbers of assemblies.  The HACK_* versions of the variables implement
-# the big file hack.
-HACK_ALL_DLLS=$(CPP_DLLS) mercury_all.dll $(RUNTIME_DLLS)
-
-HACK_ALL_DLLS_BASE  = $(HACK_ALL_DLLS:%.dll=%)
-HACK_EMBED_ALL_DLLS = $(foreach dll_name,$(HACK_ALL_DLLS_BASE),$(EMBED_ONE_DLL))
-
-
 # Turn this on if you wish to enable .NET debugging.
-#MS_ILASMFLAGS = /debug
-
+# MS_ILASMFLAGS = /debug
 
 # If you do generate a new strong name, you had better update
 # compiler/mlds_to_il.m to generate references to it.  It is also hard-coded
@@ -265,15 +252,11 @@
 	rm -f $@
 	$(MS_ILASM) $(ALL_MS_ILASMFLAGS) /dll /quiet /OUT=$@ $(library.ils)
 
-mercury.dll: $(HACK_ALL_DLLS) mercury_all.dll library_strong_name.sn
-	cp $(RUNTIME_DLLS) .
-	$(MS_AL) -v:0.0.0.0 -keyf:library_strong_name.sn -out:mercury.dll $(HACK_ALL_DLLS)
-
-
 # al is the assembly linker, it will create an assembly that references
 # all the modules (.dll files) in the library and runtime.
-#mercury.dll: $(ALL_DLLS) library_strong_name.sn
-#	$(MS_AL) -v:0.0.0.0 -keyf:library_strong_name.sn -out:mercury.dll $(ALL_DLLS) $(EMBED_ALL_DLLS) 
+mercury.dll: $(ALL_DLLS) library_strong_name.sn
+	cp $(RUNTIME_DLLS) .
+	$(MS_AL) -v:0.0.0.0 -keyf:library_strong_name.sn -out:mercury.dll $(ALL_DLLS)
 
 else
 


-- 
       Tyson Dowd           # 
                            #  Surreal humour isn't everyone's cup of fur.
     trd at cs.mu.oz.au        # 
http://www.cs.mu.oz.au/~trd #
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------