X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=d86ea5c6788ca450c1cc48f0796c98f108436a7d;hb=db2c07c6c99bda0ad0c3c919db93e13cd8f58a34;hp=c953e755090ed65a13e4e15bbda6ff3ef64103f8;hpb=423cbb8537888da9e1f4c7eb94e464854a26a4af;p=mono.git diff --git a/Makefile.am b/Makefile.am index c953e755090..d86ea5c6788 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,11 @@ AUTOMAKE_OPTIONS = foreign +ACLOCAL_AMFLAGS = -I . -SUBDIRS = @libgc_dir@ mono @ikvm_jni_dir@ docs runtime scripts man data samples support web +SUBDIRS = $(libgc_dir) mono $(ikvm_jni_dir) docs data runtime scripts man samples support web # Keep in sync with SUBDIRS ## 'tools' is not normally built -DIST_SUBDIRS = libgc mono ikvm-jni docs runtime scripts man data samples support web tools +DIST_SUBDIRS = libgc mono ikvm-jni docs data runtime scripts man samples support web tools EXTRA_DIST= mono.pc.in mono.spec.in mint.pc.in @@ -17,16 +18,17 @@ endif DISTCLEANFILES= mono.pc mint.pc # -# The following target is used to compile and install +# The following targets are used to compile and install # mono and mcs without running into the out-of-sync # problems by doing the compilation in the right order. # mcs_topdir=$(top_srcdir)/../mcs -.PHONY: tmpinst-dir tmpinst-basic-build tmpinst-short-build tmpinst-full-build -.PHONY: bootstrap faststrap fasterstrap one-stage-strap two-stage-strap three-stage-strap bootstrap-clean bootstrap-check -.PHONY: mono-do-basic-build mcs-do-basic-build mcs-do-short-build mcs-do-full-build mcs-do-clean-profiles mcs-do-run-test +.PHONY: bootstrap faststrap fasterstrap bootstrap-clean bootstrap-check get-monolite-latest monolite-bootstrap +.PHONY: tmpinst-dir tmpinst-mcs-basic-build tmpinst-mcs-short-build tmpinst-mcs-full-build tmpinst-monolite +.PHONY: mono-do-runtime-only mcs-do-basic-build mcs-do-short-build mcs-do-full-build mcs-do-clean-profiles mcs-do-run-test +.PHONY: populate-runtime-subdir if USE_JIT mono_runtime = mono/mini/mono @@ -34,74 +36,100 @@ else mono_runtime = mono/interpreter/mint endif -bootstrap: three-stage-strap +# Minimal set of directories to build, and files used to run the 'mcs' compiler +MCS_BASIC_DIRS = jay mcs class/corlib class/System +MCS_BASIC_FILES = \ + $(mcs_topdir)/mcs/mcs.exe \ + $(mcs_topdir)/class/lib/default/mscorlib.dll \ + $(mcs_topdir)/class/lib/default/System.dll -faststrap: mono-do-basic-build - $(MAKE) two-stage-strap +# Set of directories and files the 'mcs' compiler can use +## We build class/System twice to resolve the cyclic dependency of class/System.XML +MCS_DIRS = $(MCS_BASIC_DIRS) class/System.XML class/System class/Mono.CSharp.Debugger +MCS_FILES = $(MCS_BASIC_FILES) \ + $(mcs_topdir)/class/lib/default/System.Xml.dll \ + $(mcs_topdir)/class/lib/default/Mono.CSharp.Debugger.dll -fasterstrap: mono-do-basic-build - $(MAKE) one-stage-strap +tmpinst = _tmpinst -three-stage-strap: tmpinst-basic-build - $(MAKE) two-stage-strap +if PLATFORM_WIN32 -two-stage-strap: tmpinst-short-build - $(MAKE) one-stage-strap +populate_profiles = default:net_1_1 -one-stage-strap: tmpinst-full-build - rm -f $(top_srcdir)/runtime/*/*.dll $(top_srcdir)/runtime/*.exe +# bootstraps using the .NET C# compiler +bootstrap: tmpinst-dir mono-do-runtime-only + $(MAKE) fasterstrap + +else + +populate_profiles = default:net_1_1 net_2_0:net_2_0 + +bootstrap: tmpinst-mcs-basic-build mono-do-runtime-only + $(MAKE) tmpinst-mcs-short-build + $(MAKE) fasterstrap + +endif + +faststrap: tmpinst-mcs-short-build + $(MAKE) mono-do-runtime-only + $(MAKE) fasterstrap + +fasterstrap: tmpinst-mcs-full-build + $(MAKE) populate-runtime-subdir $(MAKE) bootstrap-clean: clean mcs-do-clean-profiles bootstrap-check: check mcs-do-run-test -# (takes advantage of 'make -j': independent subtasks are separate dependencies) -tmpinst-basic-build: mcs-do-basic-build mono-do-basic-build tmpinst-dir - mv -f $(mcs_topdir)/mcs/mcs.exe \ - $(mcs_topdir)/class/lib/default/mscorlib.dll \ - $(mcs_topdir)/class/lib/default/System.dll \ - _tmpinst/lib - -tmpinst-short-build: mcs-do-short-build - mv -f $(mcs_topdir)/mcs/mcs.exe \ - $(mcs_topdir)/class/lib/default/mscorlib.dll \ - $(mcs_topdir)/class/lib/default/System.dll \ - $(mcs_topdir)/class/lib/default/System.Xml.dll \ - $(mcs_topdir)/class/lib/default/Mono.CSharp.Debugger.dll \ - _tmpinst/lib - -tmpinst-full-build: mcs-do-full-build - cp -f $(mcs_topdir)/mcs/mcs.exe \ - $(mcs_topdir)/class/lib/default/mscorlib.dll \ - $(mcs_topdir)/class/lib/default/System.dll \ - $(mcs_topdir)/class/lib/default/System.Xml.dll \ - $(mcs_topdir)/class/lib/default/Mono.CSharp.Debugger.dll \ - _tmpinst/lib +# building with monolite + +get-monolite-latest: + wget -O $(srcdir)/../monolite-latest.tar.gz http://www.go-mono.com/daily/monolite-latest.tar.gz + +monolite-bootstrap: tmpinst-monolite mono-do-runtime-only + rm -f $(MCS_FILES) + $(MAKE) tmpinst-mcs-short-build + $(MAKE) fasterstrap + +# internal targets + +tmpinst-mcs-basic-build: mcs-do-basic-build tmpinst-dir + mv -f $(MCS_BASIC_FILES) $(tmpinst)/lib + +tmpinst-mcs-short-build: mcs-do-short-build tmpinst-dir + mv -f $(MCS_FILES) $(tmpinst)/lib + +tmpinst-mcs-full-build: mcs-do-full-build tmpinst-dir + cp -f $(MCS_FILES) $(tmpinst)/lib + +tmpinst-monolite: tmpinst-dir + -rm -f $(tmpinst)/lib/mcs.exe $(tmpinst)/lib/*.dll + -rm -fr $(tmpinst)/monolite-* + srcdir=`cd $(srcdir) && pwd` && cd $(tmpinst) && ( gzip -d -c $$srcdir/../monolite-latest.tar.gz | tar xf - ) + mv -f $(tmpinst)/monolite-*/mcs.exe $(tmpinst)/monolite-*/*.dll $(tmpinst)/lib + rm -fr $(tmpinst)/monolite-* # Build enough of 'mono' to run the stage1 mcs.exe -mono-do-basic-build: $(CONFIG_HEADER) - if test -z "$(libgc_dir)"; then :; else cd libgc && $(MAKE) ; fi - cd mono && $(MAKE) - -# Build stripped down versions of 'mcs', 'mscorlib.dll' and 'System.dll' with installed 'mcs' -## remove System.Xml.dll since it's a soft-dependency of System.dll -mcs-do-basic-build: - rm -f $(mcs_topdir)/mcs/mcs.exe $(mcs_topdir)/class/lib/default/mscorlib.dll - rm -f $(mcs_topdir)/class/lib/default/System.dll $(mcs_topdir)/class/lib/default/System.Xml.dll - cd $(mcs_topdir)/jay && $(MAKE) - cd $(mcs_topdir)/mcs && $(MAKE) PROFILE=default BOOTSTRAP_MCS="mcs -d:BOOTSTRAP_WITH_OLDLIB" - cd $(mcs_topdir)/class/corlib && $(MAKE) PROFILE=default BOOTSTRAP_MCS="mcs -d:BOOTSTRAP_WITH_OLDLIB" - cd $(mcs_topdir)/class/System && $(MAKE) PROFILE=default BOOTSTRAP_MCS="mcs -d:BOOTSTRAP_WITH_OLDLIB" MCS="mcs -d:BOOTSTRAP_WITH_OLDLIB" +mono-do-runtime-only: $(CONFIG_HEADER) + for dir in $(libgc_dir) mono data; do \ + (cd $$dir && $(MAKE)) || exit 1 ; \ + done + +mcs-do-basic-build: + rm -f $(MCS_FILES) + for dir in $(MCS_BASIC_DIRS); do \ + (cd $(mcs_topdir)/$$dir && $(MAKE) PROFILE=default NO_SIGN_ASSEMBLY=yes USE_BOOT_COMPILE=yes BOOTSTRAP_MCS="mcs -d:BOOTSTRAP_WITH_OLDLIB") || exit 1 ; \ + done mcs-do-short-build: - tmpinst=`cd _tmpinst && pwd` ; \ + tmpinst=`cd $(tmpinst) && pwd` ; \ PATH=$$tmpinst/bin:$$PATH; export PATH ; \ - for dir in jay mcs class/corlib class/System class/System.XML class/System class/Mono.CSharp.Debugger; do \ - (cd $(mcs_topdir)/$$dir && $(MAKE) PROFILE=default) || exit 1 ; \ + for dir in $(MCS_DIRS); do \ + (cd $(mcs_topdir)/$$dir && $(MAKE) PROFILE=default NO_SIGN_ASSEMBLY=yes) || exit 1 ; \ done mcs-do-full-build: - tmpinst=`cd _tmpinst && pwd` ; \ + tmpinst=`cd $(tmpinst) && pwd` ; \ PATH=$$tmpinst/bin:$$PATH ; export PATH ; \ cd $(mcs_topdir) && $(MAKE) all-profiles @@ -109,44 +137,62 @@ mcs-do-clean-profiles: cd $(mcs_topdir) && $(MAKE) clean-profiles mcs-do-run-test: tmpinst-dir - tmpinst=`cd _tmpinst && pwd` ; \ + tmpinst=`cd $(tmpinst) && pwd` ; \ PATH=$$tmpinst/bin:$$PATH ; export PATH ; \ cd $(mcs_topdir) && $(MAKE) PROFILE=default run-test -tmpinst-dir.stamp: Makefile.am - set -e ; \ - rootme=`pwd`; tmpinst=$$rootme/_tmpinst ; \ - mkdir -p $$tmpinst $$tmpinst/bin $$tmpinst/lib ; \ - echo '#! /bin/sh' > $$tmpinst/bin/mono ; \ - echo 'if test -z "$$MONO_PATH" ; then MONO_PATH="'"$$tmpinst/lib"'"' >> $$tmpinst/bin/mono ; \ - echo 'else MONO_PATH=$${MONO_PATH}:"'"$$tmpinst/lib"'" ; fi' >> $$tmpinst/bin/mono ; \ - echo 'export MONO_PATH' >> $$tmpinst/bin/mono ; \ - echo 'exec "'"$$rootme/libtool"'" --mode=execute "'"$$rootme/$(mono_runtime)"'" "$$@"' >> $$tmpinst/bin/mono ; \ - echo '#! /bin/sh' > $$tmpinst/bin/mcs ; \ - echo 'exec "'"$$tmpinst/bin/mono"'" "'"$$tmpinst/lib/mcs.exe"'" "$$@"' >> $$tmpinst/bin/mcs ; \ - chmod +x $$tmpinst/bin/mono $$tmpinst/bin/mcs - echo "stamp" > $@ +populate-runtime-subdir: + test -n '$(populate_profiles)' + @srcdir=`cd $(srcdir) && pwd`; tmpinst=`pwd`/$(tmpinst) ; \ + PATH=$$tmpinst/bin:$$PATH ; export PATH ; \ + for profile in $(populate_profiles); do \ + ( set fnord `echo $$profile | sed 's,:, ,g'` && \ + echo "cd $(mcs_topdir) && $(MAKE) PROGRAM_INSTALL_DIR=$$srcdir/runtime PROFILE=$$2 LIBRARY_INSTALL_DIR=$$srcdir/runtime/$$3 prefix=$$tmpinst/prefix install" && \ + cd $(mcs_topdir) && \ + $(MAKE) PROGRAM_INSTALL_DIR=$$srcdir/runtime PROFILE=$$2 LIBRARY_INSTALL_DIR=$$srcdir/runtime/$$3 prefix=$$tmpinst/prefix install ) || exit 1 ; \ + done + find $(tmpinst)/prefix -type f -path '*/jay*' -exec rm -f '{}' ';' + test -z "`find $(tmpinst)/prefix -type f -print`" + rm -rf $(tmpinst)/prefix -tmpinst-dir: tmpinst-dir.stamp - @if test -d _tmpinst; then :; else rm -f tmpinst-dir.stamp; $(MAKE) tmpinst-dir.stamp; fi +tmpinst-dir: + mkdir -p $(tmpinst) $(tmpinst)/bin $(tmpinst)/lib $(tmpinst)/etc/mono/1.0 + $(MAKE) tmpinst-dir-contents +tmpinst-dir-contents: $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/etc/mono/1.0/machine.config -# building with monolite +if PLATFORM_WIN32 -get-monolite-latest: - wget -O $(srcdir)/../monolite-latest.tar.gz http://www.go-mono.com/daily/monolite-latest.tar.gz +$(tmpinst)/bin/mono: $(srcdir)/Makefile.am + echo '#! /bin/sh' > $@ + echo 'builddir="'`pwd`'"; win_builddir="'`cygpath -w -a .`'"' >> $@ + echo 'tmpinst="$$win_builddir\\$(tmpinst)"' >> $@ + echo 'if test -z "$$MONO_PATH" ; then MONO_PATH="$$tmpinst\\lib"; else MONO_PATH="$${MONO_PATH};$$tmpinst\\lib" ; fi' >> $@ + echo 'MONO_CFG_DIR="$$tmpinst\\etc"' >> $@ + echo 'export MONO_PATH MONO_CFG_DIR' >> $@ + echo 'exec "$$builddir/libtool" --mode=execute "$$builddir/$(mono_runtime).exe" "$$@"' >> $@ + chmod +x $@ -tmpinst-monolite: tmpinst-dir - -rm -f _tmpinst/lib/mcs.exe _tmpinst/lib/*.dll - -rm -fr _tmpinst/monolite-* - srcdir=`cd $(srcdir) && pwd` && cd _tmpinst && ( gzip -d -c $$srcdir/../monolite-latest.tar.gz | tar xf - ) - mv -f _tmpinst/monolite-*/mcs.exe _tmpinst/monolite-*/*.dll _tmpinst/lib - rm -fr _tmpinst/monolite-* +else + +$(tmpinst)/bin/mono: $(srcdir)/Makefile.am + echo '#! /bin/sh' > $@ + echo 'builddir="'`pwd`'"; tmpinst=$$builddir/$(tmpinst)' >> $@ + echo 'if test -z "$$MONO_PATH" ; then MONO_PATH=$$tmpinst/lib; else MONO_PATH=$${MONO_PATH}:$$tmpinst/lib ; fi' >> $@ + echo 'MONO_CFG_DIR=$$tmpinst/etc' >> $@ + echo 'export MONO_PATH MONO_CFG_DIR' >> $@ + echo 'exec "$$builddir/libtool" --mode=execute "$$builddir/$(mono_runtime)" --config "$$builddir/data/config" "$$@"' >> $@ + chmod +x $@ + +endif + +$(tmpinst)/bin/mcs: $(srcdir)/Makefile.am + (t=`cd $(tmpinst) && pwd`; echo '#! /bin/sh'; echo 'exec "'"$$t/bin/mono"'" "'"$$t/lib/mcs.exe"'" "$$@"') > $@ + chmod +x $@ -monolite-bootstrap: tmpinst-monolite mono-do-basic-build - rm -f $(mcs_topdir)/mcs/mcs.exe $(mcs_topdir)/class/lib/default/mscorlib.dll - rm -f $(mcs_topdir)/class/lib/default/System.dll $(mcs_topdir)/class/lib/default/System.Xml.dll Mono.CSharp.Debugger.dll - $(MAKE) two-stage-strap +$(tmpinst)/etc/mono/1.0/machine.config: $(srcdir)/data/net_1_1/machine.config + rm -f $@ + srcdir=`cd $(srcdir) && pwd`; cd $(tmpinst)/etc/mono/1.0 && $(LN_S) $$srcdir/data/net_1_1/machine.config machine.config # Obsolete target -- don't use. .PHONY: fullbuild @@ -173,4 +219,3 @@ win32getdeps: win32setup: makensis /DMILESTONE=$(VERSION) /DSOURCE_INSTALL_DIR=$(SOURCE_INSTALL_DIR) /DBUILDNUM=$(BUILDNUM) monowiz.win32.nsi - #makensis /DMILESTONE=$(VERSION) /DSOURCE_INSTALL_DIR=`cygpath -a -w c:/cygwin/home/propietario/go-mono/windowswizard/wins`\\* monowiz.win32.nsi