GNOME.org
 

[libgda] Removed LDAP from documentation

commit 5ae5a33197dea5102ef3f0de0086f050f2916b61
Author: Daniel Espinosa <esodan gmail com>
Date:   Mon Apr 22 18:27:55 2019 -0500

    Removed LDAP from documentation
    
    LDAP is just an another provider, no documentation
    should be included for it, at least not for LIBGDA

 doc/C/libgda/libgda-6.0-docs.xml                   |  4 -
 doc/C/libgda/libgda-6.0-sections.txt               | 94 ----------------------
 doc/C/libgda/libgda.types.in                       |  4 -
 libgda/meson.build                                 | 21 -----
 libgda/sqlite/virtual/meson.build                  |  8 --
 {libgda => providers/ldap}/gda-data-model-ldap.c   |  0
 {libgda => providers/ldap}/gda-data-model-ldap.h   |  0
 .../ldap}/gda-ldap-connection.c                    |  0
 .../ldap}/gda-ldap-connection.h                    |  0
 {libgda => providers/ldap}/gda-tree-mgr-ldap.c     |  0
 {libgda => providers/ldap}/gda-tree-mgr-ldap.h     |  0
 providers/ldap/meson.build                         | 18 +++++
 12 files changed, 18 insertions(+), 131 deletions(-)
---
diff --git a/doc/C/libgda/libgda-6.0-docs.xml b/doc/C/libgda/libgda-6.0-docs.xml
index 097b53fb3..3592ccbac 100644
--- a/doc/C/libgda/libgda-6.0-docs.xml
+++ b/doc/C/libgda/libgda-6.0-docs.xml
@@ -32,7 +32,6 @@
       <title>Connection</title>
       <xi:include href="xml/gda-connection.xml"/>
       <xi:include href="xml/gda-connection-event.xml"/>
-      <xi:include href="xml/gda-ldap-connection.xml"/>
       <xi:include href="xml/gda-xa-transaction.xml"/>
       <xi:include href="xml/gda-transaction-status.xml"/>
       <xi:include href="xml/gda-virtual-connection.xml"/>
@@ -55,11 +54,9 @@
       <title>Data Model</title>
       <xi:include href="xml/gda-data-model.xml"/>
       <xi:include href="xml/gda-data-model-array.xml"/>
-      <xi:include href="xml/gda-data-model-bdb.xml"/>
       <xi:include href="xml/gda-data-model-dir.xml"/>
       <xi:include href="xml/gda-data-model-import.xml"/>
       <xi:include href="xml/gda-data-model-iter.xml"/>
-      <xi:include href="xml/gda-data-model-ldap.xml"/>
       <xi:include href="xml/gda-data-access-wrapper.xml"/>
       <xi:include href="xml/gda-column.xml"/>
       <xi:include href="xml/gda-row.xml"/>
@@ -117,7 +114,6 @@
       <xi:include href="xml/gda-tree-manager.xml"/>
       <xi:include href="xml/gda-tree-mgr-columns.xml"/>
       <xi:include href="xml/gda-tree-mgr-label.xml"/>
-      <xi:include href="xml/gda-tree-mgr-ldap.xml"/>
       <xi:include href="xml/gda-tree-mgr-schemas.xml"/>
       <xi:include href="xml/gda-tree-mgr-select.xml"/>
       <xi:include href="xml/gda-tree-mgr-tables.xml"/>
diff --git a/doc/C/libgda/libgda-6.0-sections.txt b/doc/C/libgda/libgda-6.0-sections.txt
index 091834368..4ff35db9f 100644
--- a/doc/C/libgda/libgda-6.0-sections.txt
+++ b/doc/C/libgda/libgda-6.0-sections.txt
@@ -364,100 +364,6 @@ GDA_TYPE_DATA_MODEL_ARRAY
 gda_data_model_array_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gda-data-model-bdb</FILE>
-<TITLE>GdaDataModelBdb</TITLE>
-GdaDataModelBdb
-GdaDataModelBdbClass
-GdaDataModelBdbPrivate
-gda_data_model_bdb_new
-gda_data_model_bdb_get_errors
-gda_data_model_bdb_clean_errors
-<SUBSECTION Standard>
-GDA_DATA_MODEL_BDB
-GDA_DATA_MODEL_BDB_CLASS
-GDA_IS_DATA_MODEL_BDB
-GDA_IS_DATA_MODEL_BDB_CLASS
-GDA_TYPE_DATA_MODEL_BDB
-gda_data_model_bdb_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gda-data-model-ldap</FILE>
-<TITLE>GdaDataModelLdap</TITLE>
-GdaDataModelLdap
-GdaDataModelLdapClass
-GdaDataModelLdapPrivate
-GdaLdapSearchScope
-gda_data_model_ldap_new
-gda_data_model_ldap_new_with_config
-gda_data_model_ldap_compute_columns
-<SUBSECTION Standard>
-GDA_DATA_MODEL_LDAP
-GDA_DATA_MODEL_LDAP_CLASS
-GDA_IS_DATA_MODEL_LDAP
-GDA_IS_DATA_MODEL_LDAP_CLASS
-GDA_TYPE_DATA_MODEL_LDAP
-gda_data_model_ldap_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gda-ldap-connection</FILE>
-<TITLE>GdaLdapConnection</TITLE>
-<INCLUDE>virtual/gda-ldap-connection.h</INCLUDE>
-GdaLdapConnection
-GdaLdapConnectionClass
-GdaLdapConnectionPrivate
-gda_ldap_connection_get_base_dn
-gda_ldap_connection_declare_table
-gda_ldap_connection_undeclare_table
-<SUBSECTION>
-GdaLdapAttribute
-GdaLdapEntry
-gda_ldap_is_dn
-gda_ldap_dn_split
-gda_ldap_describe_entry
-gda_ldap_entry_free
-gda_ldap_get_entry_children
-<SUBSECTION>
-gda_ldap_entry_add_attribute
-gda_ldap_entry_new
-GdaLdapAttributeDefinition
-gda_ldap_entry_get_attributes_list
-gda_ldap_attributes_list_free
-<SUBSECTION>
-GdaLdapModificationType
-gda_ldap_add_entry
-gda_ldap_remove_entry
-gda_ldap_rename_entry
-gda_ldap_modify_entry
-<SUBSECTION>
-GdaLdapClassKind
-GdaLdapClass
-gda_ldap_get_class_info
-gda_ldap_get_top_classes
-<SUBSECTION Standard>
-GDA_LDAP_CONNECTION
-GDA_LDAP_CONNECTION_CLASS
-GDA_IS_LDAP_CONNECTION
-GDA_IS_LDAP_CONNECTION_CLASS
-GDA_TYPE_LDAP_CONNECTION
-gda_ldap_connection_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gda-tree-mgr-ldap</FILE>
-<TITLE>GdaTreeMgrLdap</TITLE>
-GdaTreeMgrLdap
-gda_tree_mgr_ldap_new
-<SUBSECTION Standard>
-GDA_TREE_MGR_LDAP
-GDA_TREE_MGR_LDAP_GET_CLASS
-GDA_IS_TREE_MGR_LDAP
-GDA_TYPE_TREE_MGR_LDAP
-gda_tree_mgr_ldap_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gda-data-model-dir</FILE>
 <TITLE>GdaDataModelDir</TITLE>
diff --git a/doc/C/libgda/libgda.types.in b/doc/C/libgda/libgda.types.in
index 6358eec69..535e3859a 100644
--- a/doc/C/libgda/libgda.types.in
+++ b/doc/C/libgda/libgda.types.in
@@ -20,10 +20,6 @@ gda_handler_numerical_get_type
 gda_handler_bin_get_type
 gda_handler_type_get_type
 gda_data_model_array_get_type
-@LIBGDA_BDB_TYPE@
-@LIBGDA_LDAP_TYPE@
-@LIBGDA_LDAP_TYPE2@
-@LIBGDA_LDAP_TYPE3@
 gda_data_model_dir_get_type
 gda_row_get_type
 gda_data_model_get_type
diff --git a/libgda/meson.build b/libgda/meson.build
index fc4efea14..7beb6ab48 100644
--- a/libgda/meson.build
+++ b/libgda/meson.build
@@ -260,26 +260,6 @@ libgda_source_all += [
        libgda_binreloc_sources
        ]
 
-ldap_cargs = []
-if ldap_found and get_option('enable-ldap') and get_option('enable-experimental')
-ldaph_sources = files ([
-       'gda-data-model-ldap.h',
-       'gda-tree-mgr-ldap.h'
-       ])
-libgda_headers_all += ldaph_sources
-install_headers(ldaph_sources,
-       install_dir: join_paths(get_option('includedir'),project_package,'libgda')
-       )
-
-ldapc_sources = files ([
-       'gda-data-model-ldap.c',
-       'gda-tree-mgr-ldap.c'
-       ])
-libgda_source_all += ldapc_sources
-ldap_cargs += [
-       '-DHAVE_LDAP'
-       ]
-endif
 
 if lbdb_found
        lbdbh_sources = files ([
@@ -354,7 +334,6 @@ libgda = library(
        dependencies : libgda_deps,
        c_args : [
                libgda_cargs,
-               ldap_cargs,
                lbdb_cargs
                ],
        install : true
diff --git a/libgda/sqlite/virtual/meson.build b/libgda/sqlite/virtual/meson.build
index 5fc60502d..3571d5aeb 100644
--- a/libgda/sqlite/virtual/meson.build
+++ b/libgda/sqlite/virtual/meson.build
@@ -23,11 +23,3 @@ libgda_virtual_sources = files(
        )
 libgda_virtual_sources += virtual_headers
 
-if ldap_found and get_option('enable-ldap') and get_option('enable-experimental')
-ldaph_virtual = files('gda-ldap-connection.h')
-ldapc_virtual= files('gda-ldap-connection.c')
-libgda_virtual_sources += [
-       ldaph_virtual,
-       ldapc_virtual
-       ]
-endif
diff --git a/libgda/gda-data-model-ldap.c b/providers/ldap/gda-data-model-ldap.c
similarity index 100%
rename from libgda/gda-data-model-ldap.c
rename to providers/ldap/gda-data-model-ldap.c
diff --git a/libgda/gda-data-model-ldap.h b/providers/ldap/gda-data-model-ldap.h
similarity index 100%
rename from libgda/gda-data-model-ldap.h
rename to providers/ldap/gda-data-model-ldap.h
diff --git a/libgda/sqlite/virtual/gda-ldap-connection.c b/providers/ldap/gda-ldap-connection.c
similarity index 100%
rename from libgda/sqlite/virtual/gda-ldap-connection.c
rename to providers/ldap/gda-ldap-connection.c
diff --git a/libgda/sqlite/virtual/gda-ldap-connection.h b/providers/ldap/gda-ldap-connection.h
similarity index 100%
rename from libgda/sqlite/virtual/gda-ldap-connection.h
rename to providers/ldap/gda-ldap-connection.h
diff --git a/libgda/gda-tree-mgr-ldap.c b/providers/ldap/gda-tree-mgr-ldap.c
similarity index 100%
rename from libgda/gda-tree-mgr-ldap.c
rename to providers/ldap/gda-tree-mgr-ldap.c
diff --git a/libgda/gda-tree-mgr-ldap.h b/providers/ldap/gda-tree-mgr-ldap.h
similarity index 100%
rename from libgda/gda-tree-mgr-ldap.h
rename to providers/ldap/gda-tree-mgr-ldap.h
diff --git a/providers/ldap/meson.build b/providers/ldap/meson.build
index 6deb9a8c0..c8233b560 100644
--- a/providers/ldap/meson.build
+++ b/providers/ldap/meson.build
@@ -2,6 +2,21 @@
 inc_libgda_ldaph = include_directories ('.')
 inc_libgda_ldaph_dep = declare_dependency (include_directories : inc_libgda_ldaph)
 
+ldaph_sources = files ([
+       'gda-ldap-connection.h',
+       'gda-data-model-ldap.h',
+       'gda-tree-mgr-ldap.h'
+       ])
+install_headers(ldaph_sources,
+       install_dir: join_paths(get_option('includedir'),project_package,'libgda')
+       )
+
+ldapc_sources = files ([
+       'gda-ldap-connection.c',
+       'gda-data-model-ldap.c',
+       'gda-tree-mgr-ldap.c'
+       ])
+
 libgda_ldap_sources = files([
        'gdaprov-data-model-ldap.c',
        'gdaprov-data-model-ldap.h',
@@ -13,6 +28,9 @@ libgda_ldap_sources = files([
        'libmain.c'
        ])
 
+libgda_ldap_sources += ldaph_sources
+libgda_ldap_sources += ldapc_sources
+
 ldap_xml_fnames = [
        'ldap_specs_auth',
        'ldap_specs_dsn',
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]