diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-03-31 20:51:10 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-31 20:51:10 +0300 |
| commit | 500765a5d3d3f13b3a97d1e6155037b1e680d37c (patch) | |
| tree | 76d5e6f4d330891b850caa9790e64421aa1676d6 /Makefile.am | |
| parent | 8dba6fc778ec6dc1d1b17f7abdcd6288676ee37f (diff) | |
Make monolite profile directory versioned (#4631)
If you're building with monolite currently the build system
checks for the existence of mcs/class/lib/monolite and just
uses it in that case.
It becomes a problem when bumping corlib version since if you
pull the update and try to build it'll use the old monolite
and you'll hit the "corlib version not in sync" error.
By making the monolite directory include the version this can
be avoided and everything works out of the box.
Also removed the confusing "You need Mono version 4.8 or better"
message since we actually require a newer version in
basic-profile-check.cs now and keeping them in sync is error prone.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 1dbe3b14a2e..ede76956498 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,10 +44,6 @@ dist-hook: rm -rf `find $(top_distdir)/external -path '*\.git'` rm -f `find $(top_distdir)/external -path '*\.exe' -not -path '*/roslyn-binaries/*'` rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/*' -not -path '*/roslyn-binaries/*'` - cp mcs/class/lib/basic/System.Configuration.dll mcs/class/lib/monolite/ - cp mcs/class/lib/basic/System.Security.dll mcs/class/lib/monolite/ -# Disable this for now because it is very slow and causes wrench to timeout: -# test ! -d $(GIT_DIR) || ./scripts/commits-to-changelog.py --root=$(distdir) last-commit-with-compulsory-changelog-entry pkgconfigdir = $(libdir)/pkgconfig noinst_DATA = mono-uninstalled.pc @@ -55,16 +51,13 @@ DISTCLEANFILES= mono-uninstalled.pc # building with monolite mcslib = $(mcs_topdir)/class/lib -monolite = $(mcslib)/monolite monolite_url = https://download.mono-project.com/monolite/monolite-$(MONO_CORLIB_VERSION)-latest.tar.gz .PHONY: get-monolite-latest get-monolite-latest: - -rm -fr $(mcslib)/monolite-* - -mkdir -p $(mcslib) - test ! -d $(monolite) || test ! -d $(monolite).old || rm -fr $(monolite).old - test ! -d $(monolite) || mv -f $(monolite) $(monolite).old + -rm -fr $(mcslib)/monolite/$(MONO_CORLIB_VERSION) + -mkdir -p $(mcslib)/monolite cd $(mcslib) && { (wget -O- $(monolite_url) || curl -L $(monolite_url)) | gzip -d | tar xf - ; } - cd $(mcslib) && mv -f monolite-* monolite + cd $(mcslib) && mv -f monolite-* monolite/$(MONO_CORLIB_VERSION) if BITCODE BITCODE_CHECK=yes |