Author: mhutch
Date: 2007-11-20 19:01:33 -0500 (Tue, 20 Nov 2007)
New Revision: 90048
Modified:
trunk/monodevelop/ChangeLog
trunk/monodevelop/Extras/CSharpBinding/ChangeLog
trunk/monodevelop/Extras/CSharpBinding/Makefile.am
trunk/monodevelop/Makefile.am
Log:
Fix distcheck
Modified: trunk/monodevelop/ChangeLog
===================================================================
--- trunk/monodevelop/ChangeLog 2007-11-20 23:55:17 UTC (rev 90047)
+++ trunk/monodevelop/ChangeLog 2007-11-21 00:01:33 UTC (rev 90048)
@@ -1,3 +1,8 @@
+2007-11-20 Michael Hutchinson <[EMAIL PROTECTED]>
+
+ * Makefile.am: Fix distcheck; update-mime-database leaves "empty"
+ files behind after an uninstall, and we should ignore these.
+
2007-11-13 Michael Hutchinson <[EMAIL PROTECTED]>
* monodevelop.in: Explicitly use /bin/bash rather than /bin/sh, as
Modified: trunk/monodevelop/Extras/CSharpBinding/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/CSharpBinding/ChangeLog 2007-11-20 23:55:17 UTC
(rev 90047)
+++ trunk/monodevelop/Extras/CSharpBinding/ChangeLog 2007-11-21 00:01:33 UTC
(rev 90048)
@@ -1,3 +1,8 @@
+2007-11-20 Michael Hutchinson <[EMAIL PROTECTED]>
+
+ * Makefile.am: Fix distcheck by disabling automatic running of unit
+ tests in check target, as their running is somewhat broken.
+
2007-11-19 Michael Hutchinson <[EMAIL PROTECTED]>
* CSharpEnhancedCodeProvider.cs: Use non-obsolete APIs.
Modified: trunk/monodevelop/Extras/CSharpBinding/Makefile.am
===================================================================
--- trunk/monodevelop/Extras/CSharpBinding/Makefile.am 2007-11-20 23:55:17 UTC
(rev 90047)
+++ trunk/monodevelop/Extras/CSharpBinding/Makefile.am 2007-11-21 00:01:33 UTC
(rev 90048)
@@ -105,7 +105,6 @@
Parser/SharpDevelopTree/GenericParameter.cs \
Parser/SharpDevelopTree/Method.cs \
Parser/SharpDevelopTree/ReturnType.cs \
- Parser/TypeNameResolver.cs \
Parser/TypeVisitor.cs \
Project/CSharpCompilerParameters.cs
@@ -121,8 +120,8 @@
$(CSC) $(CSC_FLAGS) -debug -out:$@ -target:library $(REFS) \
$(build_resources:%=/resource:%) $(build_sources)
-check: all $(TESTASSEMBLY)
- MONO_PATH=$(top_builddir)/build/AddIns nunit-console $(TESTASSEMBLY)
+#check: all $(TESTASSEMBLY)
+# MONO_PATH=$(top_builddir)/build/AddIns nunit-console $(TESTASSEMBLY)
$(TESTASSEMBLY) : $(build_test_sources) $(build_resources)
Modified: trunk/monodevelop/Makefile.am
===================================================================
--- trunk/monodevelop/Makefile.am 2007-11-20 23:55:17 UTC (rev 90047)
+++ trunk/monodevelop/Makefile.am 2007-11-21 00:01:33 UTC (rev 90048)
@@ -107,3 +107,12 @@
DISTCLEANFILES = monodevelop intltool-extract intltool-merge intltool-update \
monodevelop.pc
+
+# fixup automake-1.9.6 distuninstallcheck:-rule reporting files created by
update-mime-database
+# From BEAST (LGPL license):
http://svn.gnome.org/viewvc/beast/trunk/Makefile.am
+filter_stale_uninstalled = | egrep -v
'^.*/share/mime/(subclasses|globs|magic|XMLnamespaces|aliases)$$'
+filter_stale_buildfiles = | egrep -v '^./report.out$$'
+distuninstallcheck_listfiles = find . -type f -print # automake-1.9
setting
+distuninstallcheck_listfiles += $(filter_stale_uninstalled) # amend by
required filtering
+distcleancheck_listfiles = find . -type f -print # automake-1.9
setting
+distcleancheck_listfiles += $(filter_stale_buildfiles) # amend by
required filtering
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
