Merging code into new github branch.

15 files changed, 79 insertions, 15 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49b031c7664..146a6d45cbf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,7 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 # @author Vegard Sjonfjell
 # @author Eirik Nygaard
+# @author Arnstein Ressem
 cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 
 project(vespa CXX C)
@@ -18,6 +19,10 @@ enable_testing()
 # Include vespa config definitions in every target
 include_directories(BEFORE ${CMAKE_BINARY_DIR}/configdefinitions/src)
 
+include_directories(/opt/vespa-boost/include /opt/vespa-libtorrent/include /opt/vespa-zookeeper-c-client/include /opt/vespa-cppunit/include)
+link_directories(/opt/vespa-boost/lib /opt/vespa-libtorrent/lib /opt/vespa-zookeeper-c-client/lib /opt/vespa-cppunit/lib)
+link_directories(/usr/lib64/llvm)
+
 add_subdirectory(config)
 add_subdirectory(configd)
 add_subdirectory(configdefinitions)
diff --git a/bootstrap.sh b/bootstrap.sh
index f41f3369b32..e83db816e5b 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -19,6 +19,7 @@ MODULES="
   jrt
   component
   messagebus
+  linguistics
   filedistributionmanager"
 
 for module in $MODULES; do
diff --git a/config-model/src/Makefile b/config-model/src/Makefile
new file mode 100644
index 00000000000..5e7024ccff9
--- /dev/null
+++ b/config-model/src/Makefile
@@ -0,0 +1,30 @@
+# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+#all: services.xsd hosts.xsd
+
+trangjar=../../target/trang.jar
+
+all: resources/schema/services.rng resources/schema/hosts.rng resources/schema/container-include.rng resources/schema/services.xsd resources/schema/hosts.xsd resources/schema/container-include.xsd
+
+resources/schema/services.rng: resources/schema/services.rnc resources/schema/common.rnc resources/schema/admin.rnc resources/schema/clients.rnc resources/schema/docproc.rnc resources/schema/routing.rnc resources/schema/clients-v2.rnc resources/schema/content.rnc resources/schema/genericmodule.rnc resources/schema/legacygenericcluster.rnc resources/schema/genericcluster.rnc resources/schema/legacygenericmodule.rnc resources/schema/containercluster.rnc
+	java -jar $(trangjar) -I rnc -O rng resources/schema/services.rnc resources/schema/services.rng
+
+resources/schema/services.xsd: resources/schema/services.rng
+	java -jar $(trangjar) -I rng -O xsd resources/schema/services.rng resources/schema/services.xsd
+
+
+resources/schema/container-include.rng: resources/schema/common.rnc resources/schema/containercluster.rnc
+	java -jar $(trangjar) -I rnc -O rng resources/schema/container-include.rnc resources/schema/container-include.rng
+
+resources/schema/container-include.xsd: resources/schema/container-include.rng
+	java -jar $(trangjar) -I rng -O xsd resources/schema/container-include.rng resources/schema/container-include.xsd
+
+
+resources/schema/hosts.rng: resources/schema/hosts.rnc
+	java -jar $(trangjar) -I rnc -O rng resources/schema/hosts.rnc resources/schema/hosts.rng
+
+resources/schema/hosts.xsd: resources/schema/hosts.rng
+	java -jar $(trangjar) -I rng -O xsd resources/schema/hosts.rng resources/schema/hosts.xsd
+
+clean:
+	rm -f resources/schema/*.rng
+	rm -f resources/schema/*.xsd
diff --git a/functions.cmake b/functions.cmake
index c75a454923b..88aa4edfb9b 100644
--- a/functions.cmake
+++ b/functions.cmake
@@ -143,9 +143,6 @@ function(vespa_generate_config TARGET RELATIVE_CONFIG_DEF_PATH)
     # This is used within the generated config-<name>.cpp
     # TODO: Should modify configgen to use #include <vespa/<modulename>/config-<name>.h> instead
     target_include_directories(${TARGET} PRIVATE ${CONFIG_DEST_PARENT_DIR})
-
-    # Needed to be able to do a #include <config-<name>.h> for this target
-    # This is used within some unit tests
     target_include_directories(${TARGET} PRIVATE ${CONFIG_DEST_DIR})
 endfunction()
 
diff --git a/jrt_test/src/binref/compilejava.in b/jrt_test/src/binref/compilejava.in
index d2751bb717d..d5c7a8eec7d 100755
--- a/jrt_test/src/binref/compilejava.in
+++ b/jrt_test/src/binref/compilejava.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 unset VESPA_LOG_TARGET
-CLASSPATH=@PROJECT_BINARY_DIR@/jrt/target/jrt.jar
-CLASSPATH=$CLASSPATH:@PROJECT_BINARY_DIR@/vespajlib/target/vespajlib.jar 
+CLASSPATH=@PROJECT_SOURCE_DIR@/jrt/target/jrt.jar
+CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/vespajlib/target/vespajlib.jar 
 CLASSPATH=$CLASSPATH:@CMAKE_CURRENT_SOURCE_DIR@/../java/classes
 CLASSPATH=$CLASSPATH:.
 if [ $# -lt 1 ]; then
diff --git a/lowercasing_test/src/java/CMakeLists.txt b/lowercasing_test/src/java/CMakeLists.txt
index 5ef6b6b1e92..34b531c2093 100644
--- a/lowercasing_test/src/java/CMakeLists.txt
+++ b/lowercasing_test/src/java/CMakeLists.txt
@@ -1,5 +1,6 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-add_custom_target(lowercasing_test_java ALL
-  ant -q -buildfile ${CMAKE_CURRENT_SOURCE_DIR}/build.xml >>/dev/null
-  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/build.xml ${CMAKE_CURRENT_SOURCE_DIR}/HelloWorld.java
-)
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/java_code_compiled
+                  COMMAND ant -q -buildfile ${CMAKE_CURRENT_SOURCE_DIR}/build.xml >>/dev/null
+                  COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/java_code_compiled
+                  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/build.xml ${CMAKE_CURRENT_SOURCE_DIR}/HelloWorld.java)
+add_custom_target(lowercasing_test_java ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/java_code_compiled)
diff --git a/searchlib/src/tests/util/ioerrorhandler/CMakeLists.txt b/searchlib/src/tests/util/ioerrorhandler/CMakeLists.txt
index 92d6ab30d72..e7a0b0425d4 100644
--- a/searchlib/src/tests/util/ioerrorhandler/CMakeLists.txt
+++ b/searchlib/src/tests/util/ioerrorhandler/CMakeLists.txt
@@ -5,5 +5,6 @@ vespa_add_executable(searchlib_ioerrorhandler_test_app
     DEPENDS
     searchlib_test
     searchlib
+    dl
 )
 vespa_add_test(NAME searchlib_ioerrorhandler_test_app COMMAND searchlib_ioerrorhandler_test_app)
diff --git a/searchlib/src/vespa/searchlib/CMakeLists.txt b/searchlib/src/vespa/searchlib/CMakeLists.txt
index 6b94631cdeb..f0351687918 100644
--- a/searchlib/src/vespa/searchlib/CMakeLists.txt
+++ b/searchlib/src/vespa/searchlib/CMakeLists.txt
@@ -28,4 +28,6 @@ vespa_add_library(searchlib
     searchlib_queryeval
     searchlib_queryeval_test
     staging_vespalib
+    icuuc
+    atomic
 )
diff --git a/staging_vespalib/src/vespa/vespalib/util/CMakeLists.txt b/staging_vespalib/src/vespa/vespalib/util/CMakeLists.txt
index 8cf7e2239ad..a8d28bf9809 100644
--- a/staging_vespalib/src/vespa/vespalib/util/CMakeLists.txt
+++ b/staging_vespalib/src/vespa/vespalib/util/CMakeLists.txt
@@ -5,6 +5,7 @@ vespa_add_library(staging_vespalib_vespalib_util OBJECT
     clock.cpp
     cpu.cpp
     crc.cpp
+    document_runnable.cpp
     doom.cpp
     growablebytebuffer.cpp
     jsonstream.cpp
@@ -14,7 +15,6 @@ vespa_add_library(staging_vespalib_vespalib_util OBJECT
     process_memory_stats.cpp
     programoptions.cpp
     programoptions_testutils.cpp
-    document_runnable.cpp
     rusage.cpp
     shutdownguard.cpp
     timer.cpp
diff --git a/valgrind-suppressions.txt b/valgrind-suppressions.txt
index 1f04263fe99..92954b39f92 100644
--- a/valgrind-suppressions.txt
+++ b/valgrind-suppressions.txt
@@ -21,7 +21,19 @@
    fun:_Znwm
    fun:*addTestsToSuite*CppUnit*TestSuiteBuilderContextBase*
 }
-
+{
+   Bug in cppunit. This suppression is created on CentOS7.
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:_Znwm
+   fun:addTestsToSuite
+   fun:suite
+   fun:*makeTest*
+   fun:_ZN7CppUnit19TestFactoryRegistry14addTestToSuiteEPNS_9TestSuiteE
+   fun:_ZN7CppUnit19TestFactoryRegistry8makeTestEv
+   fun:_ZN10vdstestlib17CppUnitTestRunner3runEiPKPKc
+   fun:main
+}
 {
    RHEL6 strlen is eager and will read 16 bytes blocks.
    Memcheck:Cond
@@ -267,14 +279,23 @@
    fun:_ZN26FastOS_UNIX_DynamicLibrary4OpenEPKc
 }
 {
-   This supresses a bug in valgrind-3.10.1. It is fixed in version 3.11.0.
+   This supresses a bug in valgrind-3.10.1. It is fixed in version 3.11.0. (http://permalink.gmane.org/gmane.comp.kde.devel.bugs/1594999)
    Memcheck:Leak
    match-leak-kinds: possible
    fun:_Znwm
    fun:_ZNSs4_Rep9_S_createEmmRKSaIcE
    fun:_ZNSs12_S_constructIPKcEEPcT_S3_RKSaIcESt20forward_iterator_tag
    fun:_ZNSsC1EPKcRKSaIcE
+   obj:/usr/lib64/llvm/libLLVM-3.4.so
+   ...
+}
+{
+   This supresses a bug in valgrind-3.10.1. It is fixed in version 3.11.0. (http://permalink.gmane.org/gmane.comp.kde.devel.bugs/1594999)
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:_Znwm
+   fun:_ZNSs4_Rep9_S_createEmmRKSaIcE
+   ...
    fun:__static_initialization_and_destruction_0
-   fun:_GLOBAL__sub_I_unix_dynamiclibrary.cpp
-   fun:_dl_init
+   ...
 }
diff --git a/vespalib/CMakeLists.txt b/vespalib/CMakeLists.txt
index 610ec0fb3a6..e4c9ab27225 100644
--- a/vespalib/CMakeLists.txt
+++ b/vespalib/CMakeLists.txt
@@ -5,7 +5,7 @@ vespa_define_module(
     vespalog
 
     EXTERNAL_DEPENDS
-    LLVM
+    LLVM-3.4
 
     APPS
     src/apps/eval_expr
diff --git a/vespalog/src/logger/CMakeLists.txt b/vespalog/src/logger/CMakeLists.txt
index b2327a1327a..3e055e3b288 100644
--- a/vespalog/src/logger/CMakeLists.txt
+++ b/vespalog/src/logger/CMakeLists.txt
@@ -14,6 +14,7 @@ vespa_add_executable(vespalog_vlogreplay_app
     OUTPUT_NAME vlogreplay
     INSTALL bin
     DEPENDS
+    m
 )
 vespa_add_executable(vespalog_vespa-runserver_app
     SOURCES
diff --git a/vespamalloc/src/tests/allocfree/CMakeLists.txt b/vespamalloc/src/tests/allocfree/CMakeLists.txt
index 1dc36f8dec7..49a4b2f193a 100644
--- a/vespamalloc/src/tests/allocfree/CMakeLists.txt
+++ b/vespamalloc/src/tests/allocfree/CMakeLists.txt
@@ -21,3 +21,4 @@ vespa_add_executable(vespamalloc_linklist_test_app
     ../../vespamalloc/malloc/common.cpp
     $<TARGET_OBJECTS:vespamalloc_util>
 )
+vespa_add_target_system_dependency(vespamalloc_linklist_test_app dl)
diff --git a/vespamalloc/src/tests/thread/thread_test.sh b/vespamalloc/src/tests/thread/thread_test.sh
index edcd7a41a17..68654d35ce7 100755
--- a/vespamalloc/src/tests/thread/thread_test.sh
+++ b/vespamalloc/src/tests/thread/thread_test.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+ulimit -u 31215
+
 VESPA_MALLOC_SO=../../../src/vespamalloc/libvespamalloc.so
 VESPA_MALLOC_SO_D=../../../src/vespamalloc/libvespamalloc_vespamallocd.so
 
diff --git a/vespamalloc/src/vespamalloc/util/CMakeLists.txt b/vespamalloc/src/vespamalloc/util/CMakeLists.txt
index 5d06264f1df..e30d7aa9a27 100644
--- a/vespamalloc/src/vespamalloc/util/CMakeLists.txt
+++ b/vespamalloc/src/vespamalloc/util/CMakeLists.txt
@@ -7,3 +7,5 @@ vespa_add_library(vespamalloc_util OBJECT
     stream.cpp
     DEPENDS
 )
+vespa_add_target_system_dependency(vespamalloc_util dl)
+