src,doc: move source files to separate subdirs

Closes: https://github.com/kdudka/csdiff/pull/15

Author: kdudka

.gitignore

@@ -1,3 +1,2 @@
 /csdiff_build
 /tags
-/version.cc

CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 - 2019 Red Hat, Inc.
+# Copyright (C) 2011 - 2020 Red Hat, Inc.
 #
 # This file is part of csdiff.
 #
@@ -18,140 +18,9 @@
 cmake_minimum_required(VERSION 2.8)
 project(csdiff CXX)
 enable_testing()
-add_definitions(-Wall -Wextra -fPIC -std=c++11)
 
-# cslib.a
-add_library(cs STATIC
-    abstract-filter.cc
-    abstract-parser.cc
-    abstract-writer.cc
-    color.cc
-    csdiff-core.cc
-    csfilter.cc
-    csparser.cc
-    cswriter.cc
-    cwe-mapper.cc
-    deflookup.cc
-    defqueue.cc
-    gcc-parser.cc
-    html-writer.cc
-    instream.cc
-    json-parser.cc
-    json-writer.cc
-    parser-common.cc
-    shared-string.cc
-    version.cc
-)
+# C/C++ sources
+add_subdirectory(src)
 
-# link cslib.a and boost libraries
-find_library(BOOST_REGEX                boost_regex                 REQUIRED)
-find_library(BOOST_PROGRAM_OPTIONS      boost_program_options       REQUIRED)
-link_libraries(cs
-    boost_regex
-    boost_program_options)
-
-# the list of executables
-add_executable(csdiff       csdiff.cc)
-add_executable(csgrep       csgrep.cc)
-add_executable(cshtml       cshtml.cc)
-add_executable(cslinker     cslinker.cc)
-add_executable(cssort       cssort.cc)
-
-# experimental
-add_executable(cstrans-df-run cstrans-df-run.cc)
-target_link_libraries(cstrans-df-run
-    boost_filesystem
-    boost_system)
-
-# load regression tests
+# regression tests
 add_subdirectory(tests)
-
-# declare what 'make install' should install
-install(TARGETS
-    csdiff
-    csgrep
-    cshtml
-    cslinker
-    cssort
-    cstrans-df-run
-    DESTINATION bin)
-
-# pycsdiff - python binding of csdiff
-option(BUILD_PYCSDIFF "Set to ON to enable python binding" ON)
-if (BUILD_PYCSDIFF)
-    set(BOOST_PYTHON_LIB_NAME "boost_python"
-        CACHE STRING "Name of the boost_python library")
-
-    # boost_python3 is used on Fedora 29.
-    # boost_python38 is used on Fedora 31.
-    # boost_python-3.x is used on Gentoo Linux.
-    find_library(BOOST_PYTHON NAMES ${BOOST_PYTHON_LIB_NAME}
-        boost_python3
-        boost_python39 boost_python-3.9
-        boost_python38 boost_python-3.8
-        boost_python37 boost_python-3.7
-        boost_python36 boost_python-3.6
-        boost_python35 boost_python-3.5)
-
-    message(STATUS "BOOST_PYTHON: ${BOOST_PYTHON}")
-
-    # query PYTHON_INCLUDE_DIR
-    find_package(PythonInterp REQUIRED)
-    find_package(PythonLibs   REQUIRED)
-    message(STATUS "PYTHON_INCLUDE_DIR: ${PYTHON_INCLUDE_DIR}")
-    if(NOT EXISTS "${PYTHON_INCLUDE_DIR}/pyconfig.h")
-        message(FATAL_ERROR "
-${PYTHON_INCLUDE_DIR}/pyconfig.h does not exits")
-    endif()
-
-    # query PYTHON_SITEARCH
-    execute_process(COMMAND ${PYTHON_EXECUTABLE}
-        -c "from distutils.sysconfig import get_python_lib
-print(get_python_lib(1))"
-        RESULT_VARIABLE PYTHON_SITEARCH_STATUS
-        OUTPUT_VARIABLE PYTHON_SITEARCH
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if("${PYTHON_SITEARCH_STATUS}" EQUAL 0)
-        message(STATUS "PYTHON_SITEARCH: ${PYTHON_SITEARCH}")
-    else()
-        message(FATAL_ERROR "
-failed to query PYTHON_SITEARCH")
-    endif()
-
-    message(STATUS "python binding enabled, the pycsdiff module will be built!")
-    add_library(pycsdiff SHARED pycsdiff.cc)
-    set_target_properties(pycsdiff PROPERTIES
-        COMPILE_FLAGS "-I${PYTHON_INCLUDE_DIR}"
-        PREFIX "")
-    target_link_libraries(pycsdiff ${BOOST_PYTHON})
-    install(TARGETS pycsdiff DESTINATION ${PYTHON_SITEARCH})
-endif()
-
-# macro to generate a man page from the corresponding binary
-macro(create_manpage BINARY)
-    set(H2M_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/${BINARY}.h2m")
-    if(EXISTS "${H2M_INCLUDE}")
-        set(H2M_ARGS --include ${H2M_INCLUDE})
-    else()
-        set(H2M_ARGS "")
-    endif()
-    add_custom_command(TARGET ${BINARY} POST_BUILD
-        COMMAND ${HELP2MAN} --no-info --section 1 ${H2M_ARGS}
-            ${CMAKE_CURRENT_BINARY_DIR}/${BINARY}
-            > ${BINARY}.1 || rm -f ${BINARY}.1
-        COMMENT "Generating ${BINARY} man page"
-        VERBATIM)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BINARY}.1
-        DESTINATION share/man/man1)
-endmacro(create_manpage)
-
-# generate man pages using help2man if available
-find_program(HELP2MAN help2man)
-if(HELP2MAN)
-    create_manpage(csdiff)
-    create_manpage(csgrep)
-    create_manpage(cshtml)
-    create_manpage(cslinker)
-    create_manpage(cssort)
-    create_manpage(cstrans-df-run)
-endif()

Makefile

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 Red Hat, Inc.
+# Copyright (C) 2011 - 2020 Red Hat, Inc.
 #
 # This file is part of csdiff.
 #
@@ -22,7 +22,7 @@ CTEST ?= ctest -j$(NUM_CPU) --progress
 
 CMAKE_BUILD_TYPE ?= RelWithDebInfo
 
-.PHONY: all check clean distclean distcheck fast install version.cc
+.PHONY: all check clean distclean distcheck fast install version.cc src/version.cc
 
 all: version.cc
 	mkdir -p csdiff_build
@@ -37,9 +37,9 @@ check: all
 
 clean:
 	if test -e csdiff_build/Makefile; then $(MAKE) clean -C csdiff_build; fi
-	if test -e .git; then rm -f version.cc; fi
 
 distclean:
+	if test -e .git; then rm -f src/version.cc; fi
 	rm -rf csdiff_build
 
 distcheck: distclean
@@ -48,7 +48,9 @@ distcheck: distclean
 install: all
 	$(MAKE) -C csdiff_build install
 
-version.cc:
+version.cc: src/version.cc
+
+src/version.cc:
 	@if test -e .git; then \
 		cmd='git log --pretty="0.%cd_%h" --date=short -1 | tr -d -'; \
 	else \

csdiff.h2m renamed to doc/csdiff.h2m

@@ -148,7 +148,7 @@ make %{?_smp_mflags} VERBOSE=yes
 mkdir ../csdiff_build_py2
 cd ../csdiff_build_py2
 %cmake .. -B. -DPYTHON_EXECUTABLE=%{__python2}
-make %{?_smp_mflags} VERBOSE=yes
+make %{?_smp_mflags} VERBOSE=yes pycsdiff
 %endif
 
 %if %{with python3}
@@ -162,17 +162,15 @@ make %{?_smp_mflags} VERBOSE=yes pycsdiff
 
 %install
 %if %{with python2}
-mkdir -vp %{buildroot}%{python2_sitearch}
-install -vm0644 csdiff_build_py2/pycsdiff.so %{buildroot}%{python2_sitearch}
+make install-pycsdiff -C csdiff_build_py2 DESTDIR=%{buildroot}
 %endif
 
 %if %{with python3}
-mkdir -vp %{buildroot}%{python3_sitearch}
-install -vm0644 csdiff_build_py3/pycsdiff.so %{buildroot}%{python3_sitearch}
+make install-pycsdiff -C csdiff_build_py3 DESTDIR=%{buildroot}
 %endif
 
 cd csdiff_build
-make install DESTDIR="\$RPM_BUILD_ROOT"
+%make_install
 
 %check
 cd csdiff_build