From 5c90c21822e87d50680abb5391ac413552ea0c1a Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Fri, 1 Oct 2010 18:09:19 +0000 Subject: [PATCH] [gck] Build libgck docs and remove gp11 docs. Replace the gp11 docs with gck ones --- docs/reference/Makefile.am | 2 +- docs/reference/{gp11 => gck}/Makefile.am | 5 +- docs/reference/gck/gck-docs.sgml | 25 +++ .../gp11-overrides.txt => gck/gck-overrides.txt} | 0 docs/reference/gck/gck-sections.txt | 195 +++++++++++++++++++++ docs/reference/gck/gck.types | 4 + docs/reference/gp11/gp11-docs.sgml | 25 --- docs/reference/gp11/gp11-sections.txt | 195 --------------------- docs/reference/gp11/gp11.types | 4 - 9 files changed, 227 insertions(+), 228 deletions(-) rename docs/reference/{gp11 => gck}/Makefile.am (98%) create mode 100644 docs/reference/gck/gck-docs.sgml rename docs/reference/{gp11/gp11-overrides.txt => gck/gck-overrides.txt} (100%) create mode 100644 docs/reference/gck/gck-sections.txt create mode 100644 docs/reference/gck/gck.types delete mode 100644 docs/reference/gp11/gp11-docs.sgml delete mode 100644 docs/reference/gp11/gp11-sections.txt delete mode 100644 docs/reference/gp11/gp11.types diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index ad8f278..6a9b2af 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -1,2 +1,2 @@ -SUBDIRS = gcr gp11 +SUBDIRS = gcr gck diff --git a/docs/reference/gp11/Makefile.am b/docs/reference/gck/Makefile.am similarity index 98% rename from docs/reference/gp11/Makefile.am rename to docs/reference/gck/Makefile.am index d6e7373..966a1f3 100644 --- a/docs/reference/gp11/Makefile.am +++ b/docs/reference/gck/Makefile.am @@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = 1.6 # of using the various options. # The name of the module, e.g. 'glib'. -DOC_MODULE=gp11 +DOC_MODULE=gck # Uncomment for versioned docs and specify the version of the module, e.g. '2'. #DOC_MODULE_VERSION=2 @@ -22,7 +22,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml # gtk-doc will search all .c & .h files beneath here for inline comments # documenting the functions and macros. # e.g. DOC_SOURCE_DIR=../../../gtk -DOC_SOURCE_DIR=../../../gp11 +DOC_SOURCE_DIR=../../../gck # Extra options to pass to gtkdoc-scangobj. Not normally needed. SCANGOBJ_OPTIONS= @@ -96,4 +96,3 @@ EXTRA_DIST += # Comment this out if you want your docs-status tested during 'make check' #TESTS_ENVIRONMENT = cd $(srcsrc) #TESTS = $(GTKDOC_CHECK) - diff --git a/docs/reference/gck/gck-docs.sgml b/docs/reference/gck/gck-docs.sgml new file mode 100644 index 0000000..2846192 --- /dev/null +++ b/docs/reference/gck/gck-docs.sgml @@ -0,0 +1,25 @@ + + + + + GCK Reference Manual + + For GCK + The latest version of this documentation can be found on-line at + http://library.gnome.org/devel/gck/unstable/. + + + + + PKCS#11 GObject Bindings + + + + + + + + + + diff --git a/docs/reference/gp11/gp11-overrides.txt b/docs/reference/gck/gck-overrides.txt similarity index 100% rename from docs/reference/gp11/gp11-overrides.txt rename to docs/reference/gck/gck-overrides.txt diff --git a/docs/reference/gck/gck-sections.txt b/docs/reference/gck/gck-sections.txt new file mode 100644 index 0000000..1bad963 --- /dev/null +++ b/docs/reference/gck/gck-sections.txt @@ -0,0 +1,195 @@ +
+gck-attribute +GckAttribute +gck_attribute_init +gck_attribute_init_invalid +gck_attribute_init_empty +gck_attribute_init_boolean +gck_attribute_init_date +gck_attribute_init_ulong +gck_attribute_init_string +gck_attribute_init_copy +gck_attribute_new +gck_attribute_new_invalid +gck_attribute_new_empty +gck_attribute_new_boolean +gck_attribute_new_date +gck_attribute_new_ulong +gck_attribute_new_string +gck_attribute_is_invalid +gck_attribute_get_boolean +gck_attribute_get_ulong +gck_attribute_get_string +gck_attribute_get_date +gck_attribute_dup +gck_attribute_clear +gck_attribute_free +
+ +
+gck-attributes +GckAttributes +GCK_TYPE_ATTRIBUTES +gck_attributes_new +gck_attributes_new_empty +gck_attributes_newv +gck_attributes_at +gck_attributes_add +gck_attributes_add_data +gck_attributes_add_invalid +gck_attributes_add_empty +gck_attributes_add_boolean +gck_attributes_add_string +gck_attributes_add_date +gck_attributes_add_ulong +gck_attributes_find +gck_attributes_find_boolean +gck_attributes_find_ulong +gck_attributes_find_string +gck_attributes_find_date +gck_attributes_count +gck_attributes_ref +gck_attributes_unref +GckAllocator +GCK_BOOLEAN +GCK_ULONG +GCK_STRING +GCK_DATE +GCK_INVALID +
+ +
+gck-module +GckModule +gck_module_new +gck_module_initialize +gck_module_equal +gck_module_hash +gck_module_get_path +gck_module_get_functions +gck_module_get_info +gck_module_get_slots +gck_module_get_pool_sessions +gck_module_set_pool_sessions +gck_module_get_auto_authenticate +gck_module_set_auto_authenticate +gck_module_enumerate_objects +GckObjectForeachFunc +GckModuleInfo +gck_module_info_free +
+ +
+gck-slot +GckMechanismInfo +gck_mechanism_info_free +GckMechanisms +gck_mechanisms_length +gck_mechanisms_at +gck_mechanisms_free +gck_mechanisms_check +GckSlot +gck_slot_equal +gck_slot_hash +gck_slot_get_module +gck_slot_get_handle +gck_slot_get_info +gck_slot_get_token_info +gck_slot_get_mechanisms +gck_slot_get_mechanism_info +gck_slot_has_flags +gck_slot_open_session +gck_slot_open_session_full +gck_slot_open_session_async +gck_slot_open_session_finish +GckSlotInfo +gck_slot_info_free +GckTokenInfo +gck_token_info_free +
+ +
+gck-session +GckSession +gck_session_from_handle +gck_session_get_module +gck_session_get_slot +gck_session_get_handle +gck_session_get_info +gck_session_login +gck_session_login_full +gck_session_login_async +gck_session_login_finish +gck_session_logout +gck_session_logout_full +gck_session_logout_async +gck_session_logout_finish +gck_session_create_object +gck_session_create_object_async +gck_session_create_object_finish +gck_session_find_objects +gck_session_find_objects_async +gck_session_find_objects_finish +gck_session_encrypt +gck_session_encrypt_full +gck_session_encrypt_async +gck_session_encrypt_finish +gck_session_decrypt +gck_session_decrypt_full +gck_session_decrypt_async +gck_session_decrypt_finish +gck_session_sign +gck_session_sign_full +gck_session_sign_async +gck_session_sign_finish +gck_session_verify +gck_session_verify_full +gck_session_verify_async +gck_session_verify_finish +GckSessionInfo +gck_session_info_free +GckMechanism +
+ +
+gck-object +GckObject +gck_object_from_handle +gck_objects_from_handle_array +gck_object_equal +gck_object_hash +gck_object_get_module +gck_object_get_slot +gck_object_get_handle +gck_object_get_session +gck_object_set_session +gck_object_destroy +gck_object_destroy_full +gck_object_destroy_async +gck_object_destroy_finish +gck_object_set +gck_object_set_async +gck_object_set_finish +gck_object_get +gck_object_get_async +gck_object_get_finish +gck_object_get_data +gck_object_get_data_full +gck_object_get_data_async +gck_object_get_data_finish +
+ +
+gck-error +GCK_VENDOR_CODE +GCK_ERROR +gck_message_from_rv +CKR_GCK_MODULE_PROBLEM +
+ +
+gck-misc +gck_list_ref_copy +gck_list_unref_free +gck_string_from_chars +
diff --git a/docs/reference/gck/gck.types b/docs/reference/gck/gck.types new file mode 100644 index 0000000..d6871b1 --- /dev/null +++ b/docs/reference/gck/gck.types @@ -0,0 +1,4 @@ +gck_module_get_type +gck_slot_get_type +gck_session_get_type +gck_object_get_type diff --git a/docs/reference/gp11/gp11-docs.sgml b/docs/reference/gp11/gp11-docs.sgml deleted file mode 100644 index 055bef2..0000000 --- a/docs/reference/gp11/gp11-docs.sgml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - GP11 Reference Manual - - For GP11 - The latest version of this documentation can be found on-line at - http://library.gnome.org/devel/gp11/unstable/. - - - - - PKCS#11 GObject Bindings - - - - - - - - - - diff --git a/docs/reference/gp11/gp11-sections.txt b/docs/reference/gp11/gp11-sections.txt deleted file mode 100644 index bdb5fe6..0000000 --- a/docs/reference/gp11/gp11-sections.txt +++ /dev/null @@ -1,195 +0,0 @@ -
-gp11-attribute -GP11Attribute -gp11_attribute_init -gp11_attribute_init_invalid -gp11_attribute_init_empty -gp11_attribute_init_boolean -gp11_attribute_init_date -gp11_attribute_init_ulong -gp11_attribute_init_string -gp11_attribute_init_copy -gp11_attribute_new -gp11_attribute_new_invalid -gp11_attribute_new_empty -gp11_attribute_new_boolean -gp11_attribute_new_date -gp11_attribute_new_ulong -gp11_attribute_new_string -gp11_attribute_is_invalid -gp11_attribute_get_boolean -gp11_attribute_get_ulong -gp11_attribute_get_string -gp11_attribute_get_date -gp11_attribute_dup -gp11_attribute_clear -gp11_attribute_free -
- -
-gp11-attributes -GP11Attributes -GP11_TYPE_ATTRIBUTES -gp11_attributes_new -gp11_attributes_new_empty -gp11_attributes_newv -gp11_attributes_at -gp11_attributes_add -gp11_attributes_add_data -gp11_attributes_add_invalid -gp11_attributes_add_empty -gp11_attributes_add_boolean -gp11_attributes_add_string -gp11_attributes_add_date -gp11_attributes_add_ulong -gp11_attributes_find -gp11_attributes_find_boolean -gp11_attributes_find_ulong -gp11_attributes_find_string -gp11_attributes_find_date -gp11_attributes_count -gp11_attributes_ref -gp11_attributes_unref -GP11Allocator -GP11_BOOLEAN -GP11_ULONG -GP11_STRING -GP11_DATE -GP11_INVALID -
- -
-gp11-module -GP11Module -gp11_module_new -gp11_module_initialize -gp11_module_equal -gp11_module_hash -gp11_module_get_path -gp11_module_get_functions -gp11_module_get_info -gp11_module_get_slots -gp11_module_get_pool_sessions -gp11_module_set_pool_sessions -gp11_module_get_auto_authenticate -gp11_module_set_auto_authenticate -gp11_module_enumerate_objects -GP11ObjectForeachFunc -GP11ModuleInfo -gp11_module_info_free -
- -
-gp11-slot -GP11MechanismInfo -gp11_mechanism_info_free -GP11Mechanisms -gp11_mechanisms_length -gp11_mechanisms_at -gp11_mechanisms_free -gp11_mechanisms_check -GP11Slot -gp11_slot_equal -gp11_slot_hash -gp11_slot_get_module -gp11_slot_get_handle -gp11_slot_get_info -gp11_slot_get_token_info -gp11_slot_get_mechanisms -gp11_slot_get_mechanism_info -gp11_slot_has_flags -gp11_slot_open_session -gp11_slot_open_session_full -gp11_slot_open_session_async -gp11_slot_open_session_finish -GP11SlotInfo -gp11_slot_info_free -GP11TokenInfo -gp11_token_info_free -
- -
-gp11-session -GP11Session -gp11_session_from_handle -gp11_session_get_module -gp11_session_get_slot -gp11_session_get_handle -gp11_session_get_info -gp11_session_login -gp11_session_login_full -gp11_session_login_async -gp11_session_login_finish -gp11_session_logout -gp11_session_logout_full -gp11_session_logout_async -gp11_session_logout_finish -gp11_session_create_object -gp11_session_create_object_async -gp11_session_create_object_finish -gp11_session_find_objects -gp11_session_find_objects_async -gp11_session_find_objects_finish -gp11_session_encrypt -gp11_session_encrypt_full -gp11_session_encrypt_async -gp11_session_encrypt_finish -gp11_session_decrypt -gp11_session_decrypt_full -gp11_session_decrypt_async -gp11_session_decrypt_finish -gp11_session_sign -gp11_session_sign_full -gp11_session_sign_async -gp11_session_sign_finish -gp11_session_verify -gp11_session_verify_full -gp11_session_verify_async -gp11_session_verify_finish -GP11SessionInfo -gp11_session_info_free -GP11Mechanism -
- -
-gp11-object -GP11Object -gp11_object_from_handle -gp11_objects_from_handle_array -gp11_object_equal -gp11_object_hash -gp11_object_get_module -gp11_object_get_slot -gp11_object_get_handle -gp11_object_get_session -gp11_object_set_session -gp11_object_destroy -gp11_object_destroy_full -gp11_object_destroy_async -gp11_object_destroy_finish -gp11_object_set -gp11_object_set_async -gp11_object_set_finish -gp11_object_get -gp11_object_get_async -gp11_object_get_finish -gp11_object_get_data -gp11_object_get_data_full -gp11_object_get_data_async -gp11_object_get_data_finish -
- -
-gp11-error -GP11_VENDOR_CODE -GP11_ERROR -gp11_message_from_rv -CKR_GP11_MODULE_PROBLEM -
- -
-gp11-misc -gp11_list_ref_copy -gp11_list_unref_free -gp11_string_from_chars -
diff --git a/docs/reference/gp11/gp11.types b/docs/reference/gp11/gp11.types deleted file mode 100644 index 1c30380..0000000 --- a/docs/reference/gp11/gp11.types +++ /dev/null @@ -1,4 +0,0 @@ -gp11_module_get_type -gp11_slot_get_type -gp11_session_get_type -gp11_object_get_type -- 2.7.4