projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ffac59b)
* Makefile.am (mcs-do-full-build): Pass NO_SIGN_ASSEMBLIES=yes to
authorRaja R Harinath <harinath@hurrynot.org>
Tue, 14 Sep 2004 08:35:04 +0000 (08:35 -0000)
committerRaja R Harinath <harinath@hurrynot.org>
Tue, 14 Sep 2004 08:35:04 +0000 (08:35 -0000)
reduce the number of passes.  We will get the assemblies signed in
the 'populate-runtime-subdir' phase.
(mcs-do-run-test-profiles): Rename from mcs-do-run-tests.  Use
'test-profiles' to test all profiles.
(mcs-do-compiler-tests): Use 'compiler-tests' target in mcs/.
(bootstrap-check): Update.
* runtime/Makefile.am ($(monoone_DATA) $(monotwo_DATA) $(monobins_DATA)):
Simplify.

svn path=/trunk/mono/; revision=33859

ChangeLog patch | blob | history
Makefile.am patch | blob | history
runtime/Makefile.am patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index e9958f80bb7647e7c539516b68614a7a355d0fc1..fa74361b7fc7396869d752c6e90ad3f3a3908573 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-09-14  Raja R Harinath  <rharinath@novell.com>
+
+       * Makefile.am (mcs-do-full-build): Pass NO_SIGN_ASSEMBLIES=yes to
+       reduce the number of passes.  We will get the assemblies signed in
+       the 'populate-runtime-subdir' phase.
+       (mcs-do-run-test-profiles): Rename from mcs-do-run-tests.  Use
+       'test-profiles' to test all profiles.
+       (mcs-do-compiler-tests): Use 'compiler-tests' target in mcs/.
+       (bootstrap-check): Update.
+       * runtime/Makefile.am ($(monoone_DATA) $(monotwo_DATA) $(monobins_DATA)): 
+       Simplify.
+
 2004-09-10  Zoltan Varga  <vargaz@freemail.hu>
 
        * Makefile.am (populate-runtime-subdir): Avoid -path argument to find
diff --git a/Makefile.am b/Makefile.am
index da482b27e7b0d885dc889ab8d37ba2ce3c4bfd60..e1e2a280915e28de0a14e20c2c6fa14ea1669c6a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,7 +79,7 @@ fasterstrap: tmpinst-mcs-full-build
        $(MAKE)
 
 bootstrap-clean: clean mcs-do-clean-profiles
-bootstrap-check: check mcs-do-run-test
+bootstrap-check: check mcs-do-run-test-profiles
 
 # building with monolite
 
@@ -137,18 +137,20 @@ mcs-do-short-build:
 mcs-do-full-build:
        tmpinst=`cd $(tmpinst) && pwd` ; \
        PATH=$$tmpinst/bin:$$PATH ; export PATH ; \
-       cd $(mcs_topdir) && $(MAKE) all-profiles
+       cd $(mcs_topdir) && $(MAKE) NO_SIGN_ASSEMBLY=yes all-profiles
 
 mcs-do-clean-profiles:
        cd $(mcs_topdir) && $(MAKE) clean-profiles
 
-mcs-do-run-test: tmpinst-dir $(tmpinst)/bin/mbas
+mcs-do-run-test-profiles: tmpinst-dir $(tmpinst)/bin/mbas
        tmpinst=`cd $(tmpinst) && pwd` ; \
        PATH=$$tmpinst/bin:$$PATH ; export PATH ; \
-       cd $(mcs_topdir) && $(MAKE) PROFILE=default run-test
+       cd $(mcs_topdir) && $(MAKE) run-test-profiles
 
-mcs-do-compiler-tests:
-       cd $(mcs_topdir) && $(MAKE) test-compiler
+mcs-do-compiler-tests: tmpinst-dir $(tmpinst)/bin/mbas
+       tmpinst=`cd $(tmpinst) && pwd` ; \
+       PATH=$$tmpinst/bin:$$PATH ; export PATH ; \
+       cd $(mcs_topdir) && $(MAKE) compiler-tests
 
 populate-runtime-subdir:
        test -n '$(populate_profiles)'
diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 2788e7015167c23b0ba197b0ce41b09eab050bbb..09c89564fb0cce41592ab7b49392287e84b5c6fa 100644 (file)
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -83,61 +83,15 @@ monotwodir = $(libdir)/mono/2.0/
 endif
 
 $(monoone_DATA) $(monotwo_DATA) $(monobins_DATA):
-       @case "$@" in \
-       mcs.exe)                 d=mcs                          ;; \
-       mcs.exe.mdb)             d=mcs                          ;; \
-       mcs.exe.config)          d=mcs                          ;; \
-       mbas.exe)                d=mbas                         ;; \
-       mbas.exe.mdb)            d=mbas                         ;; \
-       monoresgen.exe)          d=monoresgen                   ;; \
-       monoresgen.exe.mdb)          d=monoresgen                   ;; \
-       ilasm.exe)               d=ilasm                        ;; \
-       ilasm.exe.mdb)               d=ilasm                        ;; \
-       cilc.exe)                d=tools/cilc                   ;; \
-       cilc.exe.mdb)                d=tools/cilc                   ;; \
-       xsd.exe)                 d=tools/mono-xsd               ;; \
-       xsd.exe.mdb)                 d=tools/mono-xsd               ;; \
-       wsdl.exe)                d=tools/wsdl                   ;; \
-       wsdl.exe.mdb)                d=tools/wsdl                   ;; \
-       genxs.exe)               d=tools/genxs                  ;; \
-       genxs.exe.mdb)               d=tools/genxs                  ;; \
-       al.exe)                  d=tools/al                     ;; \
-       al.exe.mdb)                  d=tools/al                     ;; \
-       disco.exe)               d=tools/disco                  ;; \
-       disco.exe.mdb)               d=tools/disco                  ;; \
-       soapsuds.exe)            d=tools/soapsuds               ;; \
-       soapsuds.exe.mdb)            d=tools/soapsuds               ;; \
-       sqlsharp.exe)            d=tools/SqlSharp               ;; \
-       sqlsharp.exe.mdb)            d=tools/SqlSharp               ;; \
-       chktrust.exe)            d=tools/security               ;; \
-       chktrust.exe.mdb)            d=tools/security               ;; \
-       signcode.exe)            d=tools/security               ;; \
-       signcode.exe.mdb)            d=tools/security               ;; \
-       MakeCert.exe)            d=tools/security               ;; \
-       MakeCert.exe.mdb)            d=tools/security               ;; \
-       cert2spc.exe)            d=tools/security               ;; \
-       cert2spc.exe.mdb)            d=tools/security               ;; \
-       certmgr.exe)             d=tools/security               ;; \
-       certmgr.exe.mdb)             d=tools/security               ;; \
-       secutil.exe)             d=tools/security               ;; \
-       secutil.exe.mdb)             d=tools/security               ;; \
-       setreg.exe)              d=tools/security               ;; \
-       setreg.exe.mdb)              d=tools/security               ;; \
-       sn.exe)                  d=tools/security               ;; \
-       sn.exe.mdb)                  d=tools/security               ;; \
-       monop.exe)               d=tools/monop                  ;; \
-       monop.exe.mdb)               d=tools/monop                  ;; \
-       mono-find-provides.exe)  d=tools/mono-rpm-helpers/mono-find-provides    ;; \
-       mono-find.mdb-provides.exe)      d=tools/mono-rpm-helpers/mono-find-provides    ;; \
-       mono-find-requires.exe)  d=tools/mono-rpm-helpers/mono-find-requires    ;; \
-       mono-find.mdb-requires.exe)      d=tools/mono-rpm-helpers/mono-find-requires    ;; \
-       browsercaps-updater.exe) d=tools/browsercaps-updater    ;; \
-       browsercaps-updater.mdb.exe) d=tools/browsercaps-updater    ;; \
-       gacutil.exe)             d=tools/gacutil                ;; \
-       gacutil.exe.mdb)                 d=tools/gacutil                ;; \
-       gmcs.exe)                d=gmcs                         ;; \
-       gmcs.exe.mdb)                d=gmcs                             ;; \
-       gmcs.exe.config)         d=gmcs                         ;; \
+       @name=`echo "$@" | sed 's,\.exe.*$$,,'`; \
+       case $$name in \
+       mcs | mbas | monoresgen | gmcs | ilasm)         d=$$name                                         ;; \
+       cilc | genxs | al | disco | soapsuds | monop | browsercaps-updater | gacutil)   d=tools/$$name   ;; \
+       chktrust | signcode | MakeCert | cert2spc | certmgr | secutil | setreg | sn)    d=tools/security ;; \
+       mono-find-provides | mono-find-requires)        d=tools/mono-rpm-helpers/$$name                  ;; \
+       xsd)                                            d=tools/mono-xsd                                 ;; \
+       wsdl*)                                          d=tools/wsdl                                     ;; \
+       sqlsharp)                                       d=tools/SqlSharp                                 ;; \
        esac; \
        echo "test -f $(top_srcdir)/../mcs/$$d/$@" ; \
        test -f $(top_srcdir)/../mcs/$$d/$@ || exit 1 ; \
my mono mirror. check out Moved to http://github.com/mono/mono