projects / mono.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
2009-01-07 Geoff Norton <gnorton@novell.com>
[mono.git] / runtime / Makefile.am
diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index ceccf4e45086980bd74d038c9c22dec3bc22e0ba..0e876e2a49142f02bb0dba91a450a698c16ad7f2 100644 (file)
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -3,15 +3,16 @@ AUTOMAKE_OPTIONS = cygnus
 
 tmpinst = _tmpinst
 
-noinst_SCRIPTS = mono-wrapper monodis-wrapper semdel-wrapper
+noinst_SCRIPTS = mono-wrapper monodis-wrapper
 
 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
+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
 
 etc/mono/1.0/machine.config: $(top_srcdir)/data/net_1_1/machine.config
 etc/mono/2.0/machine.config: $(top_srcdir)/data/net_2_0/machine.config
 etc/mono/2.0/web.config: $(top_srcdir)/data/net_2_0/web.config
 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
 
 $(symlinks):
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
@@ -20,12 +21,12 @@ SUPPORT_FILES = $(symlinks) mono-wrapper etc/mono/config
 
 if INSTALL_2_0
 if INSTALL_2_1
-build_profiles = default net_2_0 net_2_1
+build_profiles = net_1_1 net_2_0 net_3_5 net_2_1
 else
-build_profiles = default net_2_0
+build_profiles = net_1_1 net_2_0 net_3_5
 endif
 else
-build_profiles = default
+build_profiles = net_1_1
 endif
 
 if BUILD_MCS
@@ -33,14 +34,14 @@ if BUILD_MCS
 # 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) PROFILES='$(build_profiles)' CC='$(CC)' all-profiles
+       cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' CC='$(CC)' all-profiles
 
 # override automake
 install: install-exec install-data
 
 # override automake
 install-exec: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES)
-       cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles
+       cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles
 
 # override automake
 install-data:
@@ -48,12 +49,12 @@ install-data:
 
 # override automake
 uninstall:
-       cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) uninstall-profiles
+       cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) uninstall-profiles
 
-## semdel-wrapper will probably not delete the semaphore if someone is crazy enough to do a 'make -j distclean' :-)
+## mono --wapi=semdel will probably not delete the semaphore if someone is crazy enough to do a 'make -j distclean' :-)
 clean-local:
-       cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' clean-profiles
-       -./semdel-wrapper
+       cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' clean-profiles
+       -./mono-wrapper --wapi=semdel
        -rm -fr $(etctmp) $(tmpinst) .wapi
 
 endif BUILD_MCS
@@ -68,26 +69,44 @@ test_select = ONLY_CENTUM_TESTS=yes
 endif
 
 mcs-do-test-profiles:
-       cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' test-profiles
+       cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' test-profiles
 
 mcs-do-run-test-profiles: test-support-files
-       cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' run-test-profiles
+       cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' run-test-profiles
 
 if PLATFORM_WIN32
+if CROSS_COMPILING
+cur_dir_cmd = pwd
+PLATFORM_PATH_SEPARATOR = :
+else
 cur_dir_cmd = cygpath -w -a .
 PLATFORM_PATH_SEPARATOR = ;
+endif
 else
 cur_dir_cmd = pwd
 PLATFORM_PATH_SEPARATOR = :
 endif
 
-# Use --compile-all as a poor man's PEVerify to detect invalid IL
+# 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
 mcs-compileall: mono-wrapper etc/mono/config
        save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && $(cur_dir_cmd)`; ok=:; \
        for profile in $(build_profiles); do \
-         MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; export MONO_PATH; \
-         for i in $(mcs_topdir)/class/lib/$$profile/*.dll $(mcs_topdir)/class/lib/$$profile/*.exe; do \
-           if ./mono-wrapper --compile-all $$i; then \
+         if [ "net_2_1" = "$$profile" ]; then \
+          break; \
+      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"; \
+         else \
+                 MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \
+         fi; \
+         export MONO_PATH; \
+         for i in $(mcs_topdir)/class/lib/$$profile/*.{dll,exe}; do \
+               if [ ! -f $$i ] ; then \
+                       continue ; \
+               fi ;  \
+           if ./mono-wrapper --compile-all --security=validil --verify-all $$i; then \
              echo $$i verified OK; \
            else \
              echo $$i verification failed; ok=false; \
@@ -115,13 +134,13 @@ $(tmpinst)/bin/mono: mono-wrapper etc/mono/config
 $(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/default/mcs.exe"'" "$$@"' >> $@ ; \
+       echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/net_1_1/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/gmcs/gmcs.exe"'" "$$@"' >> $@ ; \
+       echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/net_2_0/gmcs.exe"'" "$$@"' >> $@ ; \
        chmod +x $@
 
 $(tmpinst)/bin/ilasm: $(tmpinst)/bin/mono Makefile
my mono mirror. check out Moved to http://github.com/mono/mono