Merge branch 'devel'

Author: michalvasko

.travis.yml

@@ -10,6 +10,14 @@ matrix:
       dist: trusty
       sudo: required
       compiler: gcc
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-7
+      env:
+        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
     - os: osx
       compiler: gcc
   allow_failures:
@@ -21,16 +29,20 @@ branches:
     - devel
 
 before_install:
+  - eval "${MATRIX_EVAL}"
   - git clone git://git.cryptomilk.org/projects/cmocka.git
   - cd cmocka && mkdir build && cd build
   - cmake .. && make -j2 && sudo make install
   - cd ../..
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; sudo apt-get install -y valgrind osc; fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; sudo apt-get install -y valgrind osc; sudo dpkg -i ./swig/swig3.0_3.0.8-0ubuntu3_amd64.deb; fi
   - if [ "$TRAVIS_OS_NAME" = "linux" -a "$CC" = "gcc" ]; then pip install --user codecov; export CFLAGS="-coverage"; fi
 
 script:
-  - mkdir build && cd build && cmake .. && make -j2 && ctest --output-on-failure
+  - mkdir build && cd build
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake ..; fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake -DGEN_LANGUAGE_BINDINGS=ON ..; fi
+  - make -j2 && ctest --output-on-failure
   - cd -
 
 after_success:

CMakeLists.txt

@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.8.12)
 project(libyang C)
 
 include(GNUInstallDirs)
+include(CheckSymbolExists)
 
 set(LIBYANG_DESCRIPTION "libyang is YANG data modelling language parser and toolkit written (and providing API) in C.")
 
@@ -10,8 +11,8 @@ set(CMAKE_MACOSX_RPATH TRUE)
 
 # set version
 set(LIBYANG_MAJOR_VERSION 0)
-set(LIBYANG_MINOR_VERSION 14)
-set(LIBYANG_MICRO_VERSION 81)
+set(LIBYANG_MINOR_VERSION 15)
+set(LIBYANG_MICRO_VERSION 119)
 set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_MICRO_VERSION})
 set(LIBYANG_SOVERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION})
 
@@ -20,7 +21,7 @@ if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE debug)
 endif()
 
-set(CMAKE_C_FLAGS         "${CMAKE_C_FLAGS} -Wall -Wextra")
+set(CMAKE_C_FLAGS         "${CMAKE_C_FLAGS} -Wall -Wextra -std=gnu11")
 set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
 set(CMAKE_C_FLAGS_PACKAGE "-g -O2 -DNDEBUG")
 set(CMAKE_C_FLAGS_DEBUG   "-g -O0")
@@ -35,7 +36,8 @@ else()
 endif()
 option(ENABLE_CALLGRIND_TESTS "Build performance tests to be run with callgrind" OFF)
 option(ENABLE_LATEST_REVISIONS "Enable reusing of latest revisions of schemas" ON)
-option(ENABLE_CACHE "Enable data caching for schemas (time-efficient at the cost of increased space-complexity)" OFF)
+option(ENABLE_CACHE "Enable data caching for schemas (time-efficient at the cost of increased space-complexity)" ON)
+set(PLUGINS_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libyang" CACHE STRING "Directory with libyang plugins (extensions and user types)")
 
 if (ENABLE_LATEST_REVISIONS)
     set(ENABLE_LATEST_REVISIONS_MACRO "/**\n * @brief Latest revisions of loaded schemas will be reused.\n */\n#define LY_ENABLED_LATEST_REVISIONS")
@@ -49,15 +51,32 @@ else()
     set(ENABLE_CACHE_MACRO "/**\n * @brief Cache of some temporary information will not be used.\n */")
 endif()
 
+if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+    # require at least gcc 4.9
+    if (CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9)
+        message(FATAL_ERROR "GCC version must be at least 4.9!")
+    endif()
+    set(COMPILER_UNUSED_ATTR "UNUSED_ ## x __attribute__((__unused__))")
+    set(COMPILER_PACKED_ATTR "__attribute__((__packed__))")
+elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang")
+    # require at least clang 3.0
+    if (CMAKE_C_COMPILER_VERSION VERSION_LESS 3.0)
+        message(FATAL_ERROR "Clang version must be at least 3.0!")
+    endif()
+    set(COMPILER_UNUSED_ATTR "UNUSED_ ## x __attribute__((__unused__))")
+    set(COMPILER_PACKED_ATTR "__attribute__((__packed__))")
+else()
+    message(WARNING "You are using an unknown compiler, it must support C11 standard \"_Generic\" statement.")
+    set(COMPILER_UNUSED_ATTR "UNUSED_ ## x")
+    set(COMPILER_PACKED_ATTR "")
+endif()
+
 include_directories(${PROJECT_BINARY_DIR}/src ${PROJECT_SOURCE_DIR}/src)
 configure_file(${PROJECT_SOURCE_DIR}/src/libyang.h.in ${PROJECT_BINARY_DIR}/src/libyang.h @ONLY)
+configure_file(${PROJECT_SOURCE_DIR}/src/common.h.in ${PROJECT_BINARY_DIR}/src/common.h @ONLY)
 
-if(PLUGINS_DIR)
-    set(LIBYANG_EXT_PLUGINS_DIR ${PLUGINS_DIR})
-else()
-    set(LIBYANG_EXT_PLUGINS_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libyang)
-endif()
-configure_file(${PROJECT_SOURCE_DIR}/src/extensions_config.h.in ${PROJECT_BINARY_DIR}/src/extensions_config.h)
+set(EXTENSIONS_PLUGINS_DIR_MACRO "${PLUGINS_DIR}/extensions")
+set(USER_TYPES_PLUGINS_DIR_MACRO "${PLUGINS_DIR}/user_types")
 
 # include custom Modules
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMakeModules/")
@@ -72,9 +91,9 @@ set(GEN_JAVASCRIPT_BINDINGS 0 CACHE BOOL "Enable JavaScript bindings.")
 
 find_package(FLEX)
 find_package(BISON)
-find_program (DEB_BUILDER NAMES debuild)
-find_program (RPM_BUILDER NAMES rpmbuild)
-find_program (SED_TOOL NAMES sed)
+find_program(DEB_BUILDER NAMES debuild)
+find_program(RPM_BUILDER NAMES rpmbuild)
+find_program(SED_TOOL NAMES sed)
 
 if(NOT BISON_FOUND)
     message(WARNING "Missing Bison.\nYou won't be able to generate source codes from changed flex/bison files.\nCompiling libyang should still works fine.")
@@ -115,11 +134,13 @@ endif()
 
 if ($ENV{TRAVIS_BRANCH} STREQUAL "master")
     set(PACKAGE_NAME "libyang")
+    set(PACKAGE_PART_NAME "")
     set(BRANCH "master")
     set(BUILD_TYPE "Package")
     set(CONFLICT_PACKAGE_NAME "libyang-experimental")
 else ()
     set(PACKAGE_NAME "libyang-experimental")
+    set(PACKAGE_PART_NAME "-experimental")
     set(BRANCH "devel")
     set(BUILD_TYPE "debug")
     set(CONFLICT_PACKAGE_NAME "libyang")
@@ -153,6 +174,10 @@ else ()
     configure_file(${PROJECT_SOURCE_DIR}/packages/local-rpm.sh.in ${PROJECT_BINARY_DIR}/build-packages/local-rpm.sh @ONLY)
 endif()
 
+# by default build shared library
+# static build requires static libpcre library
+option(ENABLE_STATIC "Build static (.a) library" OFF)
+
 # check the supported platform
 if(NOT UNIX)
     message(FATAL_ERROR "Only *nix like systems are supported.")
@@ -162,7 +187,7 @@ set(libsrc
     src/common.c
     src/context.c
     src/log.c
-    src/dict.c
+    src/hash_table.c
     src/resolve.c
     src/validation.c
     src/xml.c
@@ -175,7 +200,7 @@ set(libsrc
     src/parser_yang.c
     src/tree_schema.c
     src/tree_data.c
-    src/extensions.c
+    src/plugins.c
     src/printer.c
     src/xpath.c
     src/printer_yang.c
@@ -204,27 +229,49 @@ set(headers
     src/tree_schema.h
     src/tree_data.h
     src/extensions.h
+    src/user_types.h
     src/xml.h
     src/dict.h)
 
-set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
-add_library(yangobj OBJECT ${libsrc})
-add_library(yang SHARED $<TARGET_OBJECTS:yangobj>)
+check_symbol_exists(vdprintf stdio.h HAVE_VDPRINTF)
+if(HAVE_VDPRINTF)
+    add_definitions(-DHAVE_VDPRINTF)
+endif(HAVE_VDPRINTF)
+
+# create static libyang library
+if(ENABLE_STATIC)
+    add_definitions(-DSTATIC)
+    set(CMAKE_EXE_LINKER_FLAGS -static)
+    set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
+    set(CMAKE_EXE_LINK_DYNAMIC_C_FLAGS)       # remove -Wl,-Bdynamic
+    set(CMAKE_EXE_LINK_DYNAMIC_CXX_FLAGS)
+    add_library(yang STATIC ${libsrc})
+else()
+    set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
+    add_library(yangobj OBJECT ${libsrc})
+    add_library(yang SHARED $<TARGET_OBJECTS:yangobj>)
+
+    #link dl
+    target_link_libraries(yang ${CMAKE_DL_LIBS})
+endif(ENABLE_STATIC)
+
 set_target_properties(yang PROPERTIES VERSION ${LIBYANG_VERSION} SOVERSION ${LIBYANG_SOVERSION})
 set_target_properties(yang PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
 
 # link math
 target_link_libraries(yang m)
 
-#link dl
-target_link_libraries(yang ${CMAKE_DL_LIBS})
-
 # find pthreads
 set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
 find_package(Threads REQUIRED)
-target_link_libraries(yang ${CMAKE_THREAD_LIBS_INIT})
+if(ENABLE_STATIC)
+    target_link_libraries(yang -Wl,--whole-archive ${CMAKE_THREAD_LIBS_INIT} -Wl,--no-whole-archive)
+else()
+    target_link_libraries(yang ${CMAKE_THREAD_LIBS_INIT})
+endif(ENABLE_STATIC)
 
 # find PCRE library
+unset(PCRE_LIBRARY CACHE)
 find_package(PCRE REQUIRED)
 include_directories(${PCRE_INCLUDE_DIRS})
 target_link_libraries(yang ${PCRE_LIBRARIES})
@@ -266,7 +313,50 @@ add_custom_target(cclean
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 
 # YANG extensions plugins
-add_subdirectory(src/extensions)
+set(EXTENSIONS_LIST "nacm" "metadata" "yangdata")
+# if the tests are enabled, build libyang_ext_test
+if(ENABLE_BUILD_TESTS)
+    find_package(CMocka 1.0.0)
+    if(CMOCKA_FOUND AND CMAKE_BUILD_TYPE MATCHES debug)
+        list(APPEND EXTENSIONS_LIST "libyang_ext_test")
+    endif(CMOCKA_FOUND AND CMAKE_BUILD_TYPE MATCHES debug)
+endif(ENABLE_BUILD_TESTS)
+
+if(ENABLE_STATIC)
+    set(EXTENSIONS_LIST_SIZE " 0 ")
+    set(ITEM 0)
+    foreach(EXTENSION ${EXTENSIONS_LIST})
+        add_library(${EXTENSION} STATIC "src/extensions/${EXTENSION}.c")
+        target_link_libraries(yang ${EXTENSION})
+        set(EXTENSIONS_LIST_SIZE "${EXTENSIONS_LIST_SIZE} + lyext_size(${EXTENSION})")
+        set(EXTERN_EXTENSIONS_LIST "${EXTERN_EXTENSIONS_LIST}extern struct lyext_plugin_list ${EXTENSION}[];\n")
+        set(MEMCPY_EXTENSIONS_LIST "${MEMCPY_EXTENSIONS_LIST}    lyext_add(plugin, count, ${EXTENSION});\n")
+        set(STATIC_LOADED_PLUGINS "${STATIC_LOADED_PLUGINS} \"${EXTENSION}\",")
+        MATH(EXPR ITEM "${ITEM}+1")
+    endforeach()
+else()
+    add_subdirectory(src/extensions)
+endif(ENABLE_STATIC)
+
+# YANG user types plugins ("user_ipv4" is just an example, not installed by default)
+set(USER_TYPE_LIST "user_date_and_time")
+if(ENABLE_STATIC)
+    set(USER_TYPE_LIST_SIZE " 0 ")
+    foreach(USER_TYPE ${USER_TYPE_LIST})
+        add_library(${USER_TYPE} STATIC "src/user_types/${USER_TYPE}.c")
+        target_link_libraries(yang ${USER_TYPE})
+        set(USER_TYPE_LIST_SIZE "${USER_TYPE_LIST_SIZE} + lytype_size(${USER_TYPE})")
+        set(EXTERN_USER_TYPE_LIST "${EXTERN_USER_TYPE_LIST}extern struct lytype_plugin_list ${USER_TYPE}[];\n")
+        set(MEMCPY_USER_TYPE_LIST "${MEMCPY_USER_TYPE_LIST}    lytype_add(plugin, count, ${USER_TYPE});\n")
+        set(STATIC_LOADED_PLUGINS "${STATIC_LOADED_PLUGINS} \"${USER_TYPE}\",")
+        MATH(EXPR ITEM "${ITEM}+1")
+    endforeach()
+    set(STATIC_LOADED_PLUGINS_COUNT "${ITEM}")
+else()
+    add_subdirectory(src/user_types)
+endif(ENABLE_STATIC)
+
+configure_file(${PROJECT_SOURCE_DIR}/src/plugin_config.h.in ${PROJECT_BINARY_DIR}/src/plugin_config.h)
 
 # yanglint
 add_executable(yanglint ${lintsrc})
@@ -287,17 +377,15 @@ if(ENABLE_VALGRIND_TESTS)
 endif()
 
 if(ENABLE_BUILD_TESTS)
-    find_package(CMocka 1.0.0)
     if(CMOCKA_FOUND)
         enable_testing()
         add_subdirectory(tests)
+    else(CMOCKA_FOUND)
+        message(STATUS "Disabling tests because of missing CMocka")
+        set(ENABLE_BUILD_TESTS NO)
     endif(CMOCKA_FOUND)
 endif(ENABLE_BUILD_TESTS)
 
 if(GEN_LANGUAGE_BINDINGS AND GEN_CPP_BINDINGS)
     add_subdirectory(swig)
 endif()
-
-if(GEN_LANGUAGE_BINDINGS AND GEN_JAVASCRIPT_BINDINGS)
-    include(swig/javascript/CMakeLists.txt)
-endif()

Doxyfile.in

@@ -785,6 +785,7 @@ INPUT                  = @CMAKE_BINARY_DIR@/src/libyang.h \
                          ./src/tree_data.h \
                          ./src/tree_schema.h \
                          ./src/extensions.h \
+                         ./src/user_types.h \
                          ./src/xml.h \
                          ./src/dict.h
 

FAQ.md

@@ -5,7 +5,7 @@ __Q: error while loading shared libraries__
 __A:__ libyang is installed into the directory detected by CMake's GNUInstallDirs
    function. However, when it is connected with the installation prefix, the
    target directory is not necessary the path used by the system linker. Check
-   the linker's paths in `/etc/ld.so.conf.d/`. If the path where libyang is 
+   the linker's paths in `/etc/ld.so.conf.d/`. If the path where libyang is
    installed is already present, just make `ldconfig` to rebuild its cache:
 ```
 # ldconfig
@@ -15,7 +15,7 @@ __A:__ libyang is installed into the directory detected by CMake's GNUInstallDir
 ```
 $ mkdir build; cd build
 $ cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr ..
-$ make 
+$ make
 # make install
 ```
    or add the libyang's location to the linker paths in `/etc/ld.so.conf.d` and
@@ -40,4 +40,9 @@ __A:__ To handle complex YANG extensions, libyang (and therefore yanglint(1))
 ```
 $ LIBYANG_EXTENSIONS_PLUGINS_DIR=`pwd`/src/extensions ./yanglint
 ```
-
+   The same issue occurs for user types and the solution is the same except they
+   are built in `src/user_types/` subdirectory and the path should be set with:
+```
+$ LIBYANG_USER_TYPES_PLUGINS_DIR=`pwd`/src/user_types
+```
+   However, user types are not required for yanglint(1) to run properly.

README.md

@@ -37,8 +37,8 @@ master branch. If you want the latest code from the devel branch, install `libya
 
 ### Build Requirements
 
-* C compiler (gcc, clang, ...)
-* cmake >= 2.8.9
+* C compiler (gcc >= 4.9, clang >= 3.0, ...)
+* cmake >= 2.8.12
 * libpcre (devel package)
  * note, that PCRE is supposed to be compiled with unicode support (configure's options
    `--enable-utf` and `--enable-unicode-properties`)