Author: raja
Date: 2005-04-25 09:42:51 -0400 (Mon, 25 Apr 2005)
New Revision: 43545

Modified:
   trunk/mcs/ChangeLog
   trunk/mcs/Makefile
   trunk/mcs/bmcs/Makefile
   trunk/mcs/build/ChangeLog
   trunk/mcs/build/config-default.make
   trunk/mcs/build/library.make
   trunk/mcs/build/platforms/linux.make
   trunk/mcs/build/platforms/win32.make
   trunk/mcs/build/profiles/basic.make
   trunk/mcs/build/profiles/bootstrap.make
   trunk/mcs/build/profiles/default.make
   trunk/mcs/build/profiles/net_1_1_bootstrap.make
   trunk/mcs/build/profiles/net_2_0_bootstrap.make
   trunk/mcs/build/rules.make
   trunk/mcs/class/Commons.Xml.Relaxng/Test/standalone_tests/Makefile
   trunk/mcs/class/Microsoft.VisualBasic/ChangeLog
   trunk/mcs/class/Microsoft.VisualBasic/fixup/Makefile
   trunk/mcs/class/Mono.Globalization/Makefile
   trunk/mcs/class/System.Security/Test/standalone_tests/Makefile
   trunk/mcs/class/System.XML/Test/System.Xml.Schema/standalone_tests/Makefile
   trunk/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/Makefile
   trunk/mcs/class/System.XML/Test/System.Xml/standalone_tests/Makefile
   trunk/mcs/errors/Makefile
   trunk/mcs/gmcs/Makefile
   trunk/mcs/mbas/Test/misc/Makefile
   trunk/mcs/mcs/Makefile
   trunk/mcs/tests/Makefile
   trunk/mcs/tools/cilc/Makefile
   trunk/mcs/tools/sqlsharp/Makefile
Log:
* Makefile (centum_tests): Add Mono.Security and
System.Runtime.Remoting.
* */Makefile: Replace $(RUNTIME) with $(RUNTIME) $(RUNTIME_FLAGS).
* build/config-default.make (RUNTIME): Set to 'false'.
Reported by Ben Maurer.
* build/profiles/basic.make (MCS): Revert changes below.
* build/platforms/linux.make (ILDISASM): Define.
* build/platforms/win32.make (ILDIsASM): Likewise.
* class/Microsoft.VisualBasic/fixup/Makefile (ILDISASM): Remove.
($(the_il)): Create temporary files in profile directory.


Modified: trunk/mcs/ChangeLog
===================================================================
--- trunk/mcs/ChangeLog 2005-04-25 13:06:17 UTC (rev 43544)
+++ trunk/mcs/ChangeLog 2005-04-25 13:42:51 UTC (rev 43545)
@@ -1,3 +1,9 @@
+2005-04-25  Raja R Harinath  <[EMAIL PROTECTED]>
+
+       * Makefile (centum_tests): Add Mono.Security and
+       System.Runtime.Remoting.
+       * */Makefile: Replace $(RUNTIME) with $(RUNTIME) $(RUNTIME_FLAGS).
+
 2005-04-21  Raja R Harinath  <[EMAIL PROTECTED]>
 
        * Makefile (net_1_1_bootstrap_SUBDIRS): Add ilasm.

Modified: trunk/mcs/Makefile
===================================================================
--- trunk/mcs/Makefile  2005-04-25 13:06:17 UTC (rev 43544)
+++ trunk/mcs/Makefile  2005-04-25 13:42:51 UTC (rev 43545)
@@ -14,7 +14,9 @@
        class/Cscompmgd \
        class/Microsoft.JScript \
        class/Mono.Posix \
+       class/Mono.Security \
        class/System.Configuration.Install \
+       class/System.Runtime.Remoting \
        class/System.Runtime.Serialization.Formatters.Soap \
        class/System.Web.Services \
        tests \
@@ -23,8 +25,6 @@
 
 default_centum_tests := \
        class/corlib \
-       class/Mono.Security \
-       class/System.Runtime.Remoting \
        $(centum_tests)
 
 net_2_0_centum_tests := $(centum_tests)

Modified: trunk/mcs/bmcs/Makefile
===================================================================
--- trunk/mcs/bmcs/Makefile     2005-04-25 13:06:17 UTC (rev 43544)
+++ trunk/mcs/bmcs/Makefile     2005-04-25 13:42:51 UTC (rev 43545)
@@ -10,7 +10,7 @@
 #uncomment to enable some debug stuff
 #DEBUG_FLAGS=/define:MCS_DEBUG
 
-BOOTSTRAP_MCS = 
MONO_PATH="$(topdir)/class/lib/net_2_0_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 $(RUNTIME) $(topdir)/class/lib/net_2_0_bootstrap/mcs.exe $(DEBUG_FLAGS)
+BOOTSTRAP_MCS = 
MONO_PATH="$(topdir)/class/lib/net_2_0_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/net_2_0_bootstrap/mcs.exe 
$(DEBUG_FLAGS)
 
 BUILT_SOURCES = mb-parser.cs
 
@@ -34,4 +34,4 @@
        cp bmcs.exe  $(prefix)/lib/mono/2.0/
 
 diffus:
-       diff --exclude='.svn' --exclude='*-parser.*' --exclude='*-tokenizer.cs' 
-ruN ../gmcs ../bmcs
\ No newline at end of file
+       diff --exclude='.svn' --exclude='*-parser.*' --exclude='*-tokenizer.cs' 
-ruN ../gmcs ../bmcs

Modified: trunk/mcs/build/ChangeLog
===================================================================
--- trunk/mcs/build/ChangeLog   2005-04-25 13:06:17 UTC (rev 43544)
+++ trunk/mcs/build/ChangeLog   2005-04-25 13:42:51 UTC (rev 43545)
@@ -1,3 +1,11 @@
+2005-04-25  Raja R Harinath  <[EMAIL PROTECTED]>
+
+       * config-default.make (RUNTIME): Set to 'false'.
+       Reported by Ben Maurer.
+       * profiles/basic.make (MCS): Revert changes below.
+       * platforms/linux.make (ILDISASM): Define.
+       * platforms/win32.make (ILDIsASM): Likewise.
+
 2005-04-23  Ben Maurer  <[EMAIL PROTECTED]>
 
        * profiles/basic.make: Ensure that make dist works even if you

Modified: trunk/mcs/build/config-default.make
===================================================================
--- trunk/mcs/build/config-default.make 2005-04-25 13:06:17 UTC (rev 43544)
+++ trunk/mcs/build/config-default.make 2005-04-25 13:42:51 UTC (rev 43545)
@@ -16,7 +16,8 @@
 prefix = /usr/local
 exec_prefix = $(prefix)
 mono_libdir = $(exec_prefix)/lib
-RUNTIME = mono $(RUNTIME_FLAGS)
+#RUNTIME = mono
+RUNTIME = false
 TEST_RUNTIME = 
MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$(TEST_MONO_PATH)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 $(RUNTIME) --debug
 
 # In case you want to add MCS_FLAGS, this lets you not have to

Modified: trunk/mcs/build/library.make
===================================================================
--- trunk/mcs/build/library.make        2005-04-25 13:06:17 UTC (rev 43544)
+++ trunk/mcs/build/library.make        2005-04-25 13:42:51 UTC (rev 43545)
@@ -80,14 +80,14 @@
 GACUTIL = :
 else
 gacutil = $(topdir)/class/lib/net_1_1_bootstrap/gacutil.exe
-GACUTIL = 
MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 $(RUNTIME) $(gacutil)
+GACUTIL = 
MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 $(RUNTIME) $(RUNTIME_FLAGS) $(gacutil)
 endif
 
 ifdef NO_SIGN_ASSEMBLY
 SN = :
 else
 sn = $(topdir)/class/lib/net_1_1_bootstrap/sn.exe
-SN = 
MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 $(RUNTIME) $(sn)
+SN = 
MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 $(RUNTIME) $(RUNTIME_FLAGS) $(sn)
 SNFLAGS = -q -R
 endif
 

Modified: trunk/mcs/build/platforms/linux.make
===================================================================
--- trunk/mcs/build/platforms/linux.make        2005-04-25 13:06:17 UTC (rev 
43544)
+++ trunk/mcs/build/platforms/linux.make        2005-04-25 13:42:51 UTC (rev 
43545)
@@ -12,6 +12,8 @@
 EXTERNAL_MBAS = mbas
 EXTERNAL_RUNTIME = mono
 RESGEN = 
MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" 
$(INTERNAL_RESGEN)
+#ILDISASM = monodis
+ILDISASM = false
 
 PLATFORM_PATH_SEPARATOR = :
 

Modified: trunk/mcs/build/platforms/win32.make
===================================================================
--- trunk/mcs/build/platforms/win32.make        2005-04-25 13:06:17 UTC (rev 
43544)
+++ trunk/mcs/build/platforms/win32.make        2005-04-25 13:42:51 UTC (rev 
43545)
@@ -11,8 +11,16 @@
 EXTERNAL_MCS = csc.exe
 EXTERNAL_MBAS = vbc.exe
 EXTERNAL_RUNTIME =
+
+# Disabled since it needs the SDK
+#RESGEN = resgen.exe
+#ILDISASM = ildasm.exe /test
 RESGEN = $(topdir)/tools/resgen/resgen.exe
 
+#ILDISASM = monodis.bat
+## Gross hack
+ILDISASM = $(topdir)/../mono/mono/dis/monodis
+
 PLATFORM_MAKE_CORLIB_CMP = yes
 PLATFORM_CHANGE_SEPARATOR_CMD=tr '/' '\\\\'
 PLATFORM_PATH_SEPARATOR = ;

Modified: trunk/mcs/build/profiles/basic.make
===================================================================
--- trunk/mcs/build/profiles/basic.make 2005-04-25 13:06:17 UTC (rev 43544)
+++ trunk/mcs/build/profiles/basic.make 2005-04-25 13:42:51 UTC (rev 43545)
@@ -1,24 +1,7 @@
 # -*- makefile -*-
 
 BOOTSTRAP_MCS = $(EXTERNAL_MCS)
-
-#
-# If we are bootstrapping with an external mono -- for example, trying
-# to do `make basic' with an old mono RPM, we need to make sure that we don't
-# set MONO_PATH for an old runtime -- otherwise it will get a new corlib and
-# be fscked up. We do this by testing if the first word of runtime is the same
-# as external runtime -- if so, we make sure not to set the MONO_PATH on mcs.
-#
-
-ifeq ($(word 1, $(RUNTIME)),$(EXTERNAL_RUNTIME))
-USING_EXT_MONO = yes
-endif
-
-ifdef USING_EXT_MONO
-MCS = $(EXTERNAL_MCS)
-else
 MCS = 
MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" 
$(INTERNAL_MCS)
-endif
 
 PROFILE_MCS_FLAGS = -d:NET_1_1 -d:ONLY_1_1 -d:BOOTSTRAP_WITH_OLDLIB
 NO_SIGN_ASSEMBLY = yes

Modified: trunk/mcs/build/profiles/bootstrap.make
===================================================================
--- trunk/mcs/build/profiles/bootstrap.make     2005-04-25 13:06:17 UTC (rev 
43544)
+++ trunk/mcs/build/profiles/bootstrap.make     2005-04-25 13:42:51 UTC (rev 
43545)
@@ -14,7 +14,7 @@
 # run the compiler; /r: flags are by default loaded from whatever's
 # in the MONO_PATH too).
 
-MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(RUNTIME) 
--debug $(topdir)/mcs/mcs.exe
+MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(RUNTIME) 
$(RUNTIME_FLAGS) --debug $(topdir)/mcs/mcs.exe
 BOOTSTRAP_MCS = $(MCS)
 
 # nuttzing!

Modified: trunk/mcs/build/profiles/default.make
===================================================================
--- trunk/mcs/build/profiles/default.make       2005-04-25 13:06:17 UTC (rev 
43544)
+++ trunk/mcs/build/profiles/default.make       2005-04-25 13:42:51 UTC (rev 
43545)
@@ -15,7 +15,7 @@
 # in the MONO_PATH too).
 
 ifdef PLATFORM_MONO_NATIVE
-BOOTSTRAP_MCS = 
MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 $(RUNTIME) $(topdir)/class/lib/net_1_1_bootstrap/mcs.exe
+BOOTSTRAP_MCS = 
MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/net_1_1_bootstrap/mcs.exe
 MCS = 
MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" 
$(INTERNAL_MCS)
 MBAS = 
MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" 
$(INTERNAL_MBAS)
 else

Modified: trunk/mcs/build/profiles/net_1_1_bootstrap.make
===================================================================
--- trunk/mcs/build/profiles/net_1_1_bootstrap.make     2005-04-25 13:06:17 UTC 
(rev 43544)
+++ trunk/mcs/build/profiles/net_1_1_bootstrap.make     2005-04-25 13:42:51 UTC 
(rev 43545)
@@ -1,7 +1,7 @@
 # -*- makefile -*-
 
 ifdef PLATFORM_MONO_NATIVE
-BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/basic:$$MONO_PATH" $(RUNTIME) 
$(topdir)/class/lib/basic/mcs.exe
+BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/basic:$$MONO_PATH" $(RUNTIME) 
$(RUNTIME_FLAGS) $(topdir)/class/lib/basic/mcs.exe
 MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(INTERNAL_MCS)
 MBAS = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(INTERNAL_MBAS)
 else

Modified: trunk/mcs/build/profiles/net_2_0_bootstrap.make
===================================================================
--- trunk/mcs/build/profiles/net_2_0_bootstrap.make     2005-04-25 13:06:17 UTC 
(rev 43544)
+++ trunk/mcs/build/profiles/net_2_0_bootstrap.make     2005-04-25 13:42:51 UTC 
(rev 43545)
@@ -4,7 +4,7 @@
 # Note that we're using the .NET 1.1 MCS but MONO_PATH points to the 
net_2_0_bootstrap directory.
 # We do it this way to get assembly version references right.
 #
-BOOTSTRAP_MCS = 
MONO_PATH="$(topdir)/class/lib/default$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" 
$(RUNTIME) $(topdir)/class/lib/default/mcs.exe
+BOOTSTRAP_MCS = 
MONO_PATH="$(topdir)/class/lib/default$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" 
$(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/default/mcs.exe
 MCS = 
MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" 
$(INTERNAL_MCS)
 
 profile-check: 

Modified: trunk/mcs/build/rules.make
===================================================================
--- trunk/mcs/build/rules.make  2005-04-25 13:06:17 UTC (rev 43544)
+++ trunk/mcs/build/rules.make  2005-04-25 13:42:51 UTC (rev 43545)
@@ -26,11 +26,11 @@
 INSTALL_BIN = $(INSTALL) -c -m 755
 INSTALL_LIB = $(INSTALL_BIN)
 MKINSTALLDIRS = $(SHELL) $(topdir)/mkinstalldirs
-INTERNAL_MCS = $(RUNTIME) $(topdir)/class/lib/$(PROFILE)/mcs.exe
-INTERNAL_MBAS = $(RUNTIME) $(topdir)/mbas/mbas.exe
-INTERNAL_GMCS = $(RUNTIME) $(topdir)/gmcs/gmcs.exe
-INTERNAL_ILASM = $(RUNTIME) $(topdir)/class/lib/$(PROFILE)/ilasm.exe
-INTERNAL_RESGEN = $(RUNTIME) $(topdir)/tools/resgen/resgen.exe
+INTERNAL_MCS = $(RUNTIME) $(RUNTIME_FLAGS) 
$(topdir)/class/lib/$(PROFILE)/mcs.exe
+INTERNAL_MBAS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/mbas/mbas.exe
+INTERNAL_GMCS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/gmcs/gmcs.exe
+INTERNAL_ILASM = $(RUNTIME) $(RUNTIME_FLAGS) 
$(topdir)/class/lib/$(PROFILE)/ilasm.exe
+INTERNAL_RESGEN = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/tools/resgen/resgen.exe
 corlib = mscorlib.dll
 
 depsdir = $(topdir)/build/deps

Modified: trunk/mcs/class/Commons.Xml.Relaxng/Test/standalone_tests/Makefile
===================================================================
--- trunk/mcs/class/Commons.Xml.Relaxng/Test/standalone_tests/Makefile  
2005-04-25 13:06:17 UTC (rev 43544)
+++ trunk/mcs/class/Commons.Xml.Relaxng/Test/standalone_tests/Makefile  
2005-04-25 13:42:51 UTC (rev 43545)
@@ -34,10 +34,10 @@
        mkdir relax-ng
 
 test : relaxngtest.exe
-       $(RUNTIME) relaxngtest.exe
+       $(RUNTIME) $(RUNTIME_FLAGS) relaxngtest.exe
 
 anglia-test : anglia-test-runner.exe
-       $(RUNTIME) anglia-test-runner.exe
+       $(RUNTIME) $(RUNTIME_FLAGS) anglia-test-runner.exe
 
 # be careful to use it. This removes ALL files in xml-test-suite!
 clean :

Modified: trunk/mcs/class/Microsoft.VisualBasic/ChangeLog
===================================================================
--- trunk/mcs/class/Microsoft.VisualBasic/ChangeLog     2005-04-25 13:06:17 UTC 
(rev 43544)
+++ trunk/mcs/class/Microsoft.VisualBasic/ChangeLog     2005-04-25 13:42:51 UTC 
(rev 43545)
@@ -1,3 +1,8 @@
+2005-04-25  Raja R Harinath  <[EMAIL PROTECTED]>
+
+       * fixup/Makefile (ILDISASM): Remove.
+       ($(the_il)): Create temporary files in profile directory.
+
 2005-04-23  Atsushi Enomoto  <[EMAIL PROTECTED]>
 
        * fixup/Makefile :

Modified: trunk/mcs/class/Microsoft.VisualBasic/fixup/Makefile
===================================================================
--- trunk/mcs/class/Microsoft.VisualBasic/fixup/Makefile        2005-04-25 
13:06:17 UTC (rev 43544)
+++ trunk/mcs/class/Microsoft.VisualBasic/fixup/Makefile        2005-04-25 
13:42:51 UTC (rev 43545)
@@ -5,7 +5,6 @@
 include ../../../build/rules.make
 
 with_mono_path = 
MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
-ILDISASM = ../../../../mono/mono/dis/monodis
 PERL = perl
 
 # ----------------------------------------------
@@ -24,21 +23,21 @@
 GACUTIL = :
 else
 gacutil = $(topdir)/class/lib/net_1_1_bootstrap/gacutil.exe
-GACUTIL = 
MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 $(RUNTIME) $(gacutil)
+GACUTIL = 
MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 $(RUNTIME) $(RUNTIME_FLAGS) $(gacutil)
 endif
 
 ifdef NO_SIGN_ASSEMBLY
 SN = :
 else
 sn = $(topdir)/class/lib/net_1_1_bootstrap/sn.exe
-SN = 
MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 $(RUNTIME) $(sn)
+SN = 
MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 $(RUNTIME) $(RUNTIME_FLAGS) $(sn)
 SNFLAGS = -q -R
 endif
 
 # ----------------------------------------------
 
 ilasm = $(topdir)/class/lib/net_1_1_bootstrap/ilasm.exe
-ILASM = 
MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 $(RUNTIME) $(ilasm)
+ILASM = 
MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 $(RUNTIME) $(RUNTIME_FLAGS) $(ilasm)
 
 the_lib = $(PROFILE)/Microsoft.VisualBasic.dll
 the_il = $(the_lib:.dll=.il)
@@ -46,13 +45,13 @@
 all-local: $(the_lib)
 
 $(the_lib): $(the_il) Microsoft.VisualBasic.VBUtils.resources
-       $(ILASM) /out:$@ $<
+       $(ILASM) $(IL_FLAGS) /out:$@ $<
        $(SN) $(SNFLAGS) $@ $(topdir)/class/mono.snk
 
 $(the_il): $(topdir)/class/lib/$(PROFILE)/Microsoft.VisualBasic.dll fixup.pl
-       $(with_mono_path) $(ILDISASM) $< > t1 || { rm -f t1; exit 1; }
-       $(PERL) ./fixup.pl t1 > t2 && rm -f t1
-       mv t2 $@
+       $(with_mono_path) $(ILDISASM) $< > $(PROFILE)/t1 || { rm -f 
$(PROFILE)/t1; exit 1; }
+       $(PERL) ./fixup.pl $(PROFILE)/t1 > $(PROFILE)/t2 && rm -f $(PROFILE)/t1
+       mv $(PROFILE)/t2 $@
 
 Microsoft.VisualBasic.VBUtils.resources: 
../Microsoft.VisualBasic/VBUtils.resources
        cp $< $@

Modified: trunk/mcs/class/Mono.Globalization/Makefile
===================================================================
--- trunk/mcs/class/Mono.Globalization/Makefile 2005-04-25 13:06:17 UTC (rev 
43544)
+++ trunk/mcs/class/Mono.Globalization/Makefile 2005-04-25 13:42:51 UTC (rev 
43545)
@@ -31,7 +31,7 @@
 RUNTIME_FLAGS = --debug
 
 MonoCultures.cs: write-source.exe $(wildcard Data/*.xml)
-       $(RUNTIME) $<
+       $(RUNTIME) $(RUNTIME_FLAGS) $<
 
 write-source.exe: write-source.cs
        $(CSCOMPILE) /target:exe /out:$@ $^

Modified: trunk/mcs/class/System.Security/Test/standalone_tests/Makefile
===================================================================
--- trunk/mcs/class/System.Security/Test/standalone_tests/Makefile      
2005-04-25 13:06:17 UTC (rev 43544)
+++ trunk/mcs/class/System.Security/Test/standalone_tests/Makefile      
2005-04-25 13:42:51 UTC (rev 43545)
@@ -5,15 +5,15 @@
 XMLDSIG_EXE_OPTIONS = --decent-reader
 
 run-test: c14n.exe xmldsig.exe merlin-xmldsig-twenty-three
-       $(RUNTIME) c14n.exe 
merlin-xmldsig-twenty-three/signature-enveloped-dsa.xml SignedInfo | cmp 
merlin-xmldsig-twenty-three/signature-enveloped-dsa-c14n-1.txt
-       $(RUNTIME) c14n.exe 
merlin-xmldsig-twenty-three/signature-enveloping-b64-dsa.xml SignedInfo | cmp 
merlin-xmldsig-twenty-three/signature-enveloping-b64-dsa-c14n-0.txt
-       $(RUNTIME) c14n.exe 
merlin-xmldsig-twenty-three/signature-enveloping-dsa.xml SignedInfo | cmp 
merlin-xmldsig-twenty-three/signature-enveloping-dsa-c14n-1.txt
-       $(RUNTIME) c14n.exe 
merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1-40.xml SignedInfo | 
cmp merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1-40-c14n-1.txt
-       $(RUNTIME) c14n.exe 
merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1.xml SignedInfo | cmp 
merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1-c14n-1.txt
-       $(RUNTIME) c14n.exe 
merlin-xmldsig-twenty-three/signature-enveloping-rsa.xml SignedInfo | cmp 
merlin-xmldsig-twenty-three/signature-enveloping-rsa-c14n-1.txt
-       $(RUNTIME) c14n.exe 
merlin-xmldsig-twenty-three/signature-external-b64-dsa.xml SignedInfo | cmp 
merlin-xmldsig-twenty-three/signature-external-b64-dsa-c14n-0.txt
-       $(RUNTIME) c14n.exe 
merlin-xmldsig-twenty-three/signature-external-dsa.xml SignedInfo | cmp 
merlin-xmldsig-twenty-three/signature-external-dsa-c14n-0.txt
-       $(RUNTIME) xmldsig.exe $(XMLDSIG_EXE_OPTIONS)
+       $(RUNTIME) $(RUNTIME_FLAGS) c14n.exe 
merlin-xmldsig-twenty-three/signature-enveloped-dsa.xml SignedInfo | cmp 
merlin-xmldsig-twenty-three/signature-enveloped-dsa-c14n-1.txt
+       $(RUNTIME) $(RUNTIME_FLAGS) c14n.exe 
merlin-xmldsig-twenty-three/signature-enveloping-b64-dsa.xml SignedInfo | cmp 
merlin-xmldsig-twenty-three/signature-enveloping-b64-dsa-c14n-0.txt
+       $(RUNTIME) $(RUNTIME_FLAGS) c14n.exe 
merlin-xmldsig-twenty-three/signature-enveloping-dsa.xml SignedInfo | cmp 
merlin-xmldsig-twenty-three/signature-enveloping-dsa-c14n-1.txt
+       $(RUNTIME) $(RUNTIME_FLAGS) c14n.exe 
merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1-40.xml SignedInfo | 
cmp merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1-40-c14n-1.txt
+       $(RUNTIME) $(RUNTIME_FLAGS) c14n.exe 
merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1.xml SignedInfo | cmp 
merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1-c14n-1.txt
+       $(RUNTIME) $(RUNTIME_FLAGS) c14n.exe 
merlin-xmldsig-twenty-three/signature-enveloping-rsa.xml SignedInfo | cmp 
merlin-xmldsig-twenty-three/signature-enveloping-rsa-c14n-1.txt
+       $(RUNTIME) $(RUNTIME_FLAGS) c14n.exe 
merlin-xmldsig-twenty-three/signature-external-b64-dsa.xml SignedInfo | cmp 
merlin-xmldsig-twenty-three/signature-external-b64-dsa-c14n-0.txt
+       $(RUNTIME) $(RUNTIME_FLAGS) c14n.exe 
merlin-xmldsig-twenty-three/signature-external-dsa.xml SignedInfo | cmp 
merlin-xmldsig-twenty-three/signature-external-dsa-c14n-0.txt
+       $(RUNTIME) $(RUNTIME_FLAGS) xmldsig.exe $(XMLDSIG_EXE_OPTIONS)
 
 ms-test: c14n.exe xmldsig.exe merlin-xmldsig-twenty-three
        cp ../../../lib/$(PROFILE)/Mono.Security.dll .

Modified: trunk/mcs/class/System.XML/Test/System.Xml/standalone_tests/Makefile
===================================================================
--- trunk/mcs/class/System.XML/Test/System.Xml/standalone_tests/Makefile        
2005-04-25 13:06:17 UTC (rev 43544)
+++ trunk/mcs/class/System.XML/Test/System.Xml/standalone_tests/Makefile        
2005-04-25 13:42:51 UTC (rev 43545)
@@ -21,18 +21,18 @@
        mkdir xml-test-suite
 
 test :
-       $(RUNTIME) xmltest.exe
+       $(RUNTIME) $(RUNTIME_FLAGS) xmltest.exe
 
 xrtest : xmlreader-result-ms.txt
-       $(RUNTIME) xrdump.exe > xmlreader-result-mono.txt
+       $(RUNTIME) $(RUNTIME_FLAGS) xrdump.exe > xmlreader-result-mono.txt
        diff xmlreader-result-ms.txt xmlreader-result-mono.txt
 
 domtest : dom-result-ms.txt
-       $(RUNTIME) domdump.exe > dom-result-mono.txt
+       $(RUNTIME) $(RUNTIME_FLAGS) domdump.exe > dom-result-mono.txt
        diff dom-result-ms.txt dom-result-mono.txt
 
 eventtest : event-result-ms.txt
-       $(RUNTIME) eventdump.exe > event-result-mono.txt
+       $(RUNTIME) $(RUNTIME_FLAGS) eventdump.exe > event-result-mono.txt
        diff event-result-ms.txt event-result-mono.txt
 
 xmlreader-result-ms.txt dom-result-ms.txt event-result-ms.txt :

Modified: 
trunk/mcs/class/System.XML/Test/System.Xml.Schema/standalone_tests/Makefile
===================================================================
--- trunk/mcs/class/System.XML/Test/System.Xml.Schema/standalone_tests/Makefile 
2005-04-25 13:06:17 UTC (rev 43544)
+++ trunk/mcs/class/System.XML/Test/System.Xml.Schema/standalone_tests/Makefile 
2005-04-25 13:42:51 UTC (rev 43545)
@@ -25,11 +25,11 @@
        mkdir xsd-test-suite
 
 run-test :
-       $(RUNTIME) xsdtest.exe --xml --reportsuccess --testall --details 
--report:TestResult.xml $(XSD_TEST_FLAGS)
+       $(RUNTIME) $(RUNTIME_FLAGS) xsdtest.exe --xml --reportsuccess --testall 
--details --report:TestResult.xml $(XSD_TEST_FLAGS)
        @echo "SUCCESS: `grep -c \"OK\" TestResult.xml` NORMAL FAILURE: `grep 
-c should TestResult.xml` UNEXPECTED `grep -c unexpected TestResult.xml`"
 
 test-psci : xs-psci-compare.exe
-       $(RUNTIME) xs-psci-compare.exe xsd-test-suite/msxsdtest/tests-all.xml > 
psci-mono-msxsd.txt
+       $(RUNTIME) $(RUNTIME_FLAGS) xs-psci-compare.exe 
xsd-test-suite/msxsdtest/tests-all.xml > psci-mono-msxsd.txt
 
 # be careful to use it. This removes ALL files in xsd-test-suite!
 # clean:

Modified: 
trunk/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/Makefile
===================================================================
--- trunk/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/Makefile    
2005-04-25 13:06:17 UTC (rev 43544)
+++ trunk/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/Makefile    
2005-04-25 13:42:51 UTC (rev 43545)
@@ -61,10 +61,10 @@
 run-test : run-test-xslt run-test-ms
 
 run-test-xslt : xslttest.exe
-       $(RUNTIME) xslttest.exe --report:TestResult.xml --xml --details --outall
+       $(RUNTIME) $(RUNTIME_FLAGS) xslttest.exe --report:TestResult.xml --xml 
--details --outall
 
 run-test-ms : alltest.exe xmlnorm.exe
-       $(RUNTIME) ./alltest.exe $(TARGET_RESULTS)
+       $(RUNTIME) $(RUNTIME_FLAGS) ./alltest.exe $(TARGET_RESULTS)
        mono ./xmlnorm.exe -s testsuite/TESTS/$(TARGET_RESULTS) 
testsuite/TESTS/norm-tmp
        rm -rf testsuite/TESTS/$(TARGET_RESULTS)
        mv testsuite/TESTS/norm-tmp testsuite/TESTS/$(TARGET_RESULTS)

Modified: trunk/mcs/errors/Makefile
===================================================================
--- trunk/mcs/errors/Makefile   2005-04-25 13:06:17 UTC (rev 43544)
+++ trunk/mcs/errors/Makefile   2005-04-25 13:42:51 UTC (rev 43545)
@@ -62,7 +62,7 @@
        @./do-tests.pl generics '$(GENERICS_COMPILE)' "gcs*.cs"
 else
 run-mcs-tests: TestRunner-$(PROFILE).exe
-       $(with_mono_path) $(RUNTIME) TestRunner-$(PROFILE).exe $(COMPILER_NAME) 
$(COMPILER) known-issues-$(COMPILER_NAME) $(COMPILER_NAME).log
+       $(with_mono_path) $(RUNTIME) $(RUNTIME_FLAGS) TestRunner-$(PROFILE).exe 
$(COMPILER_NAME) $(COMPILER) known-issues-$(COMPILER_NAME) $(COMPILER_NAME).log
 endif
 
 clean-local:

Modified: trunk/mcs/gmcs/Makefile
===================================================================
--- trunk/mcs/gmcs/Makefile     2005-04-25 13:06:17 UTC (rev 43544)
+++ trunk/mcs/gmcs/Makefile     2005-04-25 13:42:51 UTC (rev 43545)
@@ -5,7 +5,7 @@
 #uncomment to enable some debug stuff
 #DEBUG_FLAGS=/define:MCS_DEBUG
 
-BOOTSTRAP_MCS = 
MONO_PATH="$(topdir)/class/lib/net_2_0_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 $(RUNTIME) $(topdir)/class/lib/net_2_0_bootstrap/mcs.exe $(DEBUG_FLAGS)
+BOOTSTRAP_MCS = 
MONO_PATH="$(topdir)/class/lib/net_2_0_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/net_2_0_bootstrap/mcs.exe 
$(DEBUG_FLAGS)
 
 BUILT_SOURCES = cs-parser.cs
 
@@ -40,10 +40,10 @@
        MONO_PATH="../class/lib/net_2_0$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" 
time $(PROGRAM) -2 /target:exe /debug /out:$@ $^ $(DEBUG_FLAGS) 
 
 gmcs3.exe: gmcs2.exe
-       MONO_PATH="../class/lib/net_2_0$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" 
time $(RUNTIME) ./gmcs2.exe $(USE_MCS_FLAGS) $(DEBUG_FLAGS) -2 /target:exe 
/debug /out:$@ $^
+       MONO_PATH="../class/lib/net_2_0$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" 
time $(RUNTIME) $(RUNTIME_FLAGS) ./gmcs2.exe $(USE_MCS_FLAGS) $(DEBUG_FLAGS) -2 
/target:exe /debug /out:$@ $^
 
 gmcs4.exe: gmcs3.exe
-       MONO_PATH="../class/lib/net_2_0$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" 
time $(RUNTIME) ./gmcs3.exe $(USE_MCS_FLAGS) $(DEBUG_FLAGS) -2 /target:exe 
/debug /out:$@ $^
+       MONO_PATH="../class/lib/net_2_0$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" 
time $(RUNTIME) $(RUNTIME_FLAGS) ./gmcs3.exe $(USE_MCS_FLAGS) $(DEBUG_FLAGS) -2 
/target:exe /debug /out:$@ $^
 
 
 # Testing targets
@@ -68,9 +68,9 @@
 
 do-time : mcs.exe
        @ echo -n "Run 1:   "
-        $(FRIENDLY_TIME) $(RUNTIME) ./mcs.exe $(USE_MCS_FLAGS) /target:exe 
/out:mcs2.exe $(all_sources) > /dev/null || (echo FAILED; exit 1)
+        $(FRIENDLY_TIME) $(RUNTIME) $(RUNTIME_FLAGS) ./mcs.exe 
$(USE_MCS_FLAGS) /target:exe /out:mcs2.exe $(all_sources) > /dev/null || (echo 
FAILED; exit 1)
        @ echo -n "Run 2:   "
-       @ $(FRIENDLY_TIME) $(RUNTIME) ./mcs2.exe $(USE_MCS_FLAGS) /target:exe 
/out:mcs3.exe $(all_sources) > /dev/null || (echo FAILED; exit 1)
+       @ $(FRIENDLY_TIME) $(RUNTIME) $(RUNTIME_FLAGS) ./mcs2.exe 
$(USE_MCS_FLAGS) /target:exe /out:mcs3.exe $(all_sources) > /dev/null || (echo 
FAILED; exit 1)
        @ echo -n "corlib:  "
        @ rm -f ../class/lib/mscorlib.dll
        @ (cd ../class/corlib ; make BOOTSTRAP_MCS="$(FRIENDLY_TIME) mono 
../../mcs/mcs.exe" > /dev/null ) || (echo FAILED; exit 1)
@@ -84,5 +84,5 @@
 
 profile : gmcs2.exe
        -rm -f gmcs3.exe
-       make gmcs3.exe RUNTIME="$(RUNTIME) --profile=$(PROFILER)"
+       make gmcs3.exe RUNTIME_FLAGS='--profile=$(PROFILER)'
 

Modified: trunk/mcs/mbas/Test/misc/Makefile
===================================================================
--- trunk/mcs/mbas/Test/misc/Makefile   2005-04-25 13:06:17 UTC (rev 43544)
+++ trunk/mcs/mbas/Test/misc/Makefile   2005-04-25 13:42:51 UTC (rev 43545)
@@ -7,7 +7,7 @@
 test-local: WriteOK.exe
 
 run-test-local: WriteOK.exe
-       $(RUNTIME) --debug WriteOK.exe --sayho /about -say:this,that,those 
/say:what?
+       $(RUNTIME) $(RUNTIME_FLAGS) --debug WriteOK.exe --sayho /about 
-say:this,that,those /say:what?
 
 run-test-ondotnet-local: WriteOK.exe
        ./WriteOK.exe --sayho /about -say:this,that,those /say:what?
@@ -25,7 +25,7 @@
 
 profile: *.vb *.mbs Makefile
        rm -f WriteOK.exe
-       $(MAKE) RUNTIME='$(RUNTIME) --profile' WriteOK.exe > profile
+       $(MAKE) RUNTIME_FLAGS='--profile' WriteOK.exe > profile
 
 clean-local:
        -rm -f WriteOK.exe aspx_temp.dll x.exe

Modified: trunk/mcs/mcs/Makefile
===================================================================
--- trunk/mcs/mcs/Makefile      2005-04-25 13:06:17 UTC (rev 43544)
+++ trunk/mcs/mcs/Makefile      2005-04-25 13:42:51 UTC (rev 43545)
@@ -41,10 +41,10 @@
        ls -l mcs2.exe mcs3.exe
 
 mcs2.exe: $(PROGRAM)
-       $(TIME) $(RUNTIME) $(PROGRAM) $(USE_MCS_FLAGS) /target:exe /out:$@ 
$(BUILT_SOURCES) @$(response)
+       $(TIME) $(RUNTIME) $(RUNTIME_FLAGS) $(PROGRAM) $(USE_MCS_FLAGS) 
/target:exe /out:$@ $(BUILT_SOURCES) @$(response)
 
 mcs3.exe: mcs2.exe
-       $(TIME) $(RUNTIME) ./mcs2.exe $(USE_MCS_FLAGS) /target:exe /out:$@ 
$(BUILT_SOURCES) @$(response)
+       $(TIME) $(RUNTIME) $(RUNTIME_FLAGS) ./mcs2.exe $(USE_MCS_FLAGS) 
/target:exe /out:$@ $(BUILT_SOURCES) @$(response)
 
 wc:
        wc -l $(BUILT_SOURCES) `cat $(sourcefile)`
@@ -73,5 +73,5 @@
 PROFILER=default
 
 profile : $(PROGRAM)
-       $(RUNTIME) --profile=$(PROFILER) $(PROGRAM) $(USE_MCS_FLAGS) 
/target:exe /out:mcs2.exe $(BUILT_SOURCES) @$(response)
+       $(RUNTIME) $(RUNTIME_FLAGS) --profile=$(PROFILER) $(PROGRAM) 
$(USE_MCS_FLAGS) /target:exe /out:mcs2.exe $(BUILT_SOURCES) @$(response)
 

Modified: trunk/mcs/tests/Makefile
===================================================================
--- trunk/mcs/tests/Makefile    2005-04-25 13:06:17 UTC (rev 43544)
+++ trunk/mcs/tests/Makefile    2005-04-25 13:42:51 UTC (rev 43545)
@@ -165,7 +165,7 @@
        $(BOOT_COMPILE) -target:exe /out:$@ $<
 
 casts.cs: bootstrap-cast.exe
-       $(with_mono_path) $(RUNTIME) $< >$@
+       $(with_mono_path) $(RUNTIME) $(RUNTIME_FLAGS) $< >$@
 
 casts-mcs.exe: casts.cs
        $(CSCOMPILE) -target:exe /out:$@ $<
@@ -174,10 +174,10 @@
        $(BOOT_COMPILE) -target:exe /out:$@ $<
 
 boot-casts.out: casts-boot.exe
-       $(with_mono_path) $(RUNTIME) $< >$@
+       $(with_mono_path) $(RUNTIME) $(RUNTIME_FLAGS) $< >$@
 
 mcs-casts.out: casts-mcs.exe
-       $(with_mono_path) $(RUNTIME) $< >$@
+       $(with_mono_path) $(RUNTIME) $(RUNTIME_FLAGS) $< >$@
 
 test-casts: boot-casts.out mcs-casts.out
        cmp $^

Modified: trunk/mcs/tools/cilc/Makefile
===================================================================
--- trunk/mcs/tools/cilc/Makefile       2005-04-25 13:06:17 UTC (rev 43544)
+++ trunk/mcs/tools/cilc/Makefile       2005-04-25 13:42:51 UTC (rev 43545)
@@ -27,7 +27,7 @@
 
 run-cilc-test: cilc.exe Demo.dll
        rm -rf generated
-       $(RUNTIME) cilc.exe Demo.dll generated
+       $(RUNTIME) $(RUNTIME_FLAGS) cilc.exe Demo.dll generated
        $(MAKE) -C generated
        $(CCOMPILE) -Wall `pkg-config --cflags --libs glib-2.0 mono` 
-Igenerated -Lgenerated -ldemo demo.c -o generated/demo
 

Modified: trunk/mcs/tools/sqlsharp/Makefile
===================================================================
--- trunk/mcs/tools/sqlsharp/Makefile   2005-04-25 13:06:17 UTC (rev 43544)
+++ trunk/mcs/tools/sqlsharp/Makefile   2005-04-25 13:42:51 UTC (rev 43545)
@@ -16,4 +16,4 @@
        $(TEST_RUNTIME) $(PROGRAM) -A $(PROGRAM) $(ARGS)
 
 run: $(PROGRAM)
-       $(RUNTIME) $(PROGRAM) $(ARGS)
+       $(RUNTIME) $(RUNTIME_FLAGS) $(PROGRAM) $(ARGS)

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to