In .:

* configure.in (runtime/etc/mono/1.0/machine.config): Use custom
command to create.
(runtime/etc/mono/2.0/machine.config): Likewise.
* Makefile.am (get-monolite-latest): Update to new style of
handling the "basic" profile.

In mono/mini:
* Makefile.am: Consistently use $(RUNTIME) rather than ./mono to
pick up in-tree mscorlib.dll.

In mono/tests:
* Makefile.am: Ensure that in-tree mscorlib.dll is used for testing.

svn path=/trunk/mono/; revision=36630

ChangeLog

@@ -1,3 +1,11 @@
+2004-11-26  Raja R Harinath  <[email protected]>
+
+	* configure.in (runtime/etc/mono/1.0/machine.config): Use custom
+	command to create.
+	(runtime/etc/mono/2.0/machine.config): Likewise.
+	* Makefile.am (get-monolite-latest): Update to new style of
+	handling the "basic" profile.
+
 2004-11-25  Raja R Harinath  <[email protected]>
 
 	* runtime/Makefile.am (all-local): Make mcs/ tree writeable if

Makefile.am

@@ -25,14 +25,17 @@ DISTCLEANFILES= mono.pc mint.pc
 .PHONY: get-monolite-latest mcs-do-compiler-tests compiler-tests bootstrap-world
 
 # building with monolite
-monolitedir = $(mcs_topdir)/class/lib/basic
+mcsclassdir = $(mcs_topdir)/class
+monolitedir = $(mcsclassdir)/lib/basic
 get-monolite-latest:
-	wget -O $(srcdir)/../monolite-latest.tar.gz http://www.go-mono.com/daily/monolite-latest.tar.gz
-	-rm -f $(monolitedir)/mcs.exe $(monolitedir)/*.dll
-	-rm -fr $(monolitedir)//monolite-*
-	srcdir=`cd $(srcdir) && pwd` && cd $(monolitedir) && ( gzip -d -c $$srcdir/../monolite-latest.tar.gz | tar xf - )
-	mv -f $(monolitedir)/monolite-*/mcs.exe $(monolitedir)/monolite-*/*.dll $(monolitedir)
+	-rm -f $(monolitedir)/*.exe $(monolitedir)/*.dll
+	-rm -fr $(monolitedir)/monolite-*
+	cd $(monolitedir) && { wget -O- http://www.go-mono.com/daily/monolite-latest.tar.gz | gzip -d | tar xf - ; }
+	mv -f $(monolitedir)/monolite-*/*.exe $(monolitedir)/monolite-*/*.dll $(monolitedir)
 	rm -fr $(monolitedir)/monolite-*
+	cd $(mcsclassdir)/lib && { test ! -f basic.tar.gz || mv -f basic.tar.gz basic.tar.gz.old; }
+	cd $(mcsclassdir) && $(MAKE) lib/basic.tar.gz
+	-rm -f $(monolitedir)/*.exe $(monolitedir)/*.dll
 
 compiler-tests:
 	cd runtime && $(MAKE) clean-local

configure.in

@@ -6,6 +6,13 @@ AM_MAINTAINER_MODE
 
 AC_PROG_LN_S
 
+# In case of cygwin, override LN_S, irrespective of what it determines.
+# The build uses cygwin, but the actual runtime doesn't.
+case $host_os in
+*cygwin* ) LN_S='cp -p';;
+esac
+
+
 dnl
 dnl libgc checks
 dnl
@@ -1482,8 +1489,34 @@ fi
 AC_SUBST(mono_cfg_dir)
 
 AC_CONFIG_FILES([runtime/mono-wrapper],[chmod +x runtime/mono-wrapper])
-AC_CONFIG_LINKS([runtime/etc/mono/1.0/machine.config:data/net_1_1/machine.config 
-                 runtime/etc/mono/2.0/machine.config:data/net_2_0/machine.config])
+
+AC_CONFIG_COMMANDS([runtime/etc/mono/1.0/machine.config],
+[   depth=../../../..
+    case $srcdir in
+    [\\/$]* | ?:[\\/]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/1.0
+    cd runtime/etc/mono/1.0
+    rm -f machine.config
+    $LN_S $reldir/data/net_1_1/machine.config machine.config
+    cd $depth
+],[LN_S='$LN_S'])
+
+AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/machine.config],
+[   depth=../../../..
+    case $srcdir in
+    [\\/$]* | ?:[\\/]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/2.0
+    cd runtime/etc/mono/2.0
+    rm -f machine.config
+    $LN_S $reldir/data/net_2_0/machine.config machine.config
+    cd $depth
+],[LN_S='$LN_S'])
 
 AC_OUTPUT([
 Makefile

mono/mini/ChangeLog

@@ -1,3 +1,8 @@
+2004-11-26  Raja R Harinath  <[email protected]>
+
+	* Makefile.am: Consistently use $(RUNTIME) rather than ./mono to
+	pick up in-tree mscorlib.dll.
+
 2004-11-25  Zoltan Varga  <[email protected]>
 
 	* aot.c: Rename MonoAOTModule->cleanup to out_of_date.

mono/mini/Makefile.am

@@ -31,10 +31,10 @@ static_libs=	\
 	$(libgc_static_libs) \
 	$(ICU_LIBS)
 
-RUNTIME = $(LIBTOOL) --mode=execute ./mono --config $(top_builddir)/data/config
+RUNTIME = MONO_PATH=$(mcs_topdir)/class/lib/default ./mono --config $(top_builddir)/data/config
 
-MCS = MONO_PATH=$(mcs_topdir)/class/lib/default $(RUNTIME) $(mcs_topdir)/class/lib/default/mcs.exe --unsafe -nowarn:0162
-ILASM = MONO_PATH=$(mcs_topdir)/class/lib/default $(RUNTIME) $(mcs_topdir)/ilasm/ilasm.exe
+MCS = $(RUNTIME) $(mcs_topdir)/class/lib/default/mcs.exe --unsafe -nowarn:0162
+ILASM = $(RUNTIME) $(mcs_topdir)/ilasm/ilasm.exe
 
 INCLUDES = \
 	-I$(top_srcdir) 	\
@@ -286,36 +286,36 @@ inssel.c inssel.h: $(BURGSRC)
 	$(monodir)/mono/monoburg/monoburg -c 1 -p -e $(BURGSRC) -d inssel.h -s inssel.c
 
 testi: mono test.exe
-	./mono -v -v --ncompile 1 --compile Test:$(mtest) test.exe
+	$(RUNTIME) -v -v --ncompile 1 --compile Test:$(mtest) test.exe
 
 # ensure the tests are actually correct
 checktests: $(regtests)
 	for i in $(regtests); do $(RUNTIME) $$i; done
 
 rcheck: mono $(regtests)
-	./mono --regression $(regtests)
+	$(RUNTIME) --regression $(regtests)
 
 aotcheck: mono $(regtests)
-	for i in $(regtests); do ./mono --aot $$i; done
-	./mono --verbose --regression $(regtests)
+	for i in $(regtests); do $(RUNTIME) --aot $$i; done
+	$(RUNTIME) --verbose --regression $(regtests)
 	rm -f *.exe.so
 
 bench: mono test.exe
-	time ./mono --ncompile $(count) --compile Test:$(mtest) test.exe
+	time env $(RUNTIME) --ncompile $(count) --compile Test:$(mtest) test.exe
 
 mbench: test.exe
 	time $(monodir)/mono/jit/mono --ncompile $(count) --compile Test:$(mtest) test.exe
 
 stat1: mono bench.exe
-	./mono --verbose --statfile stats.pl --regression bench.exe
+	$(RUNTIME) --verbose --statfile stats.pl --regression bench.exe
 	perl viewstat.pl stats.pl
 
 stat2: mono basic.exe
-	./mono --verbose --statfile stats.pl --regression basic.exe
+	$(RUNTIME) --verbose --statfile stats.pl --regression basic.exe
 	perl viewstat.pl -e stats.pl
 
 stat3: mono bench.exe
-	./mono --statfile stats.pl --ncompile 1000 --compile Tests:test_0_many_nested_loops bench.exe 
+	$(RUNTIME) --statfile stats.pl --ncompile 1000 --compile Tests:test_0_many_nested_loops bench.exe 
 	perl viewstat.pl stats.pl
 
 docu: mini.sgm

mono/tests/ChangeLog

@@ -1,3 +1,7 @@
+2004-11-26  Raja R Harinath  <[email protected]>
+
+	* Makefile.am: Ensure that in-tree mscorlib.dll is used for testing.
+
 2004-11-23  Raja R Harinath  <[email protected]>
 
 	* Makefile.am (CSC,ILASM): Don't refer to runtime/ directly.  Use

mono/tests/Makefile.am

@@ -1,14 +1,17 @@
 check-local: test
 
-TEST_PROG=../interpreter/mint
-JITTEST_PROG=../mini/mono
+TEST_PROG = ../interpreter/mint
+JITTEST_PROG = ../mini/mono
+
+TEST_PROG_RUN = MONO_PATH=$(mcs_topdir)/class/lib/default $(LIBTOOL) --mode=execute $(TEST_PROG)
+JITTEST_PROG_RUN = MONO_PATH=$(mcs_topdir)/class/lib/default $(LIBTOOL) --mode=execute $(JITTEST_PROG)
+
 RUNTIME_ARGS=--config tests-config --optimize=all
-#CSC=csc /unsafe
 
-RUNTIME = $(top_builddir)/runtime/mono-wrapper
+RUNTIME = MONO_PATH=$(mcs_topdir)/class/lib/default $(top_builddir)/runtime/mono-wrapper
 
-CSC = MONO_PATH=$(mcs_topdir)/class/lib/default $(RUNTIME) $(mcs_topdir)/class/lib/default/mcs.exe --unsafe -nowarn:0162
-ILASM = MONO_PATH=$(mcs_topdir)/class/lib/default $(RUNTIME) $(mcs_topdir)/ilasm/ilasm.exe
+CSC = $(RUNTIME) $(mcs_topdir)/class/lib/default/mcs.exe --unsafe -nowarn:0162
+ILASM = $(RUNTIME) $(mcs_topdir)/ilasm/ilasm.exe
 
 BENCHSRC=fib.cs random.cs nested-loops.cs ackermann.cs tight-loop.cs sieve.cs
 
@@ -225,7 +228,7 @@ test_cs: $(TEST_PROG) $(TESTSI_CS) libtest.la
 	passed=0; \
 	export LD_LIBRARY_PATH="`pwd`/.libs:$${LD_LIBRARY_PATH}"; \
 	for i in $(TESTSI_CS); do	\
-		if $(srcdir)/test-driver '$(LIBTOOL) --mode=execute $(TEST_PROG)' $$i '$(DISABLED_TESTS)' $(RUNTIME_ARGS); \
+		if $(srcdir)/test-driver '$(TEST_PROG_RUN)' $$i '$(DISABLED_TESTS)' $(RUNTIME_ARGS); \
 		then \
 			passed=`expr $${passed} + 1`; \
 		else \
@@ -240,7 +243,7 @@ test_il: $(TEST_PROG) $(TESTSI_IL) libtest.la
 	passed=0; \
 	export LD_LIBRARY_PATH="`pwd`/.libs:$${LD_LIBRARY_PATH}"; \
 	for i in $(TESTSI_IL); do	\
-		if $(srcdir)/test-driver $(TEST_PROG) $$i "$(DISABLED_TESTS)" $(RUNTIME_ARGS); \
+		if $(srcdir)/test-driver '$(TEST_PROG_RUN)' $$i "$(DISABLED_TESTS)" $(RUNTIME_ARGS); \
 		then \
 			passed=`expr $${passed} + 1`; \
 		else \
@@ -252,17 +255,16 @@ test_il: $(TEST_PROG) $(TESTSI_IL) libtest.la
 
 testb: $(TEST_PROG) $(TESTBS)
 	for i in $(TESTBS); do	\
-		$(srcdir)/test-driver $(TEST_PROG) $$i "$(DISABLED_TESTS)" $(RUNTIME_ARGS);	\
+		$(srcdir)/test-driver '$(TEST_PROG_RUN)' $$i '$(DISABLED_TESTS)' $(RUNTIME_ARGS);	\
 	done
 
 testjit: $(TESTSI_CS) $(TESTSI_IL) $(TESTBS) libtest.la
 	@failed=0; \
 	passed=0; \
 	failed_tests="";\
-	export LD_LIBRARY_PATH="`pwd`/.libs:$${LD_LIBRARY_PATH}"; \
 	for i in $(TESTSI_CS) $(TESTBS) $(TESTSI_IL); do	\
 		rm -f $${i}.so; \
-		if $(srcdir)/test-driver $(JITTEST_PROG) $$i "$(DISABLED_TESTS)" $(RUNTIME_ARGS); \
+		if $(srcdir)/test-driver '$(JITTEST_PROG_RUN)' $$i '$(DISABLED_TESTS)' $(RUNTIME_ARGS); \
 		then \
 			passed=`expr $${passed} + 1`; \
 		else \
@@ -282,7 +284,7 @@ testaot: $(TESTSI_CS) $(TESTBS) libtest.la
 	for i in $(TESTSI_CS) $(TESTBS); do	\
 		rm -f $${i}.so; \
 		$(JITTEST_PROG) --aot $${i} > /dev/null; \
-		if $(srcdir)/test-driver $(JITTEST_PROG) $$i "$(DISABLED_TESTS)" $(RUNTIME_ARGS); \
+		if $(srcdir)/test-driver '$(JITTEST_PROG_RUN)' $$i "$(DISABLED_TESTS)" $(RUNTIME_ARGS); \
 		then \
 			passed=`expr $${passed} + 1`; \
 		else \
@@ -300,7 +302,7 @@ testinterp: $(TESTSI_CS) $(TESTSI_IL) libtest.la
 	failed_tests="";\
 	export LD_LIBRARY_PATH="`pwd`/.libs:$${LD_LIBRARY_PATH}"; \
 	for i in $(TESTSI_CS) $(TESTSI_IL); do \
-		if $(srcdir)/test-driver $(TEST_PROG) $$i "$(DISABLED_TESTS)" $(RUNTIME_ARGS); \
+		if $(srcdir)/test-driver '$(TEST_PROG_RUN)' $$i "$(DISABLED_TESTS)" $(RUNTIME_ARGS); \
 		then \
 			passed=`expr $${passed} + 1`; \
 		else \