b6d7f14268
* generator/CodeGenerator.cs: add a --glue-includes flag * generator/GenerationInfo.cs: Accept glue_includes value from Main and output it to the glue_filename. * generator/FieldBase.cs (Ignored): handle more ignorable cases. (CheckGlue): New method to figure out what kind of glue we'll need for a field. (GenerateImports): generate appropriate imports per CheckGlue. (GenerateGlue): Generate C glue for accessing a struct field; either a fully-C-based accessor, or a method to just return the field's offset in the struct. (Generate): Use the generated glue to read the field. * generator/PropertyBase.cs (CType): if the field is a single bit, set its type to gboolean. * generator/ObjectGen.cs (Generate): * generator/OpaqueGen.cs (Generate): Call GenFields. * generator/StructField.cs: Use FieldBase's glue-generation code to handle bitfields. [#54489] * generator/ObjectField.cs: Generates accessors for public fields of objects and opaque structs. [#69514] * generator/ClassBase.cs (ClassBase): Parse <fields> nodes and create ObjectField objects. (GenFields): Output field properties (IgnoreMethod): Ignore Get/Set methods that duplicate fields * generator/Makefile.am (sources): update * {gdk,gnome,gtk,pango}/*.metadata: Mark some additional fields as public. Rename/retype some fields for consistency with earlier hand-coded bindings. * {gdk,gnome,gtk,pango}/*.custom: Remove custom methods that can now be autogenerated. * {gdk,gnome,gtk,pango}/glue/*.c: Remove glue methods that can now be autogenerated * {gdk,glade,gnome,gtk,pango,vte}/Makefile.am * {gdk,glade,gnome,gtk,pango,vte}/glue/Makefile.am * {gdk,gnome,gtk,pango}/glue/makefile.win32: Update svn path=/trunk/gtk-sharp/; revision=44563
60 lines
2.2 KiB
Text
60 lines
2.2 KiB
Text
SNK = gtk-sharp.snk
|
|
API = $(pkg)-api.xml
|
|
RAW_API = $(pkg)-api.raw
|
|
|
|
ASSEMBLY_NAME = $(pkg)-sharp
|
|
ASSEMBLY = $(ASSEMBLY_NAME).dll
|
|
|
|
TARGET = $(pkg:=-sharp.dll) $(pkg:=-sharp.dll.config)
|
|
noinst_DATA = $(TARGET)
|
|
TARGET_API = $(pkg:=-api.xml)
|
|
gapidir = $(datadir)/gapi-2.0
|
|
gapi_DATA = $(TARGET_API)
|
|
CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(API) glue/generated.c $(SNK)
|
|
DISTCLEANFILES = $(ASSEMBLY).config
|
|
|
|
EXTRA_DIST = $(RAW_API) $(SYMBOLS) $(ASSEMBLY).config.in $(METADATA) $(customs) $(sources) $(add_dist)
|
|
|
|
build_symbols = $(addprefix --symbols=$(srcdir)/, $(SYMBOLS))
|
|
|
|
$(API): $(METADATA) $(RAW_API) $(SYMBOLS)
|
|
cp $(srcdir)/$(RAW_API) $(API)
|
|
chmod u+w $(API)
|
|
@if test -n '$(METADATA)'; then \
|
|
echo "$(RUNTIME) $(top_builddir)/parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) $(build_symbols)"; \
|
|
$(RUNTIME) $(top_builddir)/parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) $(build_symbols); \
|
|
fi
|
|
|
|
build_customs = $(addprefix $(srcdir)/, $(customs))
|
|
api_includes = $(addprefix -I:, $(INCLUDE_API))
|
|
|
|
generated-stamp: $(API) $(top_builddir)/generator/gapi_codegen.exe $(build_customs)
|
|
rm -f generated/* && \
|
|
$(RUNTIME) $(top_builddir)/generator/gapi_codegen.exe --generate $(API) \
|
|
$(api_includes) \
|
|
--outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
|
--gluelib-name=$(pkg)sharpglue-2 --glue-filename=glue/generated.c \
|
|
--glue-includes=$(glue_includes) \
|
|
&& touch generated-stamp
|
|
|
|
$(SNK): $(top_srcdir)/$(SNK)
|
|
cp $(top_srcdir)/$(SNK) .
|
|
|
|
build_sources = $(addprefix $(srcdir)/, $(sources)) $(top_builddir)/AssemblyInfo.cs
|
|
build_references = $(addprefix /r:, $(references))
|
|
|
|
$(ASSEMBLY): generated-stamp $(SNK) $(build_sources) $(references)
|
|
@rm -f $(ASSEMBLY).mdb
|
|
$(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(build_references) $(build_sources) $(GENERATED_SOURCES)
|
|
|
|
install-data-local:
|
|
@if test -n '$(pkg)'; then \
|
|
echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \
|
|
$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \
|
|
fi
|
|
|
|
uninstall-local:
|
|
@if test -n '$(pkg)'; then \
|
|
echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \
|
|
$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \
|
|
fi
|