src/lib: separate directory for source code of cslib.a

Closes: #93
csutils · Nov 9, 2022 · 5de9670 · 5de9670
1 parent 7e50c47
commit 5de9670
Show file tree

Hide file tree

Showing 61 changed files with 53 additions and 33 deletions.
diff --git a/Makefile b/Makefile
@@ -25,7 +25,7 @@ SANITIZERS ?= OFF
 CMAKE_BUILD_TYPE ?= RelWithDebInfo
 
 .PHONY: all check clean sanitizers distclean distcheck distcheck-sanitizers \
-	fast install version.cc src/version.cc
+	fast install version.cc src/lib/version.cc
 
 all: version.cc
 	mkdir -p csdiff_build
@@ -47,7 +47,7 @@ sanitizers:
 	$(MAKE) -s all SANITIZERS=ON
 
 distclean:
-	if test -e .git; then rm -f src/version.cc; fi
+	if test -e .git; then rm -f src/lib/version.cc; fi
 	rm -rf csdiff_build
 
 distcheck: distclean
@@ -59,9 +59,9 @@ distcheck-sanitizers:
 install: all
 	$(MAKE) -C csdiff_build install
 
-version.cc: src/version.cc
+version.cc: src/lib/version.cc
 
-src/version.cc:
+src/lib/version.cc:
 	@if test -e .git; then \
 		cmd='git describe --always | sed -e "s/^csdiff-//" -e "s/-.*-/.$$(git log --pretty="%cd" --date=iso -1 | tr -d ":-" | tr " " . | cut -d. -f 1,2)./"'; \
 	else \

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -61,35 +61,8 @@ endif()
 add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
 
 # cslib.a
-add_library(cs STATIC
-    abstract-filter.cc
-    color.cc
-    csdiff-core.cc
-    csv-parser.cc
-    cwe-mapper.cc
-    cwe-name-lookup.cc
-    deflookup.cc
-    instream.cc
-    msg-filter.cc
-    parser.cc
-    parser-common.cc
-    parser-cov.cc
-    parser-gcc.cc
-    parser-json.cc
-    parser-json-cov.cc
-    parser-json-gcc.cc
-    parser-json-sarif.cc
-    parser-json-shchk.cc
-    parser-json-simple.cc
-    parser-xml.cc
-    parser-xml-valgrind.cc
-    shared-string.cc
-    version.cc
-    writer.cc
-    writer-cov.cc
-    writer-html.cc
-    writer-json.cc
-)
+add_subdirectory(lib)
+include_directories(lib)
 
 # link cslib.a and boost libraries
 link_libraries(cs

diff --git a/src/.gitignore → src/lib/.gitignore b/src/.gitignore → src/lib/.gitignore
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
@@ -0,0 +1,47 @@
+# Copyright (C) 2011 - 2022 Red Hat, Inc.
+#
+# This file is part of csdiff.
+#
+# csdiff is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# any later version.
+#
+# csdiff is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with csdiff.  If not, see <http://www.gnu.org/licenses/>.
+
+# cslib.a
+add_library(cs STATIC
+    abstract-filter.cc
+    color.cc
+    csdiff-core.cc
+    csv-parser.cc
+    cwe-mapper.cc
+    cwe-name-lookup.cc
+    deflookup.cc
+    instream.cc
+    msg-filter.cc
+    parser.cc
+    parser-common.cc
+    parser-cov.cc
+    parser-gcc.cc
+    parser-json.cc
+    parser-json-cov.cc
+    parser-json-gcc.cc
+    parser-json-sarif.cc
+    parser-json-shchk.cc
+    parser-json-simple.cc
+    parser-xml.cc
+    parser-xml-valgrind.cc
+    shared-string.cc
+    version.cc
+    writer.cc
+    writer-cov.cc
+    writer-html.cc
+    writer-json.cc
+)
diff --git a/src/abstract-filter.cc → src/lib/abstract-filter.cc b/src/abstract-filter.cc → src/lib/abstract-filter.cc
diff --git a/src/abstract-filter.hh → src/lib/abstract-filter.hh b/src/abstract-filter.hh → src/lib/abstract-filter.hh
diff --git a/src/abstract-tree.hh → src/lib/abstract-tree.hh b/src/abstract-tree.hh → src/lib/abstract-tree.hh
diff --git a/src/color.cc → src/lib/color.cc b/src/color.cc → src/lib/color.cc
diff --git a/src/color.hh → src/lib/color.hh b/src/color.hh → src/lib/color.hh
diff --git a/src/csdiff-core.cc → src/lib/csdiff-core.cc b/src/csdiff-core.cc → src/lib/csdiff-core.cc
diff --git a/src/csdiff-core.hh → src/lib/csdiff-core.hh b/src/csdiff-core.hh → src/lib/csdiff-core.hh
diff --git a/src/csv-parser.cc → src/lib/csv-parser.cc b/src/csv-parser.cc → src/lib/csv-parser.cc
diff --git a/src/csv-parser.hh → src/lib/csv-parser.hh b/src/csv-parser.hh → src/lib/csv-parser.hh
diff --git a/src/cwe-mapper.cc → src/lib/cwe-mapper.cc b/src/cwe-mapper.cc → src/lib/cwe-mapper.cc
diff --git a/src/cwe-mapper.hh → src/lib/cwe-mapper.hh b/src/cwe-mapper.hh → src/lib/cwe-mapper.hh
diff --git a/src/cwe-name-lookup.cc → src/lib/cwe-name-lookup.cc b/src/cwe-name-lookup.cc → src/lib/cwe-name-lookup.cc
diff --git a/src/cwe-name-lookup.hh → src/lib/cwe-name-lookup.hh b/src/cwe-name-lookup.hh → src/lib/cwe-name-lookup.hh
diff --git a/src/defect.hh → src/lib/defect.hh b/src/defect.hh → src/lib/defect.hh
diff --git a/src/deflookup.cc → src/lib/deflookup.cc b/src/deflookup.cc → src/lib/deflookup.cc
diff --git a/src/deflookup.hh → src/lib/deflookup.hh b/src/deflookup.hh → src/lib/deflookup.hh
diff --git a/src/instream.cc → src/lib/instream.cc b/src/instream.cc → src/lib/instream.cc
diff --git a/src/instream.hh → src/lib/instream.hh b/src/instream.hh → src/lib/instream.hh
diff --git a/src/msg-filter.cc → src/lib/msg-filter.cc b/src/msg-filter.cc → src/lib/msg-filter.cc
diff --git a/src/msg-filter.hh → src/lib/msg-filter.hh b/src/msg-filter.hh → src/lib/msg-filter.hh
diff --git a/src/parser-common.cc → src/lib/parser-common.cc b/src/parser-common.cc → src/lib/parser-common.cc
diff --git a/src/parser-common.hh → src/lib/parser-common.hh b/src/parser-common.hh → src/lib/parser-common.hh
diff --git a/src/parser-cov.cc → src/lib/parser-cov.cc b/src/parser-cov.cc → src/lib/parser-cov.cc
diff --git a/src/parser-cov.hh → src/lib/parser-cov.hh b/src/parser-cov.hh → src/lib/parser-cov.hh
diff --git a/src/parser-gcc.cc → src/lib/parser-gcc.cc b/src/parser-gcc.cc → src/lib/parser-gcc.cc
diff --git a/src/parser-gcc.hh → src/lib/parser-gcc.hh b/src/parser-gcc.hh → src/lib/parser-gcc.hh
diff --git a/src/parser-json-cov.cc → src/lib/parser-json-cov.cc b/src/parser-json-cov.cc → src/lib/parser-json-cov.cc
diff --git a/src/parser-json-cov.hh → src/lib/parser-json-cov.hh b/src/parser-json-cov.hh → src/lib/parser-json-cov.hh
diff --git a/src/parser-json-gcc.cc → src/lib/parser-json-gcc.cc b/src/parser-json-gcc.cc → src/lib/parser-json-gcc.cc
diff --git a/src/parser-json-gcc.hh → src/lib/parser-json-gcc.hh b/src/parser-json-gcc.hh → src/lib/parser-json-gcc.hh
diff --git a/src/parser-json-sarif.cc → src/lib/parser-json-sarif.cc b/src/parser-json-sarif.cc → src/lib/parser-json-sarif.cc
diff --git a/src/parser-json-sarif.hh → src/lib/parser-json-sarif.hh b/src/parser-json-sarif.hh → src/lib/parser-json-sarif.hh
diff --git a/src/parser-json-shchk.cc → src/lib/parser-json-shchk.cc b/src/parser-json-shchk.cc → src/lib/parser-json-shchk.cc
diff --git a/src/parser-json-shchk.hh → src/lib/parser-json-shchk.hh b/src/parser-json-shchk.hh → src/lib/parser-json-shchk.hh
diff --git a/src/parser-json-simple.cc → src/lib/parser-json-simple.cc b/src/parser-json-simple.cc → src/lib/parser-json-simple.cc
diff --git a/src/parser-json-simple.hh → src/lib/parser-json-simple.hh b/src/parser-json-simple.hh → src/lib/parser-json-simple.hh
diff --git a/src/parser-json.cc → src/lib/parser-json.cc b/src/parser-json.cc → src/lib/parser-json.cc
diff --git a/src/parser-json.hh → src/lib/parser-json.hh b/src/parser-json.hh → src/lib/parser-json.hh
diff --git a/src/parser-xml-valgrind.cc → src/lib/parser-xml-valgrind.cc b/src/parser-xml-valgrind.cc → src/lib/parser-xml-valgrind.cc
diff --git a/src/parser-xml-valgrind.hh → src/lib/parser-xml-valgrind.hh b/src/parser-xml-valgrind.hh → src/lib/parser-xml-valgrind.hh
diff --git a/src/parser-xml.cc → src/lib/parser-xml.cc b/src/parser-xml.cc → src/lib/parser-xml.cc
diff --git a/src/parser-xml.hh → src/lib/parser-xml.hh b/src/parser-xml.hh → src/lib/parser-xml.hh
diff --git a/src/parser.cc → src/lib/parser.cc b/src/parser.cc → src/lib/parser.cc
diff --git a/src/parser.hh → src/lib/parser.hh b/src/parser.hh → src/lib/parser.hh
diff --git a/src/regex.hh → src/lib/regex.hh b/src/regex.hh → src/lib/regex.hh
diff --git a/src/shared-string-ptree.hh → src/lib/shared-string-ptree.hh b/src/shared-string-ptree.hh → src/lib/shared-string-ptree.hh
diff --git a/src/shared-string.cc → src/lib/shared-string.cc b/src/shared-string.cc → src/lib/shared-string.cc
diff --git a/src/shared-string.hh → src/lib/shared-string.hh b/src/shared-string.hh → src/lib/shared-string.hh
diff --git a/src/version.hh → src/lib/version.hh b/src/version.hh → src/lib/version.hh
diff --git a/src/writer-cov.cc → src/lib/writer-cov.cc b/src/writer-cov.cc → src/lib/writer-cov.cc
diff --git a/src/writer-cov.hh → src/lib/writer-cov.hh b/src/writer-cov.hh → src/lib/writer-cov.hh
diff --git a/src/writer-html.cc → src/lib/writer-html.cc b/src/writer-html.cc → src/lib/writer-html.cc
diff --git a/src/writer-html.hh → src/lib/writer-html.hh b/src/writer-html.hh → src/lib/writer-html.hh
diff --git a/src/writer-json.cc → src/lib/writer-json.cc b/src/writer-json.cc → src/lib/writer-json.cc
diff --git a/src/writer-json.hh → src/lib/writer-json.hh b/src/writer-json.hh → src/lib/writer-json.hh
diff --git a/src/writer.cc → src/lib/writer.cc b/src/writer.cc → src/lib/writer.cc
diff --git a/src/writer.hh → src/lib/writer.hh b/src/writer.hh → src/lib/writer.hh