From 0a24c89f13b00e8b170aeab42eecbbdb07ca4e0f Mon Sep 17 00:00:00 2001 From: Raja R Harinath Date: Tue, 7 Dec 2004 10:29:43 +0000 Subject: [PATCH] Misc. 'make distcheck' fixes. In tools: * Makefile (run-test-ondotnet-local, uninstall-local): New. In tests: * Makefile (DISTFILES): Distribute *.inc files too. (with_mono_path): New. (casts.cs, boot-casts.out, mcs-casts.out): Use it. In jay: * Makefile (uninstall-local): Remove $(prefix)/man/man1/jay.1. In build: * executable.make (uninstall-local): Remove .config file too. * library.make (uninstall-local): Don't error out if GACUTIL fails. In errors: * Makefile (DISTFILES): Add expected error and ignored test lists. svn path=/trunk/mcs/; revision=37308 --- mcs/build/ChangeLog | 5 +++++ mcs/build/executable.make | 2 +- mcs/build/library.make | 2 +- mcs/errors/ChangeLog | 4 ++++ mcs/errors/Makefile | 5 ++++- mcs/errors/errors.txt | 0 mcs/jay/ChangeLog | 4 ++++ mcs/jay/Makefile | 3 ++- mcs/tests/ChangeLog | 6 ++++++ mcs/tests/Makefile | 15 ++++++++------- mcs/tools/ChangeLog | 4 ++++ mcs/tools/Makefile | 3 ++- 12 files changed, 41 insertions(+), 12 deletions(-) mode change 100755 => 100644 mcs/errors/errors.txt diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog index 2b4c22c1656..3413a56f7e1 100644 --- a/mcs/build/ChangeLog +++ b/mcs/build/ChangeLog @@ -1,3 +1,8 @@ +2004-12-07 Raja R Harinath + + * executable.make (uninstall-local): Remove .config file too. + * library.make (uninstall-local): Don't error out if GACUTIL fails. + 2004-12-07 Raja R Harinath * library.make (BUILT_SOURCES_cmdline): Use diff --git a/mcs/build/executable.make b/mcs/build/executable.make index 9d85decfb09..417eeaf328e 100644 --- a/mcs/build/executable.make +++ b/mcs/build/executable.make @@ -43,7 +43,7 @@ ifdef PROGRAM_config endif uninstall-local: - -rm -f $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog) $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog).mdb + -rm -f $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog) $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog).mdb $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog).config endif clean-local: diff --git a/mcs/build/library.make b/mcs/build/library.make index c60d85431dc..d5bf65c3e23 100644 --- a/mcs/build/library.make +++ b/mcs/build/library.make @@ -133,7 +133,7 @@ install-local: $(gacutil) $(GACUTIL) /i $(the_lib) /f $(gacdir_flag) /root $(GACROOT) /package $(FRAMEWORK_VERSION) uninstall-local: $(gacutil) - $(GACUTIL) /u $(LIBRARY_NAME:.dll=) + -$(GACUTIL) /u $(LIBRARY_NAME:.dll=) $(gacdir_flag) /root $(GACROOT) /package $(FRAMEWORK_VERSION) endif endif diff --git a/mcs/errors/ChangeLog b/mcs/errors/ChangeLog index aa0e496dd69..3beb84ff9f7 100644 --- a/mcs/errors/ChangeLog +++ b/mcs/errors/ChangeLog @@ -1,3 +1,7 @@ +2004-12-07 Raja R Harinath + + * Makefile (DISTFILES): Add expected error and ignored test lists. + 2004-12-07 Martin Baulig * gcs0305.cs: Renamed to cs0246-2.cs. diff --git a/mcs/errors/Makefile b/mcs/errors/Makefile index 4565a22c2f2..313320db6e0 100644 --- a/mcs/errors/Makefile +++ b/mcs/errors/Makefile @@ -22,7 +22,10 @@ DISTFILES = \ fail \ runtest.pl \ do-tests.pl \ - $(wildcard *.cs) + $(wildcard *.cs) \ + mcs-expect-no-error mcs-expect-wrong-error mcs-ignore-tests \ + gmcs-expect-no-error gmcs-expect-wrong-error gmcs-ignore-tests \ + generics-expect-no-error generics-expect-wrong-error #all-local: run-test-local test-multi-local all-local: CS0571-3-lib.dll CS0618-2-lib.dll \ diff --git a/mcs/errors/errors.txt b/mcs/errors/errors.txt old mode 100755 new mode 100644 diff --git a/mcs/jay/ChangeLog b/mcs/jay/ChangeLog index a4f3b3ef2b6..c3186b4090b 100755 --- a/mcs/jay/ChangeLog +++ b/mcs/jay/ChangeLog @@ -1,3 +1,7 @@ +2004-12-07 Raja R Harinath + + * Makefile (uninstall-local): Remove $(prefix)/man/man1/jay.1. + 2004-11-24 Miguel de Icaza * skeleton.cs: use yacc_verbose_flag to control verbosity. diff --git a/mcs/jay/Makefile b/mcs/jay/Makefile index 3e0b74ca660..0a13d3b47f8 100644 --- a/mcs/jay/Makefile +++ b/mcs/jay/Makefile @@ -27,8 +27,9 @@ install-local: jay uninstall-local: -rm -f $(DESTDIR)$(prefix)/bin/jay for datafile in $(datafiles) ; do \ - rm -f $(DESTDIR)$(prefix)/share/jay/$$datafile ; \ + rm -f $(DESTDIR)$(prefix)/share/jay/$$datafile || : ; \ done + -rm -f $(DESTDIR)$(prefix)/man/man1/jay.1 clean-local: rm -f jay *.o *.exe *.pdb diff --git a/mcs/tests/ChangeLog b/mcs/tests/ChangeLog index 30fd8ebbae2..32f5944dc50 100644 --- a/mcs/tests/ChangeLog +++ b/mcs/tests/ChangeLog @@ -1,3 +1,9 @@ +2004-12-07 Raja R Harinath + + * Makefile (DISTFILES): Distribute *.inc files too. + (with_mono_path): New. + (casts.cs, boot-casts.out, mcs-casts.out): Use it. + 2004-12-07 Atsushi Enomoto * Makefile: was missing in the previous commit. Also, moved xml-033 to diff --git a/mcs/tests/Makefile b/mcs/tests/Makefile index e2659f54b0d..53bbc05d4e6 100644 --- a/mcs/tests/Makefile +++ b/mcs/tests/Makefile @@ -7,15 +7,16 @@ thisdir = tests SUBDIRS = include ../build/rules.make -DISTFILES = README.tests harness.mk $(wildcard *.cs) $(wildcard *.il) $(wildcard *.xml) +DISTFILES = README.tests harness.mk $(wildcard *.cs) $(wildcard *.il) $(wildcard *.xml) $(wildcard *.inc) + +with_mono_path = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" ifeq (default, $(PROFILE)) # force this, we don't case if CSC is broken. This also # means we can use --options, yay. - -MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_MCS) +MCS = $(with_mono_path) $(INTERNAL_MCS) endif -ILASM = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_ILASM) +ILASM = $(with_mono_path) $(INTERNAL_ILASM) # We don't want debugging info :-) @@ -138,7 +139,7 @@ bootstrap-cast.exe: gen-cast-test.cs $(BOOT_COMPILE) -target:exe /out:$@ $< casts.cs: bootstrap-cast.exe - $(RUNTIME) $< >$@ + $(with_mono_path) $(RUNTIME) $< >$@ casts-mcs.exe: casts.cs $(CSCOMPILE) -target:exe /out:$@ $< @@ -147,10 +148,10 @@ casts-boot.exe: casts.cs $(BOOT_COMPILE) -target:exe /out:$@ $< boot-casts.out: casts-boot.exe - $(RUNTIME) $< >$@ + $(with_mono_path) $(RUNTIME) $< >$@ mcs-casts.out: casts-mcs.exe - $(RUNTIME) $< >$@ + $(with_mono_path) $(RUNTIME) $< >$@ test-casts: boot-casts.out mcs-casts.out cmp $^ diff --git a/mcs/tools/ChangeLog b/mcs/tools/ChangeLog index 45902daff47..a1117079675 100644 --- a/mcs/tools/ChangeLog +++ b/mcs/tools/ChangeLog @@ -1,3 +1,7 @@ +2004-12-07 Raja R Harinath + + * Makefile (run-test-ondotnet-local, uninstall-local): New. + 2004-11-22 Raja R Harinath * Makefile (net_1_1_bootstrap_SUBDIRS): Add 'security' directory. diff --git a/mcs/tools/Makefile b/mcs/tools/Makefile index 4e5a05a0cc9..400d6ba8320 100644 --- a/mcs/tools/Makefile +++ b/mcs/tools/Makefile @@ -19,7 +19,8 @@ DISTFILES = \ tinderbox/smtp.c \ tinderbox/tinderbox.sh -test-local run-test-local all-local install-local: +test-local run-test-local run-test-ondotnet-local all-local install-local uninstall-local: + @: dist-local: dist-default -- 2.25.1