diff options
author | Raja R Harinath <harinath@hurrynot.org> | 2004-11-23 13:57:35 +0300 |
---|---|---|
committer | Raja R Harinath <harinath@hurrynot.org> | 2004-11-23 13:57:35 +0300 |
commit | 12abd22382a1c2c5a28e8c3e6f5649b19664a7eb (patch) | |
tree | 395f77a0eff9c33b2449c9e5a19b423bedf5d5d2 /Makefile.am | |
parent | a5ecc4ae370ee5cfa383e72682db66a4c8eafc28 (diff) |
Simplify 'make all' build.
* configure.in (mono_build_root, mono_runtime, mono_cfg_dir):
New AC_SUBSTed variables.
(runtime/mono-wrapper): New generated file.
(runtime/etc/mono/1.0/machine.config, runtime/etc/mono/2.0/machine.config):
New symlinks.
(AC_OUTPUT): Don't mention runtime/net_1_1 and runtime/net_2_0.
* Makefile.am (SUBDIRS): Remove '.'.
(tmpinst): Remove.
(get-monolite-latest): Update.
(populate-runtime-subdirs): Remove.
(all-local, check-local): Move rules related to building in the mcs/ tree ...
* runtime/Makefile.am: ... here. Completely re-write file.
(install-exec-local): Transfer ownership of installing .exes and
.dlls to the Makefiles in the mcs/ tree.
(_tmpinst): Use tmpinst tree only during testing.
(SUBDIRS): Remove.
* runtime/mono-wrapper.in: New. Template for generated file.
* runtime/net_1_1/Makefile.am, runtime/net_2_0/Makefile.am: Remove.
* mono/mini/Makefile.am (MCS,ILASM): Don't refer to runtime/ directory.
Refer directly to the mcs/ tree.
* mono/tests/Makefile.am (CSC,ILASM): Likewise.
svn path=/trunk/mono/; revision=36432
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 123 |
1 files changed, 9 insertions, 114 deletions
diff --git a/Makefile.am b/Makefile.am index e3be0d94cf6..92e7b517aba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I . -SUBDIRS = $(libgc_dir) mono $(ikvm_jni_dir) docs data . runtime scripts man 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 @@ -22,51 +22,20 @@ pkgconfig_DATA= mint.pc endif DISTCLEANFILES= mono.pc mint.pc -if USE_JIT -mono_runtime = mono/mini/mono -else -mono_runtime = mono/interpreter/mint -endif - -all-local: mcs-do-full-build - $(MAKE) populate-runtime-subdir - -.PHONY: get-monolite-latest tmpinst-dir mcs-do-full-build mcs-do-clean-profiles mcs-do-run-test populate-runtime-subdir - -tmpinst = runtime/_tmpinst - -if PLATFORM_WIN32 - -populate_profiles = default:net_1_1 - -else - -populate_profiles = default:net_1_1 net_2_0:net_2_0 - -endif - -clean-local: - cd $(mcs_topdir) && $(MAKE) PROFILES="basic net_1_1_bootstrap default net_2_0_bootstrap net_2_0" clean-profiles - -rm -fr $(tmpinst) - -check-local: mcs-do-run-test-profiles mono-do-testjit - -mono-do-testjit: - cd mono/tests && $(MAKE) test +.PHONY: get-monolite-latest mcs-do-compiler-tests compiler-tests bootstrap-world # building with monolite - monolitedir = $(mcs_topdir)/class/lib/basic -get-monolite-latest: tmpinst-dir +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 $(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 $(monolitedir) - rm -fr $(tmpinst)/monolite-* + -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 -fr $(monolitedir)/monolite-* compiler-tests: - $(MAKE) mcs-do-clean-profiles + cd runtime && $(MAKE) clean-local $(MAKE) $(MAKE) mcs-do-compiler-tests @@ -74,82 +43,8 @@ bootstrap-world: compiler-tests $(MAKE) install # internal targets - -mcs-do-full-build: tmpinst-dir - tmpinst=`cd $(tmpinst) && pwd` ; \ - cd $(mcs_topdir) && $(MAKE) RUNTIME=$$tmpinst/bin/mono all-profiles - -populate-runtime-subdir: - test -n '$(populate_profiles)' - @srcdir=`cd $(srcdir) && pwd`; tmpinst=`pwd`/$(tmpinst) ; \ - for profile in $(populate_profiles); do \ - ( set fnord `echo $$profile | sed 's,:, ,g'` && \ - echo "cd $(mcs_topdir) && $(MAKE) RUNTIME=$$tmpinst/bin/mono PROGRAM_INSTALL_DIR=$$srcdir/runtime PROFILE=$$2 LIBRARY_INSTALL_DIR=$$srcdir/runtime/$$3 prefix=$$tmpinst/prefix install" && \ - cd $(mcs_topdir) && \ - $(MAKE) RUNTIME=$$tmpinst/bin/mono 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 -name '*jay*' -exec rm -f '{}' ';' - for i in `find $(tmpinst)/prefix -type d -name '*jay*' -print`; do rm -f $$i/*; done - test -z "`find $(tmpinst)/prefix -type f -print`" - rm -rf $(tmpinst)/prefix - -tmpinst-dir: - mkdir -p $(tmpinst) $(tmpinst)/bin $(tmpinst)/etc/mono/1.0 $(tmpinst)/etc/mono/2.0 - $(MAKE) tmpinst-dir-contents - -tmpinst-dir-contents: $(tmpinst)/bin/mono $(tmpinst)/etc/mono/1.0/machine.config $(tmpinst)/etc/mono/2.0/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 'MONO_CFG_DIR="$$tmpinst\\etc"' >> $@ - echo 'export 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' > $@ - echo 'builddir="'`pwd`'"; tmpinst=$$builddir/$(tmpinst)' >> $@ - echo 'MONO_CFG_DIR=$$tmpinst/etc' >> $@ - echo 'export MONO_CFG_DIR' >> $@ - echo 'exec "$$builddir/libtool" --mode=execute "$$builddir/$(mono_runtime)" --config "$$builddir/data/config" "$$@"' >> $@ - chmod +x $@ - -endif - -$(tmpinst)/bin/pedump: $(srcdir)/Makefile.am - (b=`pwd`; echo '#! /bin/sh'; echo 'exec "'"$$b/libtool"'" --mode=execute "'"$$b/mono/metadata/pedump"'" "$$@"') > $@ - chmod +x $@ - -TEST_SUPPORT_FILES = $(tmpinst)/bin/mcs $(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs -mcs-do-run-test-profiles: tmpinst-dir - $(MAKE) $(TEST_SUPPORT_FILES) - tmpinst=`cd $(tmpinst) && pwd` ; ret=: ; \ - PATH=$$tmpinst/bin:$$PATH ; export PATH ; \ - ( cd $(mcs_topdir) && $(MAKE) RUNTIME=$$tmpinst/bin/mono run-test-profiles ) || ret=false ; \ - rm -f $(TEST_SUPPORT_FILES) ; $$ret - mcs-do-compiler-tests: - $(MAKE) TEST_SUBDIRS="tests errors" mcs-do-run-test-profiles - -# Used only by 'check-local' -- so, can safely use runtime/. -$(TEST_SUPPORT_FILES): $(srcdir)/Makefile.am - t=`cd $(tmpinst) && pwd`; r=`cd $(srcdir)/runtime && pwd`; \ - ( echo '#! /bin/sh'; echo 'exec "'"$$t/bin/mono"'" "'"$$r/$(@F).exe"'" "$$@"' ) > $@ - chmod +x $@ - -$(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 - -$(tmpinst)/etc/mono/2.0/machine.config: $(srcdir)/data/net_2_0/machine.config - rm -f $@ - srcdir=`cd $(srcdir) && pwd`; cd $(tmpinst)/etc/mono/2.0 && $(LN_S) $$srcdir/data/net_2_0/machine.config machine.config + cd runtime && $(MAKE) TEST_SUBDIRS="tests errors" check-local win32getdeps: wget http://www.go-mono.com/archive/pkgconfig-0.11-20020310.zip |