X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=4a0d5a4c42eccbdb4d608c3d864870b2a95e594b;hb=b81061ba4c26e9011c1e61108aea365ba8e78ccc;hp=1a457c69f244ebd771cd6495015fbec0718a9068;hpb=29244a261b9ef1e29ee05a2b235f879f22e695dc;p=mono.git

diff --git a/Makefile.am b/Makefile.am
index 1a457c69f24..4a0d5a4c42e 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
 
@@ -27,6 +28,7 @@ mcs_topdir=$(top_srcdir)/../mcs
 .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
@@ -50,16 +52,30 @@ MCS_FILES = $(MCS_BASIC_FILES) \
 
 tmpinst = _tmpinst
 
+if PLATFORM_WIN32
+
+populate_profiles = default:net_1_1
+
+# 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
-	rm -f $(top_srcdir)/runtime/*/*.dll $(top_srcdir)/runtime/*.exe
+	$(MAKE) populate-runtime-subdir
 	$(MAKE)
 
 bootstrap-clean: clean mcs-do-clean-profiles
@@ -80,10 +96,10 @@ monolite-bootstrap: tmpinst-monolite mono-do-runtime-only
 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-mcs-short-build: mcs-do-short-build tmpinst-dir
 	mv -f $(MCS_FILES) $(tmpinst)/lib
 
-tmpinst-mcs-full-build: mcs-do-full-build
+tmpinst-mcs-full-build: mcs-do-full-build tmpinst-dir
 	cp -f $(MCS_FILES) $(tmpinst)/lib
 
 tmpinst-monolite: tmpinst-dir
@@ -102,14 +118,14 @@ mono-do-runtime-only: $(CONFIG_HEADER)
 mcs-do-basic-build:
 	rm -f $(MCS_FILES)
 	for dir in $(MCS_BASIC_DIRS); do \
-	  (cd $(mcs_topdir)/$$dir && $(MAKE) PROFILE=default USE_BOOT_COMPILE=yes BOOTSTRAP_MCS="mcs -d:BOOTSTRAP_WITH_OLDLIB") || exit 1 ; \
+	  (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` ; \
 	PATH=$$tmpinst/bin:$$PATH; export PATH ; \
 	for dir in $(MCS_DIRS); do \
-	  (cd $(mcs_topdir)/$$dir && $(MAKE) PROFILE=default) || exit 1 ; \
+	  (cd $(mcs_topdir)/$$dir && $(MAKE) PROFILE=default NO_SIGN_ASSEMBLY=yes) || exit 1 ; \
 	done
 
 mcs-do-full-build:
@@ -125,9 +141,39 @@ mcs-do-run-test: tmpinst-dir
 	PATH=$$tmpinst/bin:$$PATH ; export PATH ; \
 	cd $(mcs_topdir) && $(MAKE) PROFILE=default run-test
 
+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: 
 	mkdir -p $(tmpinst) $(tmpinst)/bin $(tmpinst)/lib $(tmpinst)/etc/mono
-	$(MAKE) $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/etc/mono/machine.config
+	$(MAKE) tmpinst-dir-contents
+
+tmpinst-dir-contents: $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/etc/mono/machine.config
+
+if PLATFORM_WIN32
+
+$(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 $@
+
+else
 
 $(tmpinst)/bin/mono: $(srcdir)/Makefile.am
 	echo '#! /bin/sh' > $@
@@ -138,6 +184,8 @@ $(tmpinst)/bin/mono: $(srcdir)/Makefile.am
 	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 $@