ryujinx/GtkSharp
1
0
Fork 0
mirror of https://github.com/Ryujinx/GtkSharp.git synced 2024-12-23 15:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move the fixup tool from the parser to the generator folder

Browse source 
The parser will be going away at some point in the future, but we
will still need the fixup step. And the fixup step is really more
of a preliminary step for the generator anyway.
This commit is contained in:
Bertrand Lorentz 2013-10-13 16:37:08 +02:00
parent ac9da8d4aa
commit 2d83fb3073
7 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile.include
View file

@ -23,12 +23,12 @@ EXTRA_DIST = $(RAW_API) $(SYMBOLS) $(ASSEMBLY).config.in $(METADATA) $(sources)
build_symbols = $(addprefix --symbols=$(srcdir)/, $(SYMBOLS)) build_symbols = $(addprefix --symbols=$(srcdir)/, $(SYMBOLS))
$(API): $(METADATA) $(RAW_API) $(SYMBOLS) $(top_builddir)/parser/gapi-fixup.exe $(API): $(METADATA) $(RAW_API) $(SYMBOLS) $(top_builddir)/generator/gapi-fixup.exe
cp $(srcdir)/$(RAW_API) $(API) cp $(srcdir)/$(RAW_API) $(API)
chmod u+w $(API) chmod u+w $(API)
@if test -n '$(METADATA)'; then \ @if test -n '$(METADATA)'; then \
echo "$(RUNTIME) $(top_builddir)/parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) $(build_symbols)"; \ echo "$(RUNTIME) $(top_builddir)/generator/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) $(build_symbols)"; \
$(RUNTIME) $(top_builddir)/parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) $(build_symbols); \ $(RUNTIME) $(top_builddir)/generator/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) $(build_symbols); \
fi fi
api_includes = $(addprefix -I:, $(INCLUDE_API)) api_includes = $(addprefix -I:, $(INCLUDE_API))

2
configure.ac
View file

@ -217,10 +217,10 @@ policy.config
sources/Makefile sources/Makefile
parser/Makefile parser/Makefile
parser/gapi-3.0.pc parser/gapi-3.0.pc
parser/gapi3-fixup
parser/gapi3-parser parser/gapi3-parser
generator/Makefile generator/Makefile
generator/gapi3-codegen generator/gapi3-codegen
generator/gapi3-fixup
glib/Makefile glib/Makefile
glib/glib-sharp-3.0.pc glib/glib-sharp-3.0.pc
glib/glib-sharp.dll.config glib/glib-sharp.dll.config

19
generator/Makefile.am
View file

@ -1,11 +1,14 @@
assemblydir = $(prefix)/lib/gapi-3.0 assemblydir = $(prefix)/lib/gapi-3.0
assembly_DATA = gapi_codegen.exe assembly_DATA = gapi-fixup.exe gapi_codegen.exe
bin_SCRIPTS = gapi3-codegen bin_SCRIPTS = gapi3-fixup gapi3-codegen
CLEANFILES = gapi_codegen.exe CLEANFILES = gapi-fixup.exe gapi_codegen.exe
DISTCLEANFILES = gapi3-codegen DISTCLEANFILES = gapi3-fixup gapi3-codegen
references = references =
fixup_sources = \
gapi-fixup.cs
sources = \ sources = \
AliasGen.cs \ AliasGen.cs \
ArrayParameter.cs \ ArrayParameter.cs \
@ -71,10 +74,14 @@ sources = \
XmlElementExtensions.cs XmlElementExtensions.cs
build_sources = $(addprefix $(srcdir)/, $(sources)) build_sources = $(addprefix $(srcdir)/, $(sources))
dist_sources = $(sources) build_fixup_sources = $(addprefix $(srcdir)/, $(fixup_sources))
EXTRA_DIST = \ EXTRA_DIST = \
$(dist_sources) $(sources) \
$(fixup_sources)
gapi-fixup.exe: $(build_fixup_sources)
$(CSC) $(CSFLAGS) -out:gapi-fixup.exe $(srcdir)/gapi-fixup.cs
gapi_codegen.exe: $(build_sources) gapi_codegen.exe: $(build_sources)
$(CSC) $(CSFLAGS) -out:gapi_codegen.exe $(OFF_T_FLAGS) $(references) $(build_sources) $(CSC) $(CSFLAGS) -out:gapi_codegen.exe $(OFF_T_FLAGS) $(references) $(build_sources)

0
parser/gapi-fixup.cs → generator/gapi-fixup.cs
View file

0
parser/gapi3-fixup.in → generator/gapi3-fixup.in
View file

12
parser/Makefile.am
View file

@ -1,14 +1,13 @@
assemblydir = $(prefix)/lib/gapi-3.0 assemblydir = $(prefix)/lib/gapi-3.0
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
assembly_DATA = gapi-fixup.exe gapi-parser.exe assembly_DATA = gapi-parser.exe
pkgconfig_DATA = gapi-3.0.pc pkgconfig_DATA = gapi-3.0.pc
bin_SCRIPTS = gapi3-fixup gapi3-parser bin_SCRIPTS = gapi3-parser
assembly_SCRIPTS = gapi_pp.pl gapi2xml.pl assembly_SCRIPTS = gapi_pp.pl gapi2xml.pl
CLEANFILES = gapi-fixup.exe gapi-parser.exe CLEANFILES = gapi-parser.exe
DISTCLEANFILES = gapi3-fixup gapi3-parser gapi-3.0.pc DISTCLEANFILES = gapi3-parser gapi-3.0.pc
sources = \ sources = \
gapi-fixup.cs \
gapi-parser.cs gapi-parser.cs
EXTRA_DIST = \ EXTRA_DIST = \
@ -18,9 +17,6 @@ EXTRA_DIST = \
gapi2xml.pl \ gapi2xml.pl \
gapi-3.0.pc.in gapi-3.0.pc.in
gapi-fixup.exe: $(srcdir)/gapi-fixup.cs
$(CSC) $(CSFLAGS) -out:gapi-fixup.exe $(srcdir)/gapi-fixup.cs
gapi-parser.exe: $(srcdir)/gapi-parser.cs gapi-parser.exe: $(srcdir)/gapi-parser.cs
$(CSC) $(CSFLAGS) -out:gapi-parser.exe $(srcdir)/gapi-parser.cs $(CSC) $(CSFLAGS) -out:gapi-parser.exe $(srcdir)/gapi-parser.cs

2
sample/opaquetest/Makefile.am
View file

@ -25,7 +25,7 @@ generated/*.cs: opaque-api.xml
api: api:
PATH=../../parser:$(PATH) $(RUNTIME) ../../parser/gapi-parser.exe opaque-sources.xml PATH=../../parser:$(PATH) $(RUNTIME) ../../parser/gapi-parser.exe opaque-sources.xml
$(RUNTIME) ../../parser/gapi-fixup.exe --metadata=Opaque.metadata --api=opaque-api.xml $(RUNTIME) ../../generator/gapi-fixup.exe --metadata=Opaque.metadata --api=opaque-api.xml
install: install: