projects / mono.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
NaCl runtime fixes
[mono.git] / runtime / Makefile.am
diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 4af4c83e2186f5f508db4b5341a995ae10731001..93b44b4bdc35670eea40ffebd7619e5dc8b57e17 100644 (file)
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -1,6 +1,3 @@
-# hack to prevent 'check' from depending on 'all'
-AUTOMAKE_OPTIONS = cygnus
-
 tmpinst = _tmpinst
 
 noinst_SCRIPTS = mono-wrapper monodis-wrapper
@@ -9,7 +6,7 @@ etctmp = etc
 symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config etc/mono/2.0/web.config etc/mono/browscap.ini etc/mono/2.0/Browsers/Compat.browser
 
 if INSTALL_4_0
-symlinks += etc/mono/4.0/machine.config etc/mono/4.0/web.config
+symlinks += etc/mono/4.0/machine.config etc/mono/4.0/web.config etc/mono/4.5/web.config etc/mono/4.5/machine.config
 endif
 
 etc/mono/2.0/machine.config: $(top_srcdir)/data/net_2_0/machine.config
@@ -18,6 +15,8 @@ etc/mono/browscap.ini: $(top_srcdir)/data/browscap.ini
 etc/mono/2.0/Browsers/Compat.browser: $(top_srcdir)/data/net_2_0/Browsers/Compat.browser
 etc/mono/4.0/machine.config: $(top_srcdir)/data/net_4_0/machine.config
 etc/mono/4.0/web.config: $(top_srcdir)/data/net_4_0/web.config
+etc/mono/4.5/machine.config: $(top_srcdir)/data/net_4_5/machine.config
+etc/mono/4.5/web.config: $(top_srcdir)/data/net_4_5/web.config
 
 $(symlinks):
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
@@ -26,29 +25,24 @@ SUPPORT_FILES = $(symlinks) mono-wrapper etc/mono/config
 
 if MOONLIGHT
 moon-do-basic: Makefile $(SUPPORT_FILES)
-       cd $(mcs_topdir)/class/Mono.Cecil && $(MAKE) PROFILE=basic
-       cd $(mcs_topdir)/class/Mono.Cecil.Mdb && $(MAKE) PROFILE=basic
-       cd $(mcs_topdir)/tools/linker && $(MAKE) PROFILE=basic
-       cd $(mcs_topdir)/tools/tuner && $(MAKE) PROFILE=basic
+       cd $(mcs_topdir)/ && $(MAKE) NO_DIR_CHECK=1 PROFILE=moonlight_raw
 
 moon-do-basic-clean:
-       cd $(mcs_topdir)/class/Mono.Cecil && $(MAKE) PROFILE=basic clean
-       cd $(mcs_topdir)/class/Mono.Cecil.Mdb && $(MAKE) PROFILE=basic clean
-       cd $(mcs_topdir)/tools/linker && $(MAKE) PROFILE=basic clean
-       cd $(mcs_topdir)/tools/tuner && $(MAKE) PROFILE=basic clean
+       cd $(mcs_topdir)/ && $(MAKE) NO_DIR_CHECK=1 PROFILE=moonlight_raw clean
 endif
 
+if ONLY_MONOTOUCH
+build_profiles = monotouch
+else
 if ONLY_MOONLIGHT
 build_profiles = moonlight_raw
 test_profiles = moonlight_raw
 else
 
-build_profiles = net_2_0 net_3_5
-test_profiles = $(build_profiles)
+build_profiles = 
 
 if MOONLIGHT
 build_profiles += moonlight_raw
-test_profiles += moonlight_raw
 
 moon-do-moonlight-raw: Makefile $(SUPPORT_FILES)
        cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='moonlight_raw' CC='$(CC)' all-profiles
@@ -61,9 +55,19 @@ moon-do-clean: moon-do-moonlight-raw-clean moon-do-basic-clean
 
 endif
 
+if INSTALL_2_0
+build_profiles += net_2_0 net_3_5
+al_profile = net_2_0
+endif
+
 if INSTALL_4_0
 build_profiles += net_4_0
-#test_profiles += net_4_0
+al_profile = net_4_0
+endif
+
+if INSTALL_4_5
+build_profiles += net_4_5
+al_profile = net_4_5
 endif
 
 if INSTALL_MONODROID
@@ -71,17 +75,22 @@ build_profiles += monodroid
 endif
 
 if INSTALL_MONOTOUCH
-build_profiles += monotouch
+build_profiles += monotouch monotouch_runtime
 endif
 
+test_profiles = $(build_profiles)
+
+endif
 endif
 
 if BUILD_MCS
 
+MAKE_FLAGS=$(if $(V),,--no-print-directory -s)
+
 # The write check is to foil 'make distcheck'
 all-local: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES)
        if test -w $(mcs_topdir); then :; else chmod -R +w $(mcs_topdir); fi
-       cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' CC='$(CC)' all-profiles
+       cd $(mcs_topdir) && $(MAKE) $(MAKE_FLAGS) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' CC='$(CC)' all-profiles
 
 # override automake
 install: install-exec install-data
@@ -106,7 +115,7 @@ clean-local:
 
 endif BUILD_MCS
 
-TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs $(tmpinst)/bin/dmcs $(tmpinst)/bin/al2
+TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(tmpinst)/bin/mcs $(tmpinst)/bin/gmcs $(tmpinst)/bin/dmcs $(tmpinst)/bin/al2 $(tmpinst)/bin/al
 
 # now a misnomer, but it'll go away soon enough.
 if ENABLE_NUNIT_TESTS
@@ -136,12 +145,12 @@ endif
 
 # Compile all assemblies with the verifier turned on. Code must be valid but not verifiable.
 # TODO it would be nice to split assemblies without unsafe code to use the verifier with verifiable mode.
-# Skip net 2.1 assemblies for now because of visibility problems
+# Skip net 4.0 assemblies because the contain metadata only
 mcs-compileall: mono-wrapper etc/mono/config
        save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && $(cur_dir_cmd)`; ok=:; \
        for profile in $(test_profiles); do \
-         if [ "moonlight" = "$$profile" ]; then \
-          break; \
+         if [ "net_4_0" = "$$profile" ]; then \
+          continue; \
       fi; \
          if [ "net_3_5" = "$$profile" ]; then \
                  MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$mcs_topdir/class/lib/net_2_0$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \
@@ -153,15 +162,22 @@ mcs-compileall: mono-wrapper etc/mono/config
                if [ ! -f $$i ] ; then \
                        continue ; \
                fi ;  \
-           if ./mono-wrapper --compile-all --verify-all --security=validil $$i; then \
+           if ./mono-wrapper --compile-all --verify-all --security=verifiable $$i; then \
              echo $$i verified OK; \
            else \
              echo $$i verification failed; ok=false; \
            fi; done; done; \
        $$ok
 
+if NACL_CODEGEN
+check-local:
+else
 check-local: mcs-compileall mcs-do-test-profiles
        $(MAKE) $(test_select) mcs-do-run-test-profiles
+endif
+
+# Compile all mcs tests
+test: mcs-do-test-profiles
 
 CLEANFILES = etc/mono/config
 
@@ -178,16 +194,22 @@ $(tmpinst)/bin/mono: mono-wrapper etc/mono/config
        $(mkinstalldirs) $(tmpinst)/bin
        cp mono-wrapper $@
 
+$(tmpinst)/bin/mcs: $(tmpinst)/bin/mono Makefile
+       echo '#! /bin/sh' > $@ ; \
+       r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
+       echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/build/mcs.exe"'" "$$@"' >> $@ ; \
+       chmod +x $@
+
 $(tmpinst)/bin/gmcs: $(tmpinst)/bin/mono Makefile
        echo '#! /bin/sh' > $@ ; \
        r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
-       echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/net_2_0/gmcs.exe"'" "$$@"' >> $@ ; \
+       echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/build/mcs.exe -sdk:2"'" "$$@"' >> $@ ; \
        chmod +x $@
 
 $(tmpinst)/bin/dmcs: $(tmpinst)/bin/mono Makefile
        echo '#! /bin/sh' > $@ ; \
        r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
-       echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/net_4_0/dmcs.exe"'" "$$@"' >> $@ ; \
+       echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/build/mcs.exe -sdk:4"'" "$$@"' >> $@ ; \
        chmod +x $@
 
 $(tmpinst)/bin/ilasm: $(tmpinst)/bin/mono Makefile
@@ -202,6 +224,12 @@ $(tmpinst)/bin/al2: $(tmpinst)/bin/mono Makefile
        echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/net_2_0/al.exe"'" "$$@"' >> $@ ; \
        chmod +x $@
 
+$(tmpinst)/bin/al: $(tmpinst)/bin/mono Makefile
+       echo '#! /bin/sh' > $@ ; \
+       r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
+       echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/$(al_profile)/al.exe"'" "$$@"' >> $@ ; \
+       chmod +x $@
+
 test-support-files: $(TEST_SUPPORT_FILES)
        @:
 
my mono mirror. check out Moved to http://github.com/mono/mono