Browse Source

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
Raja R Harinath 21 years ago
parent
commit
0a24c89f13

+ 5 - 0
mcs/build/ChangeLog

@@ -1,3 +1,8 @@
+2004-12-07  Raja R Harinath  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* library.make (BUILT_SOURCES_cmdline): Use

+ 1 - 1
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:

+ 1 - 1
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

+ 4 - 0
mcs/errors/ChangeLog

@@ -1,3 +1,7 @@
+2004-12-07  Raja R Harinath  <[email protected]>
+
+	* Makefile (DISTFILES): Add expected error and ignored test lists.
+
 2004-12-07  Martin Baulig  <[email protected]>
 
 	* gcs0305.cs: Renamed to cs0246-2.cs.

+ 4 - 1
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 \

+ 4 - 0
mcs/errors/errors.txt

@@ -1,3 +1,7 @@
+2004-12-07  Raja R Harinath  <[email protected]>
+
+	* Makefile (uninstall-local): Remove $(prefix)/man/man1/jay.1.
+
 2004-11-24  Miguel de Icaza  <[email protected]>
 
 	* skeleton.cs: use yacc_verbose_flag to control verbosity.

+ 2 - 1
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

+ 6 - 0
mcs/tests/ChangeLog

@@ -1,3 +1,9 @@
+2004-12-07  Raja R Harinath  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* Makefile: was missing in the previous commit. Also, moved xml-033 to

+ 8 - 7
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 $^

+ 4 - 0
mcs/tools/ChangeLog

@@ -1,3 +1,7 @@
+2004-12-07  Raja R Harinath  <[email protected]>
+
+	* Makefile (run-test-ondotnet-local, uninstall-local): New.
+
 2004-11-22  Raja R Harinath  <[email protected]>
 
 	* Makefile (net_1_1_bootstrap_SUBDIRS): Add 'security' directory.

+ 2 - 1
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