diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2004-11-26 14:35:50 +0300 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2004-11-26 14:35:50 +0300 |
| commit | b2916b6c21df9541c2bab080f1d97ba389b25eee (patch) | |
| tree | 4946722fadc355b17671764c3c6b693cca344e93 /Makefile.am | |
| parent | 190f84ec776400400175c8114076f3e51a8ea7e3 (diff) | |
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
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 7cbe5e33191..68155a88387 100644 --- a/Makefile.am +++ b/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 |