Merge pull request #830 from jgrewe/no_fs_no_cli

remove command line tools, disable fs build for now

LGTM

Author: achilleas-k

.travis.ctest

@@ -30,7 +30,7 @@ else()
 endif()
 
 ctest_start(Continuous)
-ctest_configure(OPTIONS "-DBUILD_FS_BACKEND=$ENV{FS_BACKEND};-DBUILD_COVERAGE=$BUILD_COVERAGE")
+ctest_configure(OPTIONS "-DBUILD_COVERAGE=$BUILD_COVERAGE")
 ctest_build()
 
 if(CLANG_CHECK AND $ENV{CXX} MATCHES "clang")

.travis.yml

@@ -16,19 +16,15 @@ osx_image:
   - xcode12.2
 
 env:
- - FS_BACKEND=ON DOCKERFILE=archlinux
- - FS_BACKEND=OFF DOCKERFILE=archlinux
- - FS_BACKEND=ON DOCKERFILE=ub1804
- - FS_BACKEND=OFF DOCKERFILE=ub1804
+ - DOCKERFILE=archlinux
+ - DOCKERFILE=ub1804
 
 matrix:
   exclude:
     - os: osx
       compiler: gcc
     - os: osx
-      env: FS_BACKEND=ON DOCKERFILE=ub1804
-    - os: osx
-      env: FS_BACKEND=OFF DOCKERFILE=ub1804
+      env: DOCKERFILE=ub1804
 
 addons:
   homebrew:
@@ -37,7 +33,6 @@ addons:
       - boost
       - cppunit
       - hdf5
-      - yaml-cpp
     update: false
 
 before_cache:
@@ -80,7 +75,7 @@ script:
     fi
 
 after_success:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" && "$FS_BACKEND" == "OFF" && "$DOCKERFILE" == "archlinux" && "$CXX" == "g++" ]]; then
+  - if [[ "$TRAVIS_OS_NAME" == "linux" && "$DOCKERFILE" == "archlinux" && "$CXX" == "g++" ]]; then
       echo "Submitting code coverage report";
       docker exec nixbuilder lcov -q --capture --directory . --no-extern --output-file coverage.info;
       bash <(curl -s https://codecov.io/bash) -f coverage.info -Z;

CMakeLists.txt

@@ -88,19 +88,18 @@ find_package(Doxygen)
 if(DOXYGEN_FOUND)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
   add_custom_target(doc ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMENT "Generating API documentation with Doxygen" VERBATIM)
+                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+                    COMMENT "Generating API documentation with Doxygen" VERBATIM)
 endif(DOXYGEN_FOUND)
 
 
 ########################################
 # NIX
 
 ### AUTO-GENERATED VERSION HEADER
-configure_file (
+configure_file(
   "${PROJECT_SOURCE_DIR}/version.h.in"
-  "${PROJECT_BINARY_DIR}/include/nix/nixversion.hpp"
-  )
+  "${PROJECT_BINARY_DIR}/include/nix/nixversion.hpp")
 include_directories("${PROJECT_BINARY_DIR}/include")
 
 ### scan files
@@ -112,18 +111,6 @@ list(APPEND nix_INCLUDES "${PROJECT_BINARY_DIR}/include/nix/nixversion.hpp")
 ### BACKENDS
 set(backends "hdf5")
 
-option(BUILD_FS_BACKEND "Build filesystem backend" OFF)
-if(BUILD_FS_BACKEND)
-  # Yaml-cpp
-  set(YAMLCPP_STATIC_LIBRARY FALSE)
-  find_package(YamlCpp REQUIRED)
-  include_directories(${YAMLCPP_INCLUDE_DIR})
-  set(LINK_LIBS ${LINK_LIBS} ${YAMLCPP_LIBRARY})
-
-  list(APPEND backends "fs")
-  add_definitions(-DENABLE_FS_BACKEND=1)
-endif()
-
 # This is for tests
 include_directories(${CMAKE_SOURCE_DIR}/backend)
 
@@ -150,8 +137,8 @@ target_link_libraries(nixio ${LINK_LIBS})
 set_target_properties(nixio PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
 set_target_properties(nixio PROPERTIES COMPILE_FLAGS "-fPIC")
 set_target_properties(nixio PROPERTIES
-		      VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}
-		      SOVERSION ${VERSION_ABI})
+                      VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}
+                      SOVERSION ${VERSION_ABI})
 
 if(WIN32)
   set_target_properties(nixio PROPERTIES COMPILE_FLAGS -DNIXEXPORT)
@@ -181,26 +168,10 @@ if(CLANG_CHECK)
 
   add_custom_target(check COMMAND ${CLANG_CHECK} -p ${CMAKE_BINARY_DIR} ${nix_SOURCES}
                     DEPENDS nixio
-		    SOURCES ${nix_SOURCES})
+                    SOURCES ${nix_SOURCES})
 endif()
 
 
-########################################
-# CLI
-
-file(GLOB NixCli_SOURCES "cli/*.cpp")
-file(GLOB NixCli_SOURCES "cli/modules/*.cpp")
-include_directories("cli")
-
-add_executable(nixio-tool cli/Cli.cpp ${NixCli_SOURCES})
-if(NOT WIN32)
-  set_target_properties(nixio-tool PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations")
-endif()
-target_link_libraries(nixio-tool nixio)
-set_target_properties(nixio-tool PROPERTIES INSTALL_RPATH "@loader_path/../lib")
-message(STATUS "CLI executable added")
-
-
 ########################################
 # Tests
 
@@ -251,11 +222,10 @@ endif()
 ########################################
 # Install
 
-install(TARGETS nixio nixio-tool
+install(TARGETS nixio
         LIBRARY DESTINATION ${LIB_INSTALL_DIR}
         ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-        FRAMEWORK DESTINATION "/Library/Frameworks"
-        RUNTIME DESTINATION bin)
+        FRAMEWORK DESTINATION "/Library/Frameworks")
 install(DIRECTORY include/ DESTINATION ${INCLUDE_INSTALL_DIR}/nixio-1.0)
 install(DIRECTORY ${CMAKE_BINARY_DIR}/include/ DESTINATION ${INCLUDE_INSTALL_DIR}/nixio-1.0)
 
@@ -309,37 +279,30 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME "nixio-${CPACK_PACKAGE_VERSION}"
 set(CPACK_SOURCE_GENERATOR ${CPACK_GENERATOR})
 
 if(WIN32)
-
   install(TARGETS nixio
-		  ARCHIVE
-		  DESTINATION lib
-		  COMPONENT libraries)
+          ARCHIVE
+          DESTINATION lib
+          COMPONENT libraries)
   file(GLOB NIX_LICENSE "LICENSE*")
   install(FILES ${NIX_LICENSE}
-		  DESTINATION ./
-		  COMPONENT libraries)
-
-if(NOT BUILD_STATIC)
-  file(GLOB HDF5_DLLS "${HDF5_DIR}/../../bin/*.dll")
-  install(FILES ${HDF5_DLLS}
-		  DESTINATION bin
-		  COMPONENT libraries)
-endif()
+          DESTINATION ./
+          COMPONENT libraries)
+
+  if(NOT BUILD_STATIC)
+    file(GLOB HDF5_DLLS "${HDF5_DIR}/../../bin/*.dll")
+    install(FILES ${HDF5_DLLS}
+            DESTINATION bin
+            COMPONENT libraries)
+  endif()
 
   file(GLOB HDF5_COPYING "${HDF5_DIR}/../../COPYING")
   install(FILES ${HDF5_COPYING}
-		  DESTINATION ./
-		  COMPONENT libraries)
-
-  install(TARGETS nixio-tool
-		  RUNTIME
-		  DESTINATION bin
-		  COMPONENT applications)
+          DESTINATION ./
+          COMPONENT libraries)
 
   set(CPACK_GENERATOR NSIS)
   set(CPACK_NSIS_MODIFY_PATH ON)
-
-else()
+else()  # not WIN32
   if (NOT CPACK_GENERATOR)
     set(CPACK_GENERATOR TGZ)
   endif ()
@@ -360,7 +323,6 @@ MESSAGE(STATUS "CFLAGS:  ${CMAKE_CXX_FLAGS}")
 MESSAGE(STATUS "BOOST:   ${Boost_LIBRARIES}")
 MESSAGE(STATUS "HDF5:    ${HDF5_LIBRARIES}")
 MESSAGE(STATUS "CPPUNIT: ${CPPUNIT_LIBRARIES}")
-MESSAGE(STATUS "YAML-cpp: ${YAMLCPP_LIBRARY}")
 MESSAGE(STATUS "===============================")
 MESSAGE(STATUS "BACKENDS: ${backends}")
 MESSAGE(STATUS "===============================")