[gst-cvs] gstreamer-sharp: Ship all required files in the tarballs and fix running of the unit test suite

Sebastian Dröge slomo at kemper.freedesktop.org
Wed Sep 2 23:47:12 PDT 2009


Module: gstreamer-sharp
Branch: master
Commit: 3608f875fec0ff1fd161ceae37425365e13e3467
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer-sharp/commit/?id=3608f875fec0ff1fd161ceae37425365e13e3467

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Thu Sep  3 08:46:52 2009 +0200

Ship all required files in the tarballs and fix running of the unit test suite

---

 elementgen/Makefile.am                  |    3 ++-
 gstreamer-sharp/baseplugins/Makefile.am |    2 +-
 gstreamer-sharp/coreplugins/Makefile.am |    2 +-
 tests/Makefile.am                       |    3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/elementgen/Makefile.am b/elementgen/Makefile.am
index 58b7796..db40508 100644
--- a/elementgen/Makefile.am
+++ b/elementgen/Makefile.am
@@ -17,5 +17,6 @@ CLEANFILES = $(TARGETS) $(DEBUGS)
 MAINTAINERCLEANFILES = Makefile.in
 
 EXTRA_DIST = \
-	elementgen.cs
+	elementgen.cs \
+	interfaces/*.cs
 
diff --git a/gstreamer-sharp/baseplugins/Makefile.am b/gstreamer-sharp/baseplugins/Makefile.am
index ade4d7c..d0a016d 100644
--- a/gstreamer-sharp/baseplugins/Makefile.am
+++ b/gstreamer-sharp/baseplugins/Makefile.am
@@ -7,7 +7,7 @@ METADATA_FILES = decodebin.metadata playbin.metadata decodebin2.metadata playbin
 CS_FILES = $(patsubst %,generated/%.cs,$(ELEMENTS))
 XML_FILES = $(patsubst %,%.xml,$(ELEMENTS))
 
-EXTRA_DIST = $(CUSTOM_FILES) $(INSPECT_FILES)
+EXTRA_DIST = $(METADATA_FILES) $(CUSTOM_FILES) $(INSPECT_FILES)
 CLEANFILES = $(XML_FILES) $(CS_FILES)
 
 plugins-update: $(patsubst inspect/%.raw, inspect-%, $(INSPECT_FILES))
diff --git a/gstreamer-sharp/coreplugins/Makefile.am b/gstreamer-sharp/coreplugins/Makefile.am
index fdd6635..843c14c 100644
--- a/gstreamer-sharp/coreplugins/Makefile.am
+++ b/gstreamer-sharp/coreplugins/Makefile.am
@@ -12,7 +12,7 @@ OTHER_CS_FILES = memindex.cs \
 	fileindex.cs
 XML_FILES = $(patsubst %,%.xml,$(ELEMENTS))
 
-EXTRA_DIST = $(CUSTOM_FILES) $(INSPECT_FILES) $(OTHER_CS_FILES)
+EXTRA_DIST = $(METADATA_FILES) $(CUSTOM_FILES) $(INSPECT_FILES) $(OTHER_CS_FILES)
 CLEANFILES = $(XML_FILES) $(CS_FILES)
 
 plugins-update: $(patsubst inspect/%.raw, inspect-%, $(INSPECT_FILES))
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 02aeef5..2c572a2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,8 +8,9 @@ $(ASSEMBLY): $(ASSEMBLY_CSFILES)
 	$(CSC) $(MCS_FLAGS) -out:$@ -target:library -r:$(top_builddir)/gstreamer-sharp/gstreamer-sharp.dll $(ASSEMBLY_CSFILES) $(GLIBSHARP_LIBS)
 
 run-test: $(ASSEMBLY)
-	MONO_PATH="../gstreamer-sharp/" $(MONO) $(NUNIT_TESTER) -labels $(ASSEMBLY)
+	LD_LIBRARY_PATH=$(top_builddir)/gstreamer-sharp/glue/.libs:$$LD_LIBRARY_PATH MONO_PATH=$(top_builddir)/gstreamer-sharp $(MONO) $(NUNIT_TESTER) -labels $(ASSEMBLY)
 
+EXTRA_DIST = $(ASSEMBLY_CSFILES)
 CLEANFILES = $(ASSEMBLY) *.mdb *.pdb TestResult.xml
 DISTCLEANFILES = Makefile.in
 





More information about the Gstreamer-commits mailing list