Go back to the old way of installing config definitions for C++ modules

Making this work is a lot of work and files need to be specified for
config generation anyway

12 files changed, 124 insertions, 81 deletions

diff --git a/configdefinitions/src/vespa/CMakeLists.txt b/configdefinitions/src/vespa/CMakeLists.txt
index ad870ff6a87..0673e803057 100644
--- a/configdefinitions/src/vespa/CMakeLists.txt
+++ b/configdefinitions/src/vespa/CMakeLists.txt
@@ -4,39 +4,73 @@ vespa_add_library(configdefinitions
     INSTALL lib64
     DEPENDS
 )
-vespa_generate_config(configdefinitions cloud.config.application-id.def)
-vespa_generate_config(configdefinitions vespa.hosted.athenz.instanceproviderservice.config.athenz-provider-service.def)
-vespa_generate_config(configdefinitions vespa.config.search.attributes.def)
-vespa_generate_config(configdefinitions cloud.config.cluster-info.def)
-vespa_generate_config(configdefinitions cloud.config.cluster-list.def)
-vespa_generate_config(configdefinitions cloud.config.configserver.def)
-vespa_generate_config(configdefinitions vespa.config.search.dispatch.def)
-vespa_generate_config(configdefinitions cloud.config.filedistribution.filereferences.def)
-vespa_generate_config(configdefinitions vespa.config.content.fleetcontroller.def)
-vespa_generate_config(configdefinitions vespa.configdefinition.ilscripts.def)
-vespa_generate_config(configdefinitions vespa.config.search.imported-fields.def)
-vespa_generate_config(configdefinitions vespa.config.search.indexschema.def)
-vespa_generate_config(configdefinitions cloud.config.lb-services.def)
-vespa_generate_config(configdefinitions vespa.config.content.load-type.def)
-vespa_generate_config(configdefinitions cloud.config.logforwarder.def)
-vespa_generate_config(configdefinitions vespa.config.content.messagetyperouteselectorpolicy.def)
-vespa_generate_config(configdefinitions cloud.config.model.def)
-vespa_generate_config(configdefinitions vespa.orchestrator.config.orchestrator.def)
-vespa_generate_config(configdefinitions vespa.config.content.persistence.def)
-vespa_generate_config(configdefinitions vespa.config.search.rank-profiles.def)
-vespa_generate_config(configdefinitions cloud.config.routing-provider.def)
-vespa_generate_config(configdefinitions cloud.config.sentinel.def)
-vespa_generate_config(configdefinitions cloud.config.slobroks.def)
-vespa_generate_config(configdefinitions vespa.configdefinition.specialtokens.def)
-vespa_generate_config(configdefinitions vespa.config.content.stor-distribution.def)
-vespa_generate_config(configdefinitions vespa.config.content.stor-filestor.def)
-vespa_generate_config(configdefinitions vespa.config.search.summary.def)
-vespa_generate_config(configdefinitions vespa.config.search.summarymap.def)
-vespa_generate_config(configdefinitions vespa.config.content.upgrading.def)
-vespa_generate_config(configdefinitions cloud.config.ymon.def)
-vespa_generate_config(configdefinitions cloud.config.zookeeper-server.def)
-vespa_generate_config(configdefinitions cloud.config.zookeepers.def)
-vespa_generate_config(configdefinitions vespa.config.content.core.bucketspaces.def)
-vespa_generate_config(configdefinitions vespa.config.content.all-clusters-bucket-spaces.def)
-vespa_generate_config(configdefinitions vespa.config.core.stateserver.def)
-install_config_definitions(src/vespa)
+vespa_generate_config(configdefinitions application-id.def)
+install_config_definition(application-id.def cloud.config.application-id.def)
+vespa_generate_config(configdefinitions athenz-provider-service.def)
+install_config_definition(athenz-provider-service.def vespa.hosted.athenz.instanceproviderservice.config.athenz-provider-service.def)
+vespa_generate_config(configdefinitions attributes.def)
+install_config_definition(attributes.def vespa.config.search.attributes.def)
+vespa_generate_config(configdefinitions cluster-info.def)
+install_config_definition(cluster-info.def cloud.config.cluster-info.def)
+vespa_generate_config(configdefinitions cluster-list.def)
+install_config_definition(cluster-list.def cloud.config.cluster-list.def)
+vespa_generate_config(configdefinitions configserver.def)
+install_config_definition(configserver.def cloud.config.configserver.def)
+vespa_generate_config(configdefinitions dispatch.def)
+install_config_definition(dispatch.def vespa.config.search.dispatch.def)
+vespa_generate_config(configdefinitions filereferences.def)
+install_config_definition(filereferences.def cloud.config.filedistribution.filereferences.def)
+vespa_generate_config(configdefinitions fleetcontroller.def)
+install_config_definition(fleetcontroller.def vespa.config.content.fleetcontroller.def)
+vespa_generate_config(configdefinitions ilscripts.def)
+install_config_definition(ilscripts.def vespa.configdefinition.ilscripts.def)
+vespa_generate_config(configdefinitions imported-fields.def)
+install_config_definition(imported-fields.def vespa.config.search.imported-fields.def)
+vespa_generate_config(configdefinitions indexschema.def)
+install_config_definition(indexschema.def vespa.config.search.indexschema.def)
+vespa_generate_config(configdefinitions lb-services.def)
+install_config_definition(lb-services.def cloud.config.lb-services.def)
+vespa_generate_config(configdefinitions load-type.def)
+install_config_definition(load-type.def vespa.config.content.load-type.def)
+vespa_generate_config(configdefinitions logforwarder.def)
+install_config_definition(logforwarder.def cloud.config.logforwarder.def)
+vespa_generate_config(configdefinitions messagetyperouteselectorpolicy.def)
+install_config_definition(messagetyperouteselectorpolicy.def vespa.config.content.messagetyperouteselectorpolicy.def)
+vespa_generate_config(configdefinitions model.def)
+install_config_definition(model.def cloud.config.model.def)
+vespa_generate_config(configdefinitions orchestrator.def)
+install_config_definition(orchestrator.def vespa.orchestrator.config.orchestrator.def)
+vespa_generate_config(configdefinitions persistence.def)
+install_config_definition(persistence.def vespa.config.content.persistence.def)
+vespa_generate_config(configdefinitions rank-profiles.def)
+install_config_definition(rank-profiles.def vespa.config.search.rank-profiles.def)
+vespa_generate_config(configdefinitions routing-provider.def)
+install_config_definition(routing-provider.def cloud.config.routing-provider.def)
+vespa_generate_config(configdefinitions sentinel.def)
+install_config_definition(sentinel.def cloud.config.sentinel.def)
+vespa_generate_config(configdefinitions slobroks.def)
+install_config_definition(slobroks.def cloud.config.slobroks.def)
+vespa_generate_config(configdefinitions specialtokens.def)
+install_config_definition(specialtokens.def vespa.configdefinition.specialtokens.def)
+vespa_generate_config(configdefinitions stor-distribution.def)
+install_config_definition(stor-distribution.def vespa.config.content.stor-distribution.def)
+vespa_generate_config(configdefinitions stor-filestor.def)
+install_config_definition(stor-filestor.def vespa.config.content.stor-filestor.def)
+vespa_generate_config(configdefinitions summary.def)
+install_config_definition(summary.def vespa.config.search.summary.def)
+vespa_generate_config(configdefinitions summarymap.def)
+install_config_definition(summarymap.def vespa.config.search.summarymap.def)
+vespa_generate_config(configdefinitions upgrading.def)
+install_config_definition(upgrading.def vespa.config.content.upgrading.def)
+vespa_generate_config(configdefinitions ymon.def)
+install_config_definition(ymon.def cloud.config.ymon.def)
+vespa_generate_config(configdefinitions zookeeper-server.def)
+install_config_definition(zookeeper-server.def cloud.config.zookeeper-server.def)
+vespa_generate_config(configdefinitions zookeepers.def)
+install_config_definition(zookeepers.def cloud.config.zookeepers.def)
+vespa_generate_config(configdefinitions bucketspaces.def)
+install_config_definition(bucketspaces.def vespa.config.content.core.bucketspaces.def)
+vespa_generate_config(configdefinitions all-clusters-bucket-spaces.def)
+install_config_definition(all-clusters-bucket-spaces.def vespa.config.content.all-clusters-bucket-spaces.def)
+vespa_generate_config(configdefinitions stateserver.def)
+install_config_definition(stateserver.def vespa.config.core.stateserver.def)
diff --git a/document/src/vespa/document/config/CMakeLists.txt b/document/src/vespa/document/config/CMakeLists.txt
index 1a610a968f9..fc711c5e57a 100644
--- a/document/src/vespa/document/config/CMakeLists.txt
+++ b/document/src/vespa/document/config/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_library(document_documentconfig OBJECT
     SOURCES
     DEPENDS
 )
-vespa_generate_config(document_documentconfig document.documenttypes.def)
-vespa_generate_config(document_documentconfig document.config.documentmanager.def)
-install_config_definitions(src/vespa/document/config)
+vespa_generate_config(document_documentconfig documenttypes.def)
+install_config_definition(documenttypes.def document.documenttypes.def)
+install_config_definition(documentmanager.def document.config.documentmanager.def)
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/CMakeLists.txt b/documentapi/src/vespa/documentapi/messagebus/policies/CMakeLists.txt
index 980dbcd2201..26d51e702e9 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/CMakeLists.txt
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/CMakeLists.txt
@@ -17,5 +17,5 @@ vespa_add_library(documentapi_documentapipolicies OBJECT
     asyncinitializationpolicy.cpp
     DEPENDS
 )
-vespa_generate_config(documentapi_documentapipolicies ../../../../main/resources/configdefinitions/documentapi.messagebus.protocol.documentrouteselectorpolicy.def)
-install_config_definitions(../../../../main/resources/configdefinitions)
+vespa_generate_config(documentapi_documentapipolicies ../../../../main/resources/configdefinitions/documentrouteselectorpolicy.def)
+install_config_definition(../../../../main/resources/configdefinitions/documentrouteselectorpolicy.def documentapi.messagebus.protocol.documentrouteselectorpolicy.def)
diff --git a/logd/src/logd/CMakeLists.txt b/logd/src/logd/CMakeLists.txt
index 43b85a8a28b..cc73b51f0b1 100644
--- a/logd/src/logd/CMakeLists.txt
+++ b/logd/src/logd/CMakeLists.txt
@@ -24,7 +24,7 @@ vespa_add_library(logd STATIC
     DEPENDS
 )
 
-vespa_generate_config(logd ../main/resources/configdefinitions/cloud.config.log.logd.def)
-install_config_definitions(../main/resources/configdefinitions)
+vespa_generate_config(logd ../main/resources/configdefinitions/logd.def)
+install_config_definition(../main/resources/configdefinitions/logd.def cloud.config.log.logd.def)
 
 vespa_add_target_package_dependency(logd Protobuf)
diff --git a/messagebus/src/vespa/messagebus/CMakeLists.txt b/messagebus/src/vespa/messagebus/CMakeLists.txt
index 2d408e93358..1dfac1fbdac 100644
--- a/messagebus/src/vespa/messagebus/CMakeLists.txt
+++ b/messagebus/src/vespa/messagebus/CMakeLists.txt
@@ -36,5 +36,5 @@ vespa_add_library(messagebus
     INSTALL lib64
     DEPENDS
 )
-vespa_generate_config(messagebus ../../main/config/messagebus.messagebus.def)
-install_config_definitions(../../main/config)
+vespa_generate_config(messagebus ../../main/config/messagebus.def)
+install_config_definition(../../main/config/messagebus.def messagebus.messagebus.def)
diff --git a/metrics/src/vespa/metrics/CMakeLists.txt b/metrics/src/vespa/metrics/CMakeLists.txt
index 705f57d977b..0d7eeba3601 100644
--- a/metrics/src/vespa/metrics/CMakeLists.txt
+++ b/metrics/src/vespa/metrics/CMakeLists.txt
@@ -25,5 +25,5 @@ vespa_add_library(metrics
     INSTALL lib64
     DEPENDS
 )
-vespa_generate_config(metrics metrics.metricsmanager.def)
-install_config_definitions(src/vespa/metrics)
+vespa_generate_config(metrics metricsmanager.def)
+install_config_definition(metricsmanager.def metrics.metricsmanager.def)
diff --git a/searchcore/src/vespa/searchcore/config/CMakeLists.txt b/searchcore/src/vespa/searchcore/config/CMakeLists.txt
index 25307f4a6c8..915ab147978 100644
--- a/searchcore/src/vespa/searchcore/config/CMakeLists.txt
+++ b/searchcore/src/vespa/searchcore/config/CMakeLists.txt
@@ -3,10 +3,12 @@ vespa_add_library(searchcore_fconfig STATIC
     SOURCES
     DEPENDS
 )
-vespa_generate_config(searchcore_fconfig vespa.config.search.core.fdispatchrc.def)
-vespa_generate_config(searchcore_fconfig vespa.config.search.core.proton.def)
-vespa_generate_config(searchcore_fconfig vespa.config.search.core.ranking-constants.def)
-vespa_generate_config(searchcore_fconfig vespa.config.search.core.onnx-models.def)
-vespa_generate_config(searchcore_fconfig vespa.config.search.core.hwinfo.def)
-
-install_config_definitions(src/vespa/searchcore/config)
+vespa_generate_config(searchcore_fconfig fdispatchrc.def)
+install_config_definition(fdispatchrc.def vespa.config.search.core.fdispatchrc.def)
+vespa_generate_config(searchcore_fconfig proton.def)
+install_config_definition(proton.def vespa.config.search.core.proton.def)
+vespa_generate_config(searchcore_fconfig ranking-constants.def)
+install_config_definition(ranking-constants.def vespa.config.search.core.ranking-constants.def)
+vespa_generate_config(searchcore_fconfig onnx-models.def)
+install_config_definition(onnx-models.def vespa.config.search.core.onnx-models.def)
+vespa_generate_config(searchcore_fconfig hwinfo.def)
diff --git a/searchlib/src/vespa/searchlib/config/CMakeLists.txt b/searchlib/src/vespa/searchlib/config/CMakeLists.txt
index 5b9aa96f80d..571cd3ad9f1 100644
--- a/searchlib/src/vespa/searchlib/config/CMakeLists.txt
+++ b/searchlib/src/vespa/searchlib/config/CMakeLists.txt
@@ -3,6 +3,5 @@ vespa_add_library(searchlib_sconfig OBJECT
     SOURCES
     DEPENDS
 )
-vespa_generate_config(searchlib_sconfig searchlib.translogserver.def)
-
-install_config_definitions(src/vespa/searchlib/config)
+vespa_generate_config(searchlib_sconfig translogserver.def)
+install_config_definition(translogserver.def searchlib.translogserver.def)
diff --git a/searchsummary/src/vespa/searchsummary/config/CMakeLists.txt b/searchsummary/src/vespa/searchsummary/config/CMakeLists.txt
index da94757e239..a01938d8ad4 100644
--- a/searchsummary/src/vespa/searchsummary/config/CMakeLists.txt
+++ b/searchsummary/src/vespa/searchsummary/config/CMakeLists.txt
@@ -3,6 +3,5 @@ vespa_add_library(searchsummary_config OBJECT
     SOURCES
     DEPENDS
 )
-vespa_generate_config(searchsummary_config vespa.config.search.summary.juniperrc.def)
-
-install_config_definitions(src/vespa/searchsummary/config)
+vespa_generate_config(searchsummary_config juniperrc.def)
+install_config_definition(juniperrc.def vespa.config.search.summary.juniperrc.def)
diff --git a/storage/src/vespa/storage/bucketdb/CMakeLists.txt b/storage/src/vespa/storage/bucketdb/CMakeLists.txt
index 22d43eb494e..048cc25ec95 100644
--- a/storage/src/vespa/storage/bucketdb/CMakeLists.txt
+++ b/storage/src/vespa/storage/bucketdb/CMakeLists.txt
@@ -15,7 +15,7 @@ vespa_add_library(storage_bucketdb OBJECT
     storbucketdb.cpp
     DEPENDS
 )
-vespa_generate_config(storage_bucketdb vespa.config.content.core.stor-bucketdb.def)
-vespa_generate_config(storage_bucketdb vespa.config.content.core.stor-bucket-init.def)
-
-install_config_definitions(src/vespa/storage/bucketdb)
+vespa_generate_config(storage_bucketdb stor-bucketdb.def)
+install_config_definition(stor-bucketdb.def vespa.config.content.core.stor-bucketdb.def)
+vespa_generate_config(storage_bucketdb stor-bucket-init.def)
+install_config_definition(stor-bucket-init.def vespa.config.content.core.stor-bucket-init.def)
diff --git a/storage/src/vespa/storage/config/CMakeLists.txt b/storage/src/vespa/storage/config/CMakeLists.txt
index 5382048ece7..4a20d510043 100644
--- a/storage/src/vespa/storage/config/CMakeLists.txt
+++ b/storage/src/vespa/storage/config/CMakeLists.txt
@@ -4,17 +4,27 @@ vespa_add_library(storage_storageconfig OBJECT
     distributorconfiguration.cpp
     DEPENDS
 )
-vespa_generate_config(storage_storageconfig vespa.config.content.core.stor-communicationmanager.def)
-vespa_generate_config(storage_storageconfig vespa.config.content.core.stor-distributormanager.def)
-vespa_generate_config(storage_storageconfig vespa.config.content.core.stor-server.def)
-vespa_generate_config(storage_storageconfig vespa.config.content.core.stor-status.def)
-vespa_generate_config(storage_storageconfig vespa.config.content.core.stor-messageforwarder.def)
-vespa_generate_config(storage_storageconfig vespa.config.content.core.stor-opslogger.def)
-vespa_generate_config(storage_storageconfig vespa.config.content.core.stor-visitordispatcher.def)
-vespa_generate_config(storage_storageconfig vespa.config.content.core.stor-integritychecker.def)
-vespa_generate_config(storage_storageconfig vespa.config.content.core.stor-bucketmover.def)
-vespa_generate_config(storage_storageconfig vespa.config.content.core.stor-bouncer.def)
-vespa_generate_config(storage_storageconfig vespa.config.content.core.stor-prioritymapping.def)
-vespa_generate_config(storage_storageconfig vespa.config.content.core.rpc-provider.def)
-
-install_config_definitions(src/vespa/storage/config)
+vespa_generate_config(storage_storageconfig stor-communicationmanager.def)
+install_config_definition(stor-communicationmanager.def vespa.config.content.core.stor-communicationmanager.def)
+vespa_generate_config(storage_storageconfig stor-distributormanager.def)
+install_config_definition(stor-distributormanager.def vespa.config.content.core.stor-distributormanager.def)
+vespa_generate_config(storage_storageconfig stor-server.def)
+install_config_definition(stor-server.def vespa.config.content.core.stor-server.def)
+vespa_generate_config(storage_storageconfig stor-status.def)
+install_config_definition(stor-status.def vespa.config.content.core.stor-status.def)
+vespa_generate_config(storage_storageconfig stor-messageforwarder.def)
+install_config_definition(stor-messageforwarder.def vespa.config.content.core.stor-messageforwarder.def)
+vespa_generate_config(storage_storageconfig stor-opslogger.def)
+install_config_definition(stor-opslogger.def vespa.config.content.core.stor-opslogger.def)
+vespa_generate_config(storage_storageconfig stor-visitordispatcher.def)
+install_config_definition(stor-visitordispatcher.def vespa.config.content.core.stor-visitordispatcher.def)
+vespa_generate_config(storage_storageconfig stor-integritychecker.def)
+install_config_definition(stor-integritychecker.def vespa.config.content.core.stor-integritychecker.def)
+vespa_generate_config(storage_storageconfig stor-bucketmover.def)
+install_config_definition(stor-bucketmover.def vespa.config.content.core.stor-bucketmover.def)
+vespa_generate_config(storage_storageconfig stor-bouncer.def)
+install_config_definition(stor-bouncer.def vespa.config.content.core.stor-bouncer.def)
+vespa_generate_config(storage_storageconfig stor-prioritymapping.def)
+install_config_definition(stor-prioritymapping.def vespa.config.content.core.stor-prioritymapping.def)
+vespa_generate_config(storage_storageconfig rpc-provider.def)
+install_config_definition(rpc-provider.def vespa.config.content.core.rpc-provider.def)
diff --git a/storage/src/vespa/storage/visiting/CMakeLists.txt b/storage/src/vespa/storage/visiting/CMakeLists.txt
index c8a824877c5..05097163479 100644
--- a/storage/src/vespa/storage/visiting/CMakeLists.txt
+++ b/storage/src/vespa/storage/visiting/CMakeLists.txt
@@ -13,6 +13,5 @@ vespa_add_library(storage_visitor OBJECT
     visitorthread.cpp
     DEPENDS
 )
-vespa_generate_config(storage_visitor vespa.config.content.core.stor-visitor.def)
-
-install_config_definitions(src/vespa/storage/visiting)
+vespa_generate_config(storage_visitor stor-visitor.def)
+install_config_definition(stor-visitor.def vespa.config.content.core.stor-visitor.def)