Fix make distcheck

This commit is contained in:
Sebastian Dröge 2009-09-03 10:21:50 +02:00
parent 9e75855156
commit af356f46c6
9 changed files with 44 additions and 53 deletions

View file

@ -86,9 +86,6 @@ AC_SUBST(MONODOCER)
AC_SUBST(MDASSEMBLER) AC_SUBST(MDASSEMBLER)
AC_SUBST(MONODOCS2HTML) AC_SUBST(MONODOCS2HTML)
MONODOC_SOURCESDIR=`pkg-config --variable=sourcesdir monodoc`
AC_SUBST(MONODOC_SOURCESDIR)
## Versions of dependencies ## Versions of dependencies
#GLIBSHARP_REQUIRED_VERSION=2.12.9.90 #GLIBSHARP_REQUIRED_VERSION=2.12.9.90
#PKG_CHECK_MODULES(GLIBSHARP, glib-sharp-2.0 >= $GLIBSHARP_REQUIRED_VERSION) #PKG_CHECK_MODULES(GLIBSHARP, glib-sharp-2.0 >= $GLIBSHARP_REQUIRED_VERSION)

View file

@ -1,29 +1,18 @@
if ENABLE_MONODOC
TARGETS = gstreamer-sharp-docs.zip gstreamer-sharp-docs.tree gstreamer-sharp-docs.source
ASSEMBLIES = \ ASSEMBLIES = \
$(top_builddir)/gstreamer-sharp/gstreamer-sharp.dll $(top_builddir)/gstreamer-sharp/gstreamer-sharp.dll
ASSEMBLIES_BUILD = $(foreach asm,$(ASSEMBLIES),$(addprefix -assembly:,$(asm))) ASSEMBLIES_BUILD = $(foreach asm,$(ASSEMBLIES),$(addprefix -assembly:,$(asm)))
install-data-local: if ENABLE_MONODOC
mkdir -p $(DESTDIR)/$(MONODOC_SOURCESDIR) SOURCESDIR=$(prefix)/lib/monodoc/sources
install -m 644 $(srcdir)/gstreamer-sharp-docs.source \ TARGETS=gstreamer-sharp-docs.zip gstreamer-sharp-docs.tree gstreamer-sharp-docs.source
$(DESTDIR)/$(MONODOC_SOURCESDIR)
install -m 644 gstreamer-sharp-docs.tree \
$(DESTDIR)/$(MONODOC_SOURCESDIR)
install -m 644 gstreamer-sharp-docs.zip \
$(DESTDIR)/$(MONODOC_SOURCESDIR)
uninstall-local:
rm -f $(DESTDIR)/$(MONODOC_SOURCESDIR)/gstreamer-sharp-docs.source
rm -f $(DESTDIR)/$(MONODOC_SOURCESDIR)/gstreamer-sharp-docs.tree
rm -f $(DESTDIR)/$(MONODOC_SOURCESDIR)/gstreamer-sharp-docs.zip
else else
TARGETS = SOURCESDIR=$(datadir)
TARGETS=
endif endif
noinst_DATA = $(TARGETS) monodocdir=$(SOURCESDIR)
monodoc_DATA=$(TARGETS)
gstreamer-sharp-docs.zip gstreamer-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml gstreamer-sharp-docs.zip gstreamer-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
$(MDASSEMBLER) --ecma $(srcdir)/en -o gstreamer-sharp-docs $(MDASSEMBLER) --ecma $(srcdir)/en -o gstreamer-sharp-docs

View file

@ -17,6 +17,6 @@ CLEANFILES = $(TARGETS) $(DEBUGS)
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = \ EXTRA_DIST = \
elementgen.cs \ $(srcdir)/elementgen.cs \
interfaces/*.cs $(srcdir)/interfaces/*.cs

View file

@ -247,7 +247,7 @@ public class ElementGen {
return null; return null;
} }
public static void writeElement (TextWriter writer, ElementInfo ei, StreamReader custom_code, XmlDocument api_doc) { public static void writeElement (TextWriter writer, ElementInfo ei, StreamReader custom_code, XmlDocument api_doc, string interfaces_dir) {
ArrayList enums = new ArrayList (); ArrayList enums = new ArrayList ();
writer.WriteLine ("#region Autogenerated code"); writer.WriteLine ("#region Autogenerated code");
@ -398,13 +398,11 @@ public class ElementGen {
} }
if (ei.interfaces.Count > 0) { if (ei.interfaces.Count > 0) {
string path = Path.GetDirectoryName (System.Reflection.Assembly.GetCallingAssembly ().Location);
foreach (string iface in ei.interfaces) { foreach (string iface in ei.interfaces) {
writer.WriteLine ("#endregion"); writer.WriteLine ("#endregion");
writer.WriteLine ("#region Customized code"); writer.WriteLine ("#region Customized code");
writer.WriteLine ("#line 1 \"" + iface + ".cs\""); writer.WriteLine ("#line 1 \"" + iface + ".cs\"");
StreamReader interface_code = System.IO.File.OpenText (path + "/interfaces/" + iface + ".cs"); StreamReader interface_code = System.IO.File.OpenText (interfaces_dir + "/" + iface + ".cs");
string iface_code = interface_code.ReadToEnd (); string iface_code = interface_code.ReadToEnd ();
writer.WriteLine (iface_code); writer.WriteLine (iface_code);
} }
@ -466,8 +464,8 @@ public class ElementGen {
} }
public static int Main (string[] args) { public static int Main (string[] args) {
if (args.Length != 4) { if (args.Length != 5) {
Console.Error.WriteLine ("Usage: element-gen --namespace=<namespace> --api=<api> --input=<in-filename> --customfile=<custom-file>"); Console.Error.WriteLine ("Usage: element-gen --namespace=<namespace> --api=<api> --input=<in-filename> --customfile=<custom-file> --interfacesdir=<interfaces-dir>");
return -1; return -1;
} }
@ -477,6 +475,7 @@ public class ElementGen {
string filename = null; string filename = null;
string customfile = null; string customfile = null;
StreamReader custom_code = null; StreamReader custom_code = null;
string interfaces_dir = null;
foreach (string arg in args) { foreach (string arg in args) {
@ -497,6 +496,8 @@ public class ElementGen {
try { try {
custom_code = System.IO.File.OpenText (customfile); custom_code = System.IO.File.OpenText (customfile);
} catch (Exception) { } // No custom file is OK } catch (Exception) { } // No custom file is OK
} else if (arg.StartsWith ("--interfacesdir=")) {
interfaces_dir = arg.Substring (16);
} else if (arg.StartsWith ("--api=")) { } else if (arg.StartsWith ("--api=")) {
string api_filename = arg.Substring (6); string api_filename = arg.Substring (6);
@ -598,7 +599,7 @@ public class ElementGen {
} }
} }
writeElement (writer, ei, custom_code, api_doc); writeElement (writer, ei, custom_code, api_doc, interfaces_dir);
writer.WriteLine ("}"); writer.WriteLine ("}");

View file

@ -63,6 +63,8 @@ dist_sources = $(sources)
EXTRA_DIST = \ EXTRA_DIST = \
$(dist_sources) $(dist_sources)
CLEANFILES = gst-gapi_codegen.exe gst-gapi_codegen.exe.mdb
gst-gapi_codegen.exe: $(build_sources) gst-gapi_codegen.exe: $(build_sources)
$(CSC) -debug -out:gst-gapi_codegen.exe $(OFF_T_FLAGS) $(references) $(build_sources) $(CSC) -debug -out:gst-gapi_codegen.exe $(OFF_T_FLAGS) $(references) $(build_sources)

View file

@ -127,24 +127,24 @@ EXTRA_DIST = \
$(SYMBOLS) \ $(SYMBOLS) \
$(METADATA) \ $(METADATA) \
$(customs) \ $(customs) \
$(sources) \ $(build_sources) \
$(overrides) \ $(overrides) \
$(ASSEMBLY).config.in $(ASSEMBLY).config.in
$(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) $(srcdir)/$(SYMBOLS) $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) $(srcdir)/$(SYMBOLS)
cp $(srcdir)/$(RAW_API) $(API) cp $(srcdir)/$(RAW_API) $(builddir)/$(API)
chmod u+w $(API) chmod u+w $(API)
$(MONO) $(top_builddir)/parser/gst-gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) \ $(MONO) $(top_builddir)/parser/gst-gapi-fixup.exe --api=$(builddir)/$(API) \
--symbols=$(srcdir)/$(SYMBOLS) --metadata=$(srcdir)/$(METADATA) --symbols=$(srcdir)/$(SYMBOLS)
generated-stamp: $(API) $(build_customs) $(overrides) generated-stamp: $(API) $(build_customs) $(overrides)
$(MONO) $(top_builddir)/generator/gst-gapi_codegen.exe --generate $(API) \ $(MONO) $(top_builddir)/generator/gst-gapi_codegen.exe --generate $(builddir)/$(API) \
--outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ --outdir=$(builddir)/generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
--gluelib-name=gstreamersharpglue-0.10.dll --glue-filename=glue/generated.c \ --gluelib-name=gstreamersharpglue-0.10.dll --glue-filename=$(builddir)/glue/generated.c \
--glue-includes=$(glue_includes) \ --glue-includes=$(glue_includes) \
&& cp $(overrides) $(builddir)/generated \ && cp $(overrides) $(builddir)/generated \
&& sed 's;public class ObjectManager;internal class ObjectManager;g' generated/ObjectManager.cs > generated/ObjectManager.cs.tmp \ && sed 's;public class ObjectManager;internal class ObjectManager;g' $(builddir)/generated/ObjectManager.cs > $(builddir)/generated/ObjectManager.cs.tmp \
&& mv generated/ObjectManager.cs.tmp generated/ObjectManager.cs \ && mv $(builddir)/generated/ObjectManager.cs.tmp $(builddir)/generated/ObjectManager.cs \
&& touch generated-stamp && touch generated-stamp
coreplugins/generated/*.cs: $(API) $(builddir)/coreplugins/generated coreplugins/generated/*.cs: $(API) $(builddir)/coreplugins/generated

View file

@ -17,15 +17,15 @@ inspect-%:
all: $(XML_FILES) $(CS_FILES) all: $(XML_FILES) $(CS_FILES)
touch generated touch generated
generated/%.cs: $(top_builddir)/elementgen/element-gen.exe $(srcdir)/../gstreamer-api.xml $(CUSTOM_FILES) $(builddir)/%.xml generated/%.cs: $(top_builddir)/elementgen/element-gen.exe $(top_builddir)/gstreamer-sharp/gstreamer-api.xml $(CUSTOM_FILES) $(builddir)/%.xml
@mkdir -p generated @mkdir -p generated
$(MONO) $(top_builddir)/elementgen/element-gen.exe --namespace=$(NAMESPACE) \ $(MONO) $(top_builddir)/elementgen/element-gen.exe --namespace=$(NAMESPACE) \
--api=$(srcdir)/../gstreamer-api.xml --input=$(patsubst generated/%.cs,$(builddir)/%.xml,$@) --customfile=$(patsubst generated/%.cs,$(srcdir)/%.custom,$@) > $@ --api=$(top_builddir)/gstreamer-sharp/gstreamer-api.xml --input=$(patsubst generated/%.cs,$(builddir)/%.xml,$@) --customfile=$(patsubst generated/%.cs,$(srcdir)/%.custom,$@) --interfacesdir=$(top_srcdir)/elementgen/interfaces > $@
%.xml: $(top_builddir)/parser/gst-gapi-fixup.exe $(srcdir)/inspect/%.raw $(srcdir)/%.metadata %.xml: $(top_builddir)/parser/gst-gapi-fixup.exe $(srcdir)/inspect/%.raw $(srcdir)/%.metadata
cp $(patsubst %.xml,$(srcdir)/inspect/%.raw,$@) $@ cp $(patsubst %.xml,$(srcdir)/inspect/%.raw,$@) $(builddir)/$@
$(MONO) $(top_builddir)/parser/gst-gapi-fixup.exe --api=$@ --metadata=$(patsubst %.xml,$(srcdir)/%.metadata,$@) chmod +w $(builddir)/$@
$(MONO) $(top_builddir)/parser/gst-gapi-fixup.exe --api=$(builddir)/$@ --metadata=$(patsubst %.xml,$(srcdir)/%.metadata,$@)
%.xml: $(top_builddir)/parser/gst-gapi-fixup.exe $(srcdir)/inspect/%.raw
cp $(patsubst %.xml,$(srcdir)/inspect/%.raw,$@) $@
%.xml: $(top_builddir)/parser/gst-gapi-fixup.exe $(srcdir)/inspect/%.raw
cp $(patsubst %.xml,$(srcdir)/inspect/%.raw,$@) $(builddir)/$@

View file

@ -22,15 +22,15 @@ inspect-%:
all: $(XML_FILES) $(CS_FILES) all: $(XML_FILES) $(CS_FILES)
touch generated touch generated
generated/%.cs: $(top_builddir)/elementgen/element-gen.exe $(srcdir)/../gstreamer-api.xml $(CUSTOM_FILES) $(builddir)/%.xml generated/%.cs: $(top_builddir)/elementgen/element-gen.exe $(top_builddir)/gstreamer-sharp/gstreamer-api.xml $(CUSTOM_FILES) $(builddir)/%.xml
@mkdir -p generated @mkdir -p generated
$(MONO) $(top_builddir)/elementgen/element-gen.exe --namespace=$(NAMESPACE) \ $(MONO) $(top_builddir)/elementgen/element-gen.exe --namespace=$(NAMESPACE) \
--api=$(srcdir)/../gstreamer-api.xml --input=$(patsubst generated/%.cs,$(builddir)/%.xml,$@) --customfile=$(patsubst generated/%.cs,$(srcdir)/%.custom,$@) > $@ --api=$(top_builddir)/gstreamer-sharp/gstreamer-api.xml --input=$(patsubst generated/%.cs,$(builddir)/%.xml,$@) --customfile=$(patsubst generated/%.cs,$(srcdir)/%.custom,$@) --interfacesdir=$(top_srcdir)/elementgen/interfaces > $@
%.xml: $(top_builddir)/parser/gst-gapi-fixup.exe $(srcdir)/inspect/%.raw $(srcdir)/%.metadata %.xml: $(top_builddir)/parser/gst-gapi-fixup.exe $(srcdir)/inspect/%.raw $(srcdir)/%.metadata
cp $(patsubst %.xml,$(srcdir)/inspect/%.raw,$@) $@ cp $(patsubst %.xml,$(srcdir)/inspect/%.raw,$@) $(builddir)/$@
$(MONO) $(top_builddir)/parser/gst-gapi-fixup.exe --api=$@ --metadata=$(patsubst %.xml,$(srcdir)/%.metadata,$@) chmod +w $(builddir)/$@
$(MONO) $(top_builddir)/parser/gst-gapi-fixup.exe --api=$(builddir)/$@ --metadata=$(patsubst %.xml,$(srcdir)/%.metadata,$@)
%.xml: $(top_builddir)/parser/gst-gapi-fixup.exe $(srcdir)/inspect/%.raw
cp $(patsubst %.xml,$(srcdir)/inspect/%.raw,$@) $@
%.xml: $(top_builddir)/parser/gst-gapi-fixup.exe $(srcdir)/inspect/%.raw
cp $(patsubst %.xml,$(srcdir)/inspect/%.raw,$@) $(builddir)/$@

View file

@ -14,3 +14,5 @@ EXTRA_DIST = $(ASSEMBLY_CSFILES)
CLEANFILES = $(ASSEMBLY) *.mdb *.pdb TestResult.xml CLEANFILES = $(ASSEMBLY) *.mdb *.pdb TestResult.xml
DISTCLEANFILES = Makefile.in DISTCLEANFILES = Makefile.in
clean-local:
rm -rf %temp%