mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 02:01:12 +00:00
Code Issues 1 Projects Releases Wiki Activity

generator: update to latest generator

Browse source
This commit is contained in:
Stephan Sundermann 2014-03-17 00:14:48 +01:00
parent 25af4c958b
commit 15380be815
6 changed files with 11 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -23,7 +23,7 @@ sources/glue/*.la
sources/glue/.libs/ sources/glue/.libs/
# generated by the generator (we don't want anyone to commit these to the repo) # generated by the generator (we don't want anyone to commit these to the repo)
sources/generated/*.cs sources/generated/*/*.cs
sources/glue/generated.c sources/glue/generated.c
doc/* doc/*
sources/generated-stamp sources/generated-stamp

4
configure.ac
View file

@ -73,14 +73,14 @@ AC_SUBST(LIB_PREFIX)
AC_SUBST(LIB_SUFFIX) AC_SUBST(LIB_SUFFIX)
dnl Check for gtk-sharp dnl Check for gtk-sharp
PKG_CHECK_MODULES(GLIB_SHARP, glib-sharp-3.0 >= 2.99.2) PKG_CHECK_MODULES(GLIB_SHARP, glib-sharp-3.0 >= 2.99.3)
AC_SUBST(GLIB_SHARP_CFLAGS) AC_SUBST(GLIB_SHARP_CFLAGS)
AC_SUBST(GLIB_SHARP_LIBS) AC_SUBST(GLIB_SHARP_LIBS)
gtksharp_prefix=`pkg-config --variable=prefix gtk-sharp-3.0` gtksharp_prefix=`pkg-config --variable=prefix gtk-sharp-3.0`
AC_SUBST(gtksharp_prefix) AC_SUBST(gtksharp_prefix)
dnl Find GAPI dnl Find GAPI
PKG_CHECK_MODULES(GAPI, gapi-3.0 >= 2.99.2) PKG_CHECK_MODULES(GAPI, gapi-3.0 >= 2.99.3)
dnl Check for gapi dnl Check for gapi
AC_PATH_PROG(GAPI_PARSER, gapi3-parser, no) AC_PATH_PROG(GAPI_PARSER, gapi3-parser, no)

2
gstreamer-sharp.csproj
View file

@ -40,7 +40,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="sources\custom\*.cs" /> <Compile Include="sources\custom\*.cs" />
<Compile Include="sources\generated\*.cs" /> <Compile Include="sources\generated\**\*.cs" />
<Compile Include="sources\AssemblyInfo.cs" /> <Compile Include="sources\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

7
sources/Makefile.am
View file

@ -9,7 +9,7 @@ sources = custom/*.cs
build_sources = AssemblyInfo.cs $(sources) build_sources = AssemblyInfo.cs $(sources)
CLEANFILES = $(DLL) generated-stamp generated/*.cs $(API) CLEANFILES = $(DLL) generated-stamp generated/*/*.cs $(API)
DISTCLEANFILES = AssemblyInfo.cs $(DLLMAP) DISTCLEANFILES = AssemblyInfo.cs $(DLLMAP)
@ -30,6 +30,7 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
$(GAPI_FIXUP) --api=$(srcdir)/$(API) --metadata=$(srcdir)/$(METADATA) $(GAPI_FIXUP) --api=$(srcdir)/$(API) --metadata=$(srcdir)/$(METADATA)
generated-stamp: $(API) generated-stamp: $(API)
rm -rf generated/* && \
$(GAPI_CODEGEN) --generate $(srcdir)/$(API) $(GLIB_SHARP_CFLAGS) \ $(GAPI_CODEGEN) --generate $(srcdir)/$(API) $(GLIB_SHARP_CFLAGS) \
--outdir=generated \ --outdir=generated \
--glue-filename=$(GLUEDIR)/generated.c --gluelib-name=libgstreamersharpglue-1.0.0.dll \ --glue-filename=$(GLUEDIR)/generated.c --gluelib-name=libgstreamersharpglue-1.0.0.dll \
@ -38,7 +39,7 @@ generated-stamp: $(API)
$(DLL): $(build_sources) generated-stamp $(DLL): $(build_sources) generated-stamp
$(CSC) -nowarn:169 -unsafe -target:library $(GLIB_SHARP_LIBS) \ $(CSC) -nowarn:169 -unsafe -target:library $(GLIB_SHARP_LIBS) \
$(build_sources) generated/*.cs -out:$(DLL) $(build_sources) generated/*/*.cs -out:$(DLL)
install-data-local: install-data-local:
echo "$(GACUTIL) /i $(DLL) /f $(GACUTIL_FLAGS)"; \ echo "$(GACUTIL) /i $(DLL) /f $(GACUTIL_FLAGS)"; \
@ -47,3 +48,5 @@ install-data-local:
uninstall-local: uninstall-local:
echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \
$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1;
clean-local:
-rm -r generated/*

2
sources/glue/Makefile.am
View file

@ -13,6 +13,6 @@ INCLUDES = $(GST_CFLAGS) -I$(top_srcdir)
libgstreamersharpglue.dll: $(libgstreamersharpglue_1_0_0_la_OBJECTS) libgstreamersharpglue.rc libgstreamersharpglue.def libgstreamersharpglue.dll: $(libgstreamersharpglue_1_0_0_la_OBJECTS) libgstreamersharpglue.rc libgstreamersharpglue.def
./build-dll libgstreamersharpglue $(VERSION) ./build-dll libgstreamersharpglue $(VERSION)
CLEANFILES = lib*.a lib*.dll CLEANFILES = lib*.a lib*.dll generated.c
EXTRA_DIST = EXTRA_DIST =

26
sources/gstreamer-sharp.metadata
View file

@ -208,32 +208,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<attr path="/api/namespace[@name='GstRtp']" name="name">Gst.Rtp</attr> <attr path="/api/namespace[@name='GstRtp']" name="name">Gst.Rtp</attr>
<attr path="/api/namespace[@name='GstRtsp']" name="name">Gst.Rtsp</attr> <attr path="/api/namespace[@name='GstRtsp']" name="name">Gst.Rtsp</attr>
<attr path="/api/namespace[@name='GstSdp']" name="name">Gst.Sdp</attr> <attr path="/api/namespace[@name='GstSdp']" name="name">Gst.Sdp</attr>
<attr path="/api/namespace[@name='Gst.Base']/object[@name='Global']" name="name">GlobalBase</attr>
<attr path="/api/namespace[@name='Gst.Video']/object[@name='Global']" name="name">GlobalVideo</attr>
<attr path="/api/namespace[@name='Gst.Audio']/object[@name='Global']" name="name">GlobalAudio</attr>
<attr path="/api/namespace[@name='Gst.PbUtils']/object[@name='Global']" name="name">GlobalPbUtil</attr>
<attr path="/api/namespace[@name='Gst.Tags']/object[@name='Global']" name="name">GlobalTag</attr>
<attr path="/api/namespace[@name='Gst.App']/object[@name='Global']" name="name">GlobalApp</attr>
<attr path="/api/namespace[@name='Gst.Controller']/object[@name='Global']" name="name">GlobalController</attr>
<attr path="/api/namespace[@name='Gst.FFT']/object[@name='Global']" name="name">GlobalFFT</attr>
<attr path="/api/namespace[@name='Gst.Net']/object[@name='Global']" name="name">GlobalNet</attr>
<attr path="/api/namespace[@name='Gst.Riff']/object[@name='Global']" name="name">GlobalRiff</attr>
<attr path="/api/namespace[@name='Gst.Rtp']/object[@name='Global']" name="name">GlobalRtp</attr>
<attr path="/api/namespace[@name='Gst.Rtsp']/object[@name='Global']" name="name">GlobalRtsp</attr>
<attr path="/api/namespace[@name='Gst.Sdp']/object[@name='Global']" name="name">GlobalSdp</attr>
<attr path="/api/namespace[@name='Gst.Base']/object[@name='Constants']" name="name">ConstantsBase</attr>
<attr path="/api/namespace[@name='Gst.Video']/object[@name='Constants']" name="name">ConstantsVideo</attr>
<attr path="/api/namespace[@name='Gst.Audio']/object[@name='Constants']" name="name">ConstantsAudio</attr>
<attr path="/api/namespace[@name='Gst.PbUtils']/object[@name='Constants']" name="name">ConstantsPbUtil</attr>
<attr path="/api/namespace[@name='Gst.Tags']/object[@name='Constants']" name="name">ConstantsTag</attr>
<attr path="/api/namespace[@name='Gst.App']/object[@name='Constants']" name="name">ConstantsApp</attr>
<attr path="/api/namespace[@name='Gst.Controller']/object[@name='Constants']" name="name">ConstantsController</attr>
<attr path="/api/namespace[@name='Gst.FFT']/object[@name='Constants']" name="name">ConstantsFFT</attr>
<attr path="/api/namespace[@name='Gst.Net']/object[@name='Constants']" name="name">ConstantsNet</attr>
<attr path="/api/namespace[@name='Gst.Riff']/object[@name='Constants']" name="name">ConstantsRiff</attr>
<attr path="/api/namespace[@name='Gst.Rtp']/object[@name='Constants']" name="name">ConstantsRtp</attr>
<attr path="/api/namespace[@name='Gst.Rtsp']/object[@name='Constants']" name="name">ConstantsRtsp</attr>
<attr path="/api/namespace[@name='Gst.Sdp']/object[@name='Constants']" name="name">ConstantsSdp</attr>
<!-- FIXME: Remove when https://bugzilla.gnome.org/show_bug.cgi?id=710001 is fixed --> <!-- FIXME: Remove when https://bugzilla.gnome.org/show_bug.cgi?id=710001 is fixed -->
<attr path="/api/namespace" name="library">libgstreamer-1.0-0.dll</attr> <attr path="/api/namespace" name="library">libgstreamer-1.0-0.dll</attr>