Skip to content

Commit 85480f9

Browse files
montykutyimontykutyi
committed
Release version 5.1.0
1 parent 3d5fe15 commit 85480f9

357 files changed

Lines changed: 90107 additions & 97745 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitmodules‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
[submodule "3rdparty/boost"]
22
path = 3rdparty/boost
33
url = https://github.com/boostorg/boost.git
4+
ignore = dirty
45
[submodule "3rdparty/zlib"]
56
path = 3rdparty/zlib
67
url = https://github.com/madler/zlib.git
8+
ignore = dirty
79
[submodule "3rdparty/PMD"]
810
path = 3rdparty/PMD
911
url = https://github.com/sed-inf-u-szeged/pmd.git
12+
ignore = dirty
1013
[submodule "3rdparty/python2"]
1114
path = 3rdparty/python2
1215
url = ../cpython.git
@@ -15,13 +18,13 @@
1518
path = 3rdparty/python3
1619
url = ../cpython.git
1720
ignore = dirty
18-
[submodule "cl/LIM2Patterns/pybind11"]
19-
path = cl/LIM2Patterns/pybind11
20-
url = https://github.com/pybind/pybind11
2121
[submodule "java/lib/openjdk"]
2222
path = java/lib/openjdk
2323
url = ../openjdk
2424
ignore = dirty
25+
[submodule "cl/LIM2Patterns/pybind11"]
26+
path = 3rdparty/pybind11
27+
url = https://github.com/pybind/pybind11
2528
[submodule "3rdparty/clang"]
2629
path = 3rdparty/clang
2730
url = ../llvm-project

‎3rdparty/CMakeLists.txt‎

Lines changed: 39 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,20 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL Windows)
133133
)
134134
endif ()
135135

136+
########################### md4c #########################
137+
ExternalProject_Add(md4c
138+
GIT_REPOSITORY https://github.com/mity/md4c
139+
GIT_TAG release-0.4.8
140+
GIT_SHALLOW 1
141+
UPDATE_DISCONNECTED 1
142+
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${COLUMBUS_3RDPARTY_INSTALL_DIR} -DBUILD_SHARED_LIBS=OFF
143+
BUILD_IN_SOURCE 1
144+
LOG_DOWNLOAD 1
145+
LOG_CONFIGURE 1
146+
LOG_BUILD 1
147+
LOG_INSTALL 1
148+
)
149+
136150
########################### PMD #########################
137151

138152
set (PMD_PACKAGE_VERSION pmd-bin-6.32.0)
@@ -213,8 +227,9 @@ if (CMAKE_SYSTEM_NAME STREQUAL Linux)
213227
DEPENDS zlib
214228
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/python3
215229
CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/python3/configure --enable-optimizations --disable-shared --prefix=${COLUMBUS_3RDPARTY_INSTALL_DIR} --without-pymalloc
216-
BUILD_COMMAND make -j8 altbininstall inclinstall
217-
INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "No install step is required as the build step installs the library."
230+
BUILD_COMMAND make -j8 altinstall
231+
INSTALL_COMMAND ${CMAKE_COMMAND} "-DCOPY_SOURCE=${COLUMBUS_3RDPARTY_INSTALL_DIR}/lib/python3.8/" "-DCOPY_TARGET=${EXECUTABLE_OUTPUT_PATH}/python-modules" "-DCOPY_PATTERN=*.py" -P ${CMAKE_CURRENT_SOURCE_DIR}/CMake/SearchAndCopyFiles.cmake
232+
COMMAND ${CMAKE_COMMAND} "-DCOPY_SOURCE=${COLUMBUS_3RDPARTY_INSTALL_DIR}/lib/python3.8/" "-DCOPY_TARGET=${EXECUTABLE_OUTPUT_PATH}/python-modules" "-DCOPY_PATTERN=*.so" -P ${CMAKE_CURRENT_SOURCE_DIR}/CMake/SearchAndCopyFiles.cmake
218233
LOG_CONFIGURE 1
219234
LOG_BUILD 1
220235
LOG_INSTALL 1
@@ -230,6 +245,7 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL Windows)
230245
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory Include ${COLUMBUS_3RDPARTY_INSTALL_DIR}/include/python3.8
231246
COMMAND ${CMAKE_COMMAND} -E copy "PC/pyconfig.h" ${COLUMBUS_3RDPARTY_INSTALL_DIR}/include/python3.8/pyconfig.h
232247
COMMAND ${CMAKE_COMMAND} -E copy "PCbuild/${PYTHON_PLATFORM_NAME}/python38$<$<CONFIG:Debug>:_d>.lib" ${COLUMBUS_3RDPARTY_INSTALL_DIR}/lib/python3.8.lib
248+
COMMAND ${CMAKE_COMMAND} "-DCOPY_SOURCE=${CMAKE_CURRENT_SOURCE_DIR}/python3/Lib/" "-DCOPY_TARGET=${EXECUTABLE_OUTPUT_PATH}/python-modules" "-DCOPY_PATTERN=*.py" -P ${CMAKE_CURRENT_SOURCE_DIR}/CMake/SearchAndCopyFiles.cmake
233249
LOG_CONFIGURE 1
234250
LOG_BUILD 1
235251
LOG_INSTALL 1
@@ -293,7 +309,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL Linux)
293309

294310
ExternalProject_Add( clang
295311
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/clang/llvm
296-
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${COLUMBUS_3RDPARTY_INSTALL_DIR} -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS} -DLLVM_ENABLE_RTTI=ON -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_ENABLE_SPHINX=ON "-DLLVM_ENABLE_PROJECTS=clang\\$<SEMICOLON>clang-tools-extra" -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
312+
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${COLUMBUS_3RDPARTY_INSTALL_DIR} -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS} -DLLVM_ENABLE_RTTI=ON -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_ENABLE_SPHINX=ON "-DLLVM_ENABLE_PROJECTS=clang\\$<SEMICOLON>clang-tools-extra" -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DLLVM_TARGETS_TO_BUILD=X86
297313
BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> --parallel ${PHYSICAL_CORES} -t install-llvm-libraries-stripped -t install-clang-libraries-stripped -t install-clang-headers -t install-llvm-headers -t install-clang-tidy-stripped -t install-clang-resource-headers
298314
INSTALL_COMMAND ""
299315
LOG_CONFIGURE 1
@@ -306,10 +322,10 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL Windows)
306322
ExternalProject_Add( clang
307323
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/clang/llvm
308324
CMAKE_GENERATOR Ninja
309-
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${COLUMBUS_3RDPARTY_INSTALL_DIR} -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT -DLLVM_ENABLE_RTTI=ON "-DLLVM_ENABLE_PROJECTS=clang\\$<SEMICOLON>clang-tools-extra" -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_GENERATOR_TOOLSET=
325+
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${COLUMBUS_3RDPARTY_INSTALL_DIR} -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT -DLLVM_ENABLE_RTTI=ON "-DLLVM_ENABLE_PROJECTS=clang\\$<SEMICOLON>clang-tools-extra" -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DLLVM_TARGETS_TO_BUILD=X86 -DCMAKE_GENERATOR_TOOLSET=
310326
BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> --parallel ${PHYSICAL_CORES} -t install-llvm-libraries-stripped -t install-clang-libraries-stripped -t install-clang-headers -t install-llvm-headers -t install-clang-tidy-stripped -t install-clang-resource-headers
311327
INSTALL_COMMAND ""
312-
LOG_CONFIGURE 1
328+
LOG_CONFIGURE 1
313329
LOG_BUILD 1
314330
LOG_INSTALL 1
315331
)
@@ -318,4 +334,21 @@ endif()
318334

319335

320336
######################## miniz #################################
321-
add_subdirectory(miniz)
337+
338+
ExternalProject_Add( miniz
339+
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/miniz
340+
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${COLUMBUS_3RDPARTY_INSTALL_DIR} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_POLICY_DEFAULT_CMP0091:STRING=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY:STRING=MultiThreaded$<$<CONFIG:Debug>:Debug>
341+
LOG_CONFIGURE 1
342+
LOG_BUILD 1
343+
LOG_INSTALL 1
344+
)
345+
346+
######################## pybind11 #################################
347+
348+
ExternalProject_Add( pybind11
349+
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/pybind11
350+
CMAKE_ARGS -DPYBIND11_TEST=OFF -DCMAKE_INSTALL_PREFIX=${COLUMBUS_3RDPARTY_INSTALL_DIR}
351+
LOG_CONFIGURE 1
352+
LOG_BUILD 1
353+
LOG_INSTALL 1
354+
)

cl/LIM2Patterns/pybind11 renamed to 3rdparty/pybind11

‎3rdparty/zlib‎

Submodule zlib updated 86 files

‎Analyzer/CMakeLists.txt‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
set (ANALYZER_PACKAGE_NAME OpenStaticAnalyzer-${PROJECT_VERSION}-${COLUMBUS_PLATFORM_NAME}-${CMAKE_SYSTEM_NAME})
2+
set (ANALYZER_PACKAGE_DIR ${CMAKE_CURRENT_BINARY_DIR}/${ANALYZER_PACKAGE_NAME})
3+
set (ANALYZER_PACKAGE_DIR ${CMAKE_CURRENT_BINARY_DIR}/${ANALYZER_PACKAGE_NAME} PARENT_SCOPE)
4+
set (ANALYZER_COMMON_TARGET_NAME Analyzer-Common)
5+
6+
set (ANALYZER_TARGET_NAME Analyzer-Package)
7+
8+
9+
10+
function (add_custom_generated_copy_dependency_to_common_dir)
11+
add_custom_generated_copy_dependency(${ANALYZER_COMMON_TARGET_NAME} ${EXECUTABLE_OUTPUT_PATH} ${ANALYZER_PACKAGE_DIR}/${PACKAGE_LANG}/Common ${ARGV})
12+
endfunction ()
13+
14+
add_custom_target (
15+
${ANALYZER_COMMON_TARGET_NAME}
16+
)
17+
set_target_properties (${ANALYZER_COMMON_TARGET_NAME} PROPERTIES FOLDER ${CMAKE_SUPPORT_FOLDER_NAME})
18+
19+
add_custom_generated_copy_dependency_to_common_dir(python-modules python3.8 python-modules DIRECTORY)
20+
add_custom_generated_copy_dependency_to_common_dir(LIM2Patterns${EXE})
21+
add_custom_generated_copy_dependency_to_common_dir(Patterns LIM2Patterns Patterns DIRECTORY)
22+
23+
if (CMAKE_SYSTEM_NAME STREQUAL Windows)
24+
set (COMPRESS_COMMAND tar cf ${ANALYZER_PACKAGE_NAME}.zip --format=zip ${ANALYZER_PACKAGE_NAME})
25+
elseif (CMAKE_SYSTEM_NAME STREQUAL Linux)
26+
set (COMPRESS_COMMAND tar czf ${ANALYZER_PACKAGE_NAME}.tgz ${ANALYZER_PACKAGE_NAME})
27+
endif ()
28+
29+
add_custom_target (
30+
${ANALYZER_TARGET_NAME}
31+
DEPENDS AN-Java
32+
DEPENDS AN-CPP
33+
DEPENDS AN-Python
34+
DEPENDS AN-CSharp
35+
DEPENDS AN-JavaScript
36+
COMMAND ${CMAKE_COMMAND} -E ${COMPRESS_COMMAND}
37+
)
38+
39+
40+
set_visual_studio_project_folder(${ANALYZER_TARGET_NAME} FALSE)
41+
42+
set (DOC_FILES
43+
readme.txt
44+
)
45+
46+
add_prefix(DOC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/doc/)
47+
48+
add_custom_copy_list_target (${ANALYZER_TARGET_NAME}
49+
DocFiles
50+
DOC_FILES
51+
${ANALYZER_PACKAGE_DIR}
52+
)
53+
54+
add_custom_generated_copy_dependency (${ANALYZER_TARGET_NAME} ${CMAKE_BINARY_DIR}/java/lib/bin ${ANALYZER_PACKAGE_DIR}/GraphAPI/Graphlib graphlib.jar java_graphlib)
55+
add_custom_generated_copy_dependency (${ANALYZER_TARGET_NAME} ${CMAKE_BINARY_DIR}/java/lib/graphlib/build ${ANALYZER_PACKAGE_DIR}/GraphAPI/Graphlib doc java_graphlib doc DIRECTORY)
56+
add_custom_generated_copy_dependency (${ANALYZER_TARGET_NAME} ${CMAKE_BINARY_DIR}/java/lib/bin ${ANALYZER_PACKAGE_DIR}/GraphAPI/Graphsupportlib graphsupportlib.jar java_graphsupportlib)
57+
#add_custom_generated_copy_dependency (${ANALYZER_TARGET_NAME} ${CMAKE_BINARY_DIR}/java/lib/graphsupport/build ${ANALYZER_PACKAGE_DIR}/GraphAPI/Graphsupportlib doc java_graphsupportlib DIRECTORY)
58+
add_custom_copy_target (${ANALYZER_TARGET_NAME} ${CMAKE_SOURCE_DIR}/java/cl/GraphExample/src ${ANALYZER_PACKAGE_DIR}/GraphAPI/GraphExample/src DIRECTORY)
59+
add_custom_copy_target (${ANALYZER_TARGET_NAME} ${CMAKE_SOURCE_DIR}/java/cl/GraphExample/build_package.xml ${ANALYZER_PACKAGE_DIR}/GraphAPI/GraphExample/build.xml)
60+
61+
function (copy_licenses)
62+
file (GLOB LICENSE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/Licenses/*)
63+
64+
add_custom_copy_list_target (
65+
${ANALYZER_TARGET_NAME}
66+
Licenses
67+
LICENSE_FILES
68+
${ANALYZER_PACKAGE_DIR}/Licenses
69+
)
70+
endfunction ()
71+
72+
add_subdirectory (common)
73+
add_subdirectory (cpp)
74+
add_subdirectory (java)
75+
add_subdirectory (python)
76+
add_subdirectory (csharp)
77+
add_subdirectory (javascript)
78+
79+
copy_licenses()

OpenStaticAnalyzer/Licenses/EXPRTK-LICENSE.txt renamed to Analyzer/Licenses/EXPRTK-LICENSE.txt

File renamed without changes.

OpenStaticAnalyzer/Licenses/SONARQUBE-LICENSE.txt renamed to Analyzer/Licenses/SONARQUBE-LICENSE.txt

File renamed without changes.

‎Analyzer/common/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
add_subdirectory(TagMetadata)

‎Analyzer/common/TagMetadata/CMakeLists.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
add_custom_target(CommonTagMetadata)
2+
3+
add_copy_next_to_the_binary_dependency(CommonTagMetadata cwe_metadata.md)
4+
add_copy_next_to_the_binary_dependency(CommonTagMetadata general_metadata.md)
5+
add_copy_next_to_the_binary_dependency(CommonTagMetadata owasp_metadata.md)
6+
add_copy_next_to_the_binary_dependency(CommonTagMetadata sei_cert_metadata.md)

0 commit comments

Comments
 (0)