diff options
| author | Eirik Nygaard <eirik@yahoo-inc.com> | 2016-06-19 20:58:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-19 20:58:52 +0200 |
| commit | 482e29a4a130e5ce9b11aa1a5f3b91aa73144bdc (patch) | |
| tree | 2e42d0a10d2cfc379786218313a7a2f783dd6fca | |
| parent | 643b3ba352955d221d3f5baa3c4c5448019d93d1 (diff) | |
| parent | ccba09726e6ec1928ad41eefb3f85da2a4ff20b7 (diff) | |
Merge pull request #93 from yahoo/aressem/more-fixes-to-get-the-config-server-to-run
Aressem/more fixes to get the config server to run
| -rw-r--r-- | dist/vespa.spec | 2 | ||||
| -rw-r--r-- | install_java.cmake | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index 033378e7759..ff1fa2d0d58 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -114,6 +114,7 @@ mkdir -p %{buildroot}/%{_prefix}/var/db/vespa/config_server/serverdb/application mkdir -p %{buildroot}/%{_prefix}/var/db/vespa/logcontrol/ mkdir -p %{buildroot}/%{_prefix}/var/jdisc_container/ mkdir -p %{buildroot}/%{_prefix}/var/jdisc_core/ +mkdir -p %{buildroot}/%{_prefix}/var/run/ mkdir -p %{buildroot}/%{_prefix}/var/spool/vespa/ mkdir -p %{buildroot}/%{_prefix}/var/spool/master/inbox/ mkdir -p %{buildroot}/%{_prefix}/var/vespa/bundlecache/ @@ -172,6 +173,7 @@ exit 0 %dir %attr( 755, vespa, vespa) %{_prefix}/var/db/vespa/logcontrol/ %dir %attr( 755, vespa, vespa) %{_prefix}/var/jdisc_container/ %dir %attr( 777, -, -) %{_prefix}/var/jdisc_core/ +%dir %attr( 755, vespa, vespa) %{_prefix}/var/run/ %dir %attr( 755, vespa, vespa) %{_prefix}/var/spool/vespa/ %dir %attr( 755, vespa, vespa) %{_prefix}/var/spool/master/inbox/ %dir %attr( 755, vespa, vespa) %{_prefix}/var/vespa/bundlecache/ diff --git a/install_java.cmake b/install_java.cmake index a46bcf874f5..59097650bda 100644 --- a/install_java.cmake +++ b/install_java.cmake @@ -1,8 +1,9 @@ function(install_java_artifact NAME) install(FILES "${NAME}/target/${NAME}.jar" DESTINATION lib/jars/) - if (IS_DIRECTORY "${NAME}/target/dependency") - install(DIRECTORY "${NAME}/target/dependency" DESTINATION lib/jars/ FILES_MATCHING PATTERN "*.jar") - endif() +endfunction() + +function(install_java_artifact_dependencies NAME) + install(DIRECTORY "${NAME}/target/dependency/" DESTINATION lib/jars FILES_MATCHING PATTERN "*.jar") endfunction() function(install_fat_java_artifact NAME) @@ -11,7 +12,10 @@ endfunction() install_java_artifact(config-model-fat) install_java_artifact(document) +install_java_artifact(jdisc_jetty) +install_java_artifact_dependencies(jdisc_jetty) install_java_artifact(searchlib) +install_java_artifact_dependencies(vespa_jersey2) install_java_artifact(vespajlib) install_fat_java_artifact(application-preprocessor) @@ -21,6 +25,7 @@ install_fat_java_artifact(config-model-api) install_fat_java_artifact(config-model) install_fat_java_artifact(config-provisioning) install_fat_java_artifact(configdefinitions) +install_fat_java_artifact(configserver) install_fat_java_artifact(container-disc) install_fat_java_artifact(container-jersey2) install_fat_java_artifact(container-search-and-docproc) |