diff options
| -rw-r--r-- | configdefinitions/src/vespa/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | filedistribution/pom.xml | 30 | ||||
| -rw-r--r-- | filedistribution/src/vespa/filedistribution/distributor/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | filedistribution/src/vespa/filedistribution/distributor/filedistributor.def (renamed from configdefinitions/src/vespa/filedistributor.def) | 0 | ||||
| -rw-r--r-- | filedistribution/src/vespa/filedistribution/model/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | filedistribution/src/vespa/filedistribution/model/filereferences.def (renamed from configdefinitions/src/vespa/filereferences.def) | 0 |
6 files changed, 35 insertions, 5 deletions
diff --git a/configdefinitions/src/vespa/CMakeLists.txt b/configdefinitions/src/vespa/CMakeLists.txt index fc9be8ce91b..9297383c53f 100644 --- a/configdefinitions/src/vespa/CMakeLists.txt +++ b/configdefinitions/src/vespa/CMakeLists.txt @@ -16,10 +16,6 @@ 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 filedistributor.def) -install_config_definition(filedistributor.def cloud.config.filedistribution.filedistributor.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) diff --git a/filedistribution/pom.xml b/filedistribution/pom.xml index e63b85a22b8..0a4b75788bc 100644 --- a/filedistribution/pom.xml +++ b/filedistribution/pom.xml @@ -13,4 +13,34 @@ <version>6-SNAPSHOT</version> <packaging>jar</packaging> <name>${project.artifactId}</name> + <dependencies> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>config-lib</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>com.yahoo.vespa</groupId> + <artifactId>config-class-plugin</artifactId> + <version>${project.version}</version> + <configuration> + <defFilesDirectories> + src/vespa/filedistribution/distributor, + src/vespa/filedistribution/model + </defFilesDirectories> + </configuration> + <executions> + <execution> + <id>config-gen</id> + <goals> + <goal>config-gen</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/filedistribution/src/vespa/filedistribution/distributor/CMakeLists.txt b/filedistribution/src/vespa/filedistribution/distributor/CMakeLists.txt index 6b575dc5526..f85ab85fb39 100644 --- a/filedistribution/src/vespa/filedistribution/distributor/CMakeLists.txt +++ b/filedistribution/src/vespa/filedistribution/distributor/CMakeLists.txt @@ -11,3 +11,5 @@ vespa_add_library(filedistribution_distributor STATIC DEPENDS ) target_compile_options(filedistribution_distributor PRIVATE -DTORRENT_DISABLE_ENCRYPTION -DTORRENT_DISABLE_DHT -DWITH_SHIPPED_GEOIP_H -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 -DBOOST_EXCEPTION_DISABLE -DBOOST_ASIO_ENABLE_CANCELIO -DBOOST_ASIO_DYN_LINK -DTORRENT_LINKING_SHARED) +vespa_generate_config(filedistribution_distributor filedistributor.def) +install_config_definition(filedistributor.def cloud.config.filedistribution.filedistributor.def) diff --git a/configdefinitions/src/vespa/filedistributor.def b/filedistribution/src/vespa/filedistribution/distributor/filedistributor.def index 13dd373eac6..13dd373eac6 100644 --- a/configdefinitions/src/vespa/filedistributor.def +++ b/filedistribution/src/vespa/filedistribution/distributor/filedistributor.def diff --git a/filedistribution/src/vespa/filedistribution/model/CMakeLists.txt b/filedistribution/src/vespa/filedistribution/model/CMakeLists.txt index 51af6b106dc..5b92aa4086d 100644 --- a/filedistribution/src/vespa/filedistribution/model/CMakeLists.txt +++ b/filedistribution/src/vespa/filedistribution/model/CMakeLists.txt @@ -14,5 +14,7 @@ vespa_add_library(filedistribution_filedistributionmodel STATIC zkfiledbmodel.cpp DEPENDS ) -vespa_add_target_external_dependency(filedistribution_filedistributionmodel zookeeper_mt) +vespa_generate_config(filedistribution_filedistributionmodel filereferences.def) +vespa_add_target_external_dependency(filedistribution_filedistributionmodel zookeeper_mt) +install_config_definition(filereferences.def cloud.config.filedistribution.filereferences.def) diff --git a/configdefinitions/src/vespa/filereferences.def b/filedistribution/src/vespa/filedistribution/model/filereferences.def index 03e071959ce..03e071959ce 100644 --- a/configdefinitions/src/vespa/filereferences.def +++ b/filedistribution/src/vespa/filedistribution/model/filereferences.def |