Merge branch 'devel'

Author: rkrejci

CMakeLists.txt

@@ -1,12 +1,14 @@
 cmake_minimum_required(VERSION 2.8.9)
 project(libyang C)
 
+include(GNUInstallDirs)
+
 set(LIBYANG_DESCRIPTION "libyang is YANG data modelling language parser and toolkit written (and providing API) in C.")
 
 # set version
 set(LIBYANG_MAJOR_VERSION 0)
-set(LIBYANG_MINOR_VERSION 10)
-set(LIBYANG_MICRO_VERSION 239)
+set(LIBYANG_MINOR_VERSION 11)
+set(LIBYANG_MICRO_VERSION 43)
 set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_MICRO_VERSION})
 set(LIBYANG_SOVERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION})
 configure_file(${PROJECT_SOURCE_DIR}/src/libyang.h.in ${PROJECT_SOURCE_DIR}/src/libyang.h)
@@ -32,7 +34,7 @@ else()
 	add_custom_target(bison
 		WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/src
 		COMMAND bison -Wno-other -l -o parser_yang_bis.c --defines=parser_yang_bis.h yang.y
-		COMMAND flex -L -o parser_yang_lex.c --header-file=parser_yang_lex.h yang.l
+		COMMAND flex -8 -L -o parser_yang_lex.c --header-file=parser_yang_lex.h yang.l
 		COMMAND ${SED_TOOL} -i 's/int yychar\;/int yychar\;\\nchar *s = NULL, *tmp_s = NULL\;\\nstruct lys_include inc\;\\nstruct lys_module *trg = NULL\;\\nstruct lys_node *tpdf_parent = NULL, *data_node = NULL\;\\nvoid *actual = NULL\;\\nstruct lys_node_uses *refine_parent = NULL\;\\nint config_inherit = 0, actual_type = 0\;\\nint64_t cnt_val\;\\nint read_string = read_all\;\\nvoid *yang_type = NULL\;/' parser_yang_bis.c
 	)
 endif()
@@ -42,14 +44,6 @@ if(NOT UNIX)
 	message(FATAL_ERROR "Only *nix like systems are supported.")
 endif()
 
-if(NOT LIB_INSTALL_DIR)
-	set(LIB_INSTALL_DIR lib)
-endif()
-
-if(NOT INCLUDE_INSTALL_DIR)
-	set(INCLUDE_INSTALL_DIR include/libyang)
-endif()
-
 # set default build type if not specified by user
 if(NOT CMAKE_BUILD_TYPE)
 	set(CMAKE_BUILD_TYPE debug)
@@ -129,21 +123,21 @@ find_package(PCRE REQUIRED)
 include_directories(${PCRE_INCLUDE_DIRS})
 target_link_libraries(yang ${PCRE_LIBRARIES})
 
-install(TARGETS yang DESTINATION ${LIB_INSTALL_DIR})
-install(FILES ${headers} DESTINATION ${INCLUDE_INSTALL_DIR})
+install(TARGETS yang DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(FILES ${headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libyang)
 
 find_package(PkgConfig)
 if(PKG_CONFIG_FOUND)
 	# generate and install pkg-config file
 	configure_file("libyang.pc.in" "libyang.pc" @ONLY)
-	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libyang.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/pkgconfig")
+	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libyang.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 	# check that pkg-config includes the used path
 	execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable pc_path pkg-config RESULT_VARIABLE RETURN OUTPUT_VARIABLE PC_PATH ERROR_QUIET)
 	if(RETURN EQUAL 0)
-		string(REGEX MATCH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/pkgconfig" SUBSTR "${PC_PATH}")
+		string(REGEX MATCH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig" SUBSTR "${PC_PATH}")
 		string(LENGTH "${SUBSTR}" SUBSTR_LEN)
 		if(SUBSTR_LEN EQUAL 0)
-			message(WARNING "pkg-config will not detect the new package after installation, adjust PKG_CONFIG_PATH using \"export PKG_CONFIG_PATH=\${PKG_CONFIG_PATH}:${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/pkgconfig\".")
+			message(WARNING "pkg-config will not detect the new package after installation, adjust PKG_CONFIG_PATH using \"export PKG_CONFIG_PATH=\${PKG_CONFIG_PATH}:${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig\".")
 		endif()
 	endif()
 endif()
@@ -167,6 +161,8 @@ add_custom_target(cclean
 
 add_executable(yanglint ${lintsrc})
 target_link_libraries(yanglint yang)
+install(TARGETS yanglint DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(FILES ${PROJECT_SOURCE_DIR}/tools/lint/yanglint.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
 
 add_executable(yang2yin ${yang2yinsrc})
 

README.md

@@ -19,14 +19,15 @@ providing API) in C. The library is used e.g. in [libnetconf2](https://github.co
   ([RFC 7951](https://tools.ietf.org/html/rfc7951)).
 * Manipulation with the instance data.
 * Support for default values in the instance data ([RFC 6243](https://tools.ietf.org/html/rfc6243)).
+* [yanglint](#yanglint) - features rich YANG tool.
 
 Current implementation covers YANG 1.0 ([RFC 6020](https://tools.ietf.org/html/rfc6020))
 as well as YANG 1.1 ([RFC 7950](https://tools.ietf.org/html/rfc7950)).
 
 ## Planned Features
 
 * YANG Metadata ([RFC 7952](https://tools.ietf.org/html/rfc7952)).
-* [yanglint](#yanglint) as a full-fledged YANG tool.
+* Modular mechanism for supporting YANG extensions.
 
 ## Requirements
 
@@ -52,6 +53,8 @@ $ make doc
 $ google-chrome ../doc/html/index.html
 ```
 
+The documentation is also built hourly and available at [netopeer.liberouter.org](https://netopeer.liberouter.org/doc/libyang/master/).
+
 ### Useful CMake Options
 
 #### Changing Compiler
@@ -113,6 +116,16 @@ linker. To help with setting all the compiler's options, there is `libyang.pc` f
 If you are using `cmake` in you project, it is also possible to use the provided
 `FindLibYANG.cmake` file to detect presence of the libyang library in the system.
 
+## yanglint
+
+libyang project includes features rich tool called `yanglint(1)` for validation
+and conversion of the schemas and YANG modeled data. The source codes are
+located at [`/tools/lint`](./tools/lint) and can be used to explore how an
+application is supposed to use the libyang library. `yanglint(1)` binary as
+well as its man page are installed together with the library itself. 
+
+There is also [README](./tools/lint/examples/README.md) describing some examples of
+using `yanglint`.
 
 ## Tests
 
@@ -157,14 +170,4 @@ Currently supported bindings are:
  * cmake option: `JAVASCRIPT_BINDING`
  * [README](./swig/javascript/README.md)
 
-## yanglint
-
-libyang source codes include a simple example tool to demanstrate how an application
-can work with the libyang library. The tool is called `yanglint`. It is not being
-installed together with the library itself, but it is built together with the library
-binary and you can find it in [`tools/lint`](./tools/lint) directory.
-
-There is also [README](./tools/lint/examples/README.md) describing some examples of
-using `yanglint`.
-
 

libyang.pc.in

@@ -1,6 +1,6 @@
 prefix=@CMAKE_INSTALL_PREFIX@
-includedir=${prefix}/@INCLUDE_INSTALL_DIR@
-libdir=${prefix}/@LIB_INSTALL_DIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
 
 Name: @PROJECT_NAME@
 Description: @LIBYANG_DESCRIPTION@