From 185b9752bb6705fc317f3fd20c85d32c594fa515 Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Sat, 5 Jan 2002 18:56:52 +0000 Subject: [PATCH] generate atk-enum-types.[hc] NOTE: the long comment in atkobject.h is 2002-01-05 Hans Breuer * atk/makefile.msc : generate atk-enum-types.[hc] NOTE: the long comment in atkobject.h is crashing perl, at least version 5.005_02 built for MSWin32-x86-object Binary build 506 provided by ActiveState. Temporary deleting the AtkRole comment allows to work-around. atk/atk.def : updated externals --- ChangeLog | 10 ++++++++++ atk/atk.def | 11 ++++++----- atk/makefile.msc | 41 +++++++++++++++++++++++++++++++++++------ 3 files changed, 51 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index dba8c30..202257b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2002-01-05 Hans Breuer + + * atk/makefile.msc : generate atk-enum-types.[hc] + NOTE: the long comment in atkobject.h is crashing perl, + at least version 5.005_02 built for MSWin32-x86-object + Binary build 506 provided by ActiveState. Temporary + deleting the AtkRole comment allows to work-around. + + atk/atk.def : updated externals + 2002-01-02 Padraig O'Briain * atk/atkgobjectaccessible.h diff --git a/atk/atk.def b/atk/atk.def index bbbafd3..29fb431 100644 --- a/atk/atk.def +++ b/atk/atk.def @@ -40,9 +40,9 @@ EXPORTS atk_get_root atk_get_toolkit_name atk_get_toolkit_version + atk_gobject_accessible_for_object atk_gobject_accessible_get_object atk_gobject_accessible_get_type - atk_gobject_accessible_for_object atk_hyperlink_get_end_index atk_hyperlink_get_n_anchors atk_hyperlink_get_object @@ -54,7 +54,6 @@ EXPORTS atk_hypertext_get_link_index atk_hypertext_get_n_links atk_hypertext_get_type - atk_key_event_type_get_type atk_image_get_image_description atk_image_get_image_position atk_image_get_image_size @@ -62,6 +61,7 @@ EXPORTS atk_image_set_image_description atk_implementor_get_type atk_implementor_ref_accessible + atk_key_event_type_get_type atk_layer_get_type atk_no_op_object_factory_get_type atk_no_op_object_factory_new @@ -114,9 +114,9 @@ EXPORTS atk_remove_focus_tracker atk_remove_global_event_listener atk_remove_key_event_listener + atk_role_for_name atk_role_get_name atk_role_get_type - atk_role_for_name atk_role_register atk_selection_add_selection atk_selection_clear_selection @@ -177,12 +177,13 @@ EXPORTS atk_table_set_row_header atk_table_set_summary atk_text_add_selection - atk_text_get_caret_offset + atk_text_attribute_for_name atk_text_attribute_get_name atk_text_attribute_get_type atk_text_attribute_get_value - atk_text_attribute_for_name atk_text_attribute_register + atk_text_boundary_get_type + atk_text_get_caret_offset atk_text_get_character_at_offset atk_text_get_character_count atk_text_get_character_extents diff --git a/atk/makefile.msc b/atk/makefile.msc index ae0f933..fe2ded2 100644 --- a/atk/makefile.msc +++ b/atk/makefile.msc @@ -6,6 +6,10 @@ PRJ_TOP = .. PACKAGE = atk !INCLUDE $(TOP)\glib\build\win32\make.msc +!IFNDEF PERL +PERL = perl +!ENDIF + PKG_VER = 0.8 top_srcdir = $(PRJ_TOP) @@ -13,8 +17,8 @@ top_builddir = $(PRJ_TOP) includedir = $(PRJ_TOP) LT_RELEASE = $(PKG_VER) -INCLUDES = \ - -I$(top_srcdir) $(GLIB_CFLAGS) $(PANGO_CFLAGS) +INCLUDES = -FImsvc_recommended_pragmas.h \ + -I. -I$(top_srcdir) $(GLIB_CFLAGS) $(PANGO_CFLAGS) PKG_LINK = $(GLIB_LIBS) $(PANGO_LIBS) @@ -22,10 +26,12 @@ MAINTAINERCLEANFILES = \ atkmarshal.c OBJECTS = \ + atk-enum-types.obj \ atkaction.obj \ atkcomponent.obj \ atkdocument.obj \ atkeditabletext.obj \ + atkgobjectaccessible.obj \ atkhyperlink.obj \ atkhypertext.obj \ atkimage.obj \ @@ -48,15 +54,13 @@ OBJECTS = \ libatkincludedi = \ $(includedir)/atk-1.0/atk -lib_LTLIBRARIES = \ - libatk.la - -libatkinclude_HEADERS = \ +atk_headers = \ atk.h \ atkaction.h \ atkcomponent.h \ atkdocument.h \ atkeditabletext.h \ + atkgobjectaccessible.h \ atkhyperlink.h \ atkhypertext.h \ atknoopobject.h \ @@ -91,6 +95,31 @@ atkmarshal.h : atkmarshal.list atkmarshal.c : atkmarshal.list $(GLIB)\gobject\glib-genmarshal --prefix=atk_marshal atkmarshal.list --body >atkmarshal.c +# +# atk-enum-types.h +# +atk-enum-types.h : $(atk_headers) makefile.msc + $(PERL) $(GLIB)\gobject\glib-mkenums \ + --fhead "#ifndef __ATK_ENUM_TYPES_H__\n#define __ATK_ENUM_TYPES_H__\n" \ + --fprod "/* enumerations from \"@filename@\" */\n" \ + --vhead "GType @enum_name@_get_type (void);\n#define ATK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ + --ftail "#endif /* __ATK_ENUM_TYPES_H__ */" \ + $(atk_headers) > atk-enum-types.h + +# +# atk-enum-types.c +# +atk-enum-types.c: $(atk_headers) makefile.msc + $(PERL) $(GLIB)\gobject\glib-mkenums \ + --fhead "#include " \ + --fprod "\n/* enumerations from \"@filename@\" */" \ + --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ + $(atk_headers) > atk-enum-types.c + +atk-enum-types.obj : atk-enum-types.h atk-enum-types.c + $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h -- 2.7.4