Osx compat

analyzer/config/analyzer_version.json

@@ -1,8 +1,8 @@
 {
     "version": {
         "major" : "6",
-        "minor" : "23",
-        "revision" : "0",
+        "minor" : "22",
+        "revision" : "2",
         "rc" : ""
     }
 }

analyzer/tools/build-logger/tests/unit/test_paths.py

@@ -4,6 +4,7 @@
 import os
 import shutil
 import tempfile
+from typing import Mapping
 from . import BasicLoggerTest, empty_env, REPO_ROOT
 
 AVAILABLE_GNU_COMPILERS = [
@@ -13,6 +14,15 @@
 ]
 
 
+def append_host_LD_LIBRARY_PATH(env: Mapping[str, str]) -> Mapping[str, str]:
+    LD_LIBRARY_PATH = os.getenv("LD_LIBRARY_PATH")
+    if LD_LIBRARY_PATH:
+        if "LD_LIBRARY_PATH" not in env:
+            env["LD_LIBRARY_PATH"] = ""
+        env["LD_LIBRARY_PATH"] += ':' + LD_LIBRARY_PATH
+    return env
+
+
 class EscapingTests(BasicLoggerTest):
     def test_compiler_path1(self):
         """
@@ -242,6 +252,7 @@ def test_response_file(self):
         """Test clang-specific response files."""
         logger_env = self.get_envvars()
         # clang might need Z3
+        logger_env = append_host_LD_LIBRARY_PATH(logger_env)
         file = self.source_file
         binary = self.binary_file
         clang = shutil.which("clang")
@@ -277,6 +288,7 @@ def test_response_file_contain_source_file(self):
         """
         logger_env = self.get_envvars()
         # clang might need Z3
+        logger_env = append_host_LD_LIBRARY_PATH(logger_env)
         file = self.source_file
         binary = self.binary_file
         clang = shutil.which("clang")

setup.py

@@ -141,7 +141,7 @@ def run(self):
 
 setuptools.setup(
     name="codechecker",
-    version="6.23.0",
+    version="6.22.2",
     author='CodeChecker Team (Ericsson)',
     author_email='codechecker-tool@googlegroups.com',
     description="CodeChecker is an analyzer tooling, defect database and "

snap/snapcraft.yaml

@@ -1,6 +1,6 @@
 name: codechecker
 base: core18
-version: '6.23.0'
+version: '6.22.2'
 summary: CodeChecker is an analyzer tooling, defect database and viewer extension
 description: |
   CodeChecker is an analyzer tooling, defect database and viewer extension.
@@ -33,7 +33,7 @@ parts:
   codechecker:
     plugin: python
     python-version: python3
-    source: https://github.com/Ericsson/codechecker/archive/v6.23.0.tar.gz
+    source: https://github.com/Ericsson/codechecker/archive/v6.22.2.tar.gz
     build-packages:
       - curl
       - gcc-multilib

web/client/codechecker_client/blame_info.py

@@ -118,7 +118,7 @@ def assemble_blame_info(
     # being present in windows, so stuff like setting up
     # PYTHONPATH in parent CodeChecker before store is executed
     # are lost.
-    if sys.platform == "win32":
+    if sys.platform == "win32" or sys.platform == "darwin":
         file_blame_info = __collect_blame_info_for_files(file_paths)
     else:
         with ProcessPoolExecutor() as executor:

web/client/codechecker_client/cmd/store.py

@@ -370,8 +370,12 @@ def filter_source_files_with_comments(
     # being present in windows, so stuff like setting up
     # PYTHONPATH in parent CodeChecker before store is executed
     # are lost.
-    if sys.platform == "win32":
+    if sys.platform == "win32": #or sys.platform == "darwin":
         return get_source_file_with_comments(jobs)
+    elif sys.platform == "darwin":
+        import multiprocess
+        with multiprocess.Pool() as pool:
+            return get_source_file_with_comments(jobs, pool.map)
     else:
         with ProcessPoolExecutor() as executor:
             return get_source_file_with_comments(jobs, executor.map)
@@ -449,6 +453,13 @@ def assemble_zip(inputs, zip_file, client, checker_labels: CheckerLabels):
     if sys.platform == "win32":
         analyzer_result_file_reports = parse_analyzer_result_files(
             analyzer_result_file_paths, checker_labels)
+
+    elif sys.platform == "darwin":
+        import multiprocess
+        with multiprocess.Pool() as pool:
+            analyzer_result_file_reports = parse_analyzer_result_files(
+                 analyzer_result_file_paths, checker_labels, pool.map)
+
     else:
         with ProcessPoolExecutor() as executor:
             analyzer_result_file_reports = parse_analyzer_result_files(

web/client/codechecker_client/cmd_line_client.py

@@ -1025,13 +1025,16 @@ def get_diff_local_dirs(
     filtered_report_hashes = []
 
     context = webserver_context.get_context()
+    statuses_str = [ttypes.ReviewStatus._VALUES_TO_NAMES[x].lower()
+                    for x in report_filter.reviewStatus]
+
     base_results = get_report_dir_results(
         report_dirs, report_filter, context.checker_labels)
+    base_results = [res for res in base_results
+                    if res.check_source_code_comments(statuses_str)]
+
     new_results = get_report_dir_results(
         new_report_dirs, report_filter, context.checker_labels)
-
-    statuses_str = [ttypes.ReviewStatus._VALUES_TO_NAMES[x].lower()
-                    for x in report_filter.reviewStatus]
     new_results = [res for res in new_results
                    if res.check_source_code_comments(statuses_str)]
 

web/config/web_version.json

@@ -1,8 +1,8 @@
 {
     "version": {
         "major" : "6",
-        "minor" : "23",
-        "revision" : "0",
+        "minor" : "22",
+        "revision" : "2",
         "rc" : ""
     }
 }

web/server/codechecker_server/api/mass_store_run.py

@@ -1323,10 +1323,15 @@ def store(self) -> int:
                         runtime = round(time.time() - start_time, 2)
                         zip_size_kb = round(zip_size / 1024)
 
+                        tag_desc = ""
+                        if self.__tag:
+                            tag_desc = f", under tag '{self.__tag}'"
+
                         LOG.info("'%s' stored results (%s KB "
-                                 "/decompressed/) to run '%s' (id: %d) in "
+                                 "/decompressed/) to run '%s' (id: %d) %s in "
                                  "%s seconds.", self.user_name,
-                                 zip_size_kb, self.__name, run_id, runtime)
+                                 zip_size_kb, self.__name, run_id, tag_desc,
+                                 runtime)
 
                         iso_start_time = datetime.fromtimestamp(
                             start_time).isoformat()

web/server/vue-cli/src/views/NewFeatures.vue

@@ -2,6 +2,31 @@
   <!-- eslint-disable max-len -->
   <v-container fluid>
     <v-timeline align-top>
+      <v-timeline-item fill-dot icon="mdi-star">
+        <new-release-item>
+          <template v-slot:title>
+            <a
+              href="https://github.com/Ericsson/codechecker/releases/tag/v6.22.2"
+              target="_blank"
+              class="white--text"
+            >
+              Highlights of CodeChecker 6.22.2 release
+            </a>
+          </template>
+
+          <new-feature-item>
+            <template v-slot:title>
+              Support for Ubuntu 22.04
+            </template>
+            CodeChecker failed to build on Ubuntu 22.04 in its previous release
+            because of two issues: some of our dependencies broke with the
+            release of python3.9, and we didn't support GNU Make-s new way of
+            creating build jobs. These issues are all fixed now, so CodeChecker
+            should work with the latest version of python and GNU Make!
+          </new-feature-item>
+        </new-release-item>
+      </v-timeline-item>
+
       <v-timeline-item fill-dot icon="mdi-star" color="green lighten-1">
         <new-release-item color="green lighten-1">
           <template v-slot:title>

web/tests/functional/__init__.py

@@ -23,4 +23,7 @@
 REPO_ROOT = os.path.abspath(os.environ['REPO_ROOT'])
 PKG_ROOT = os.path.join(REPO_ROOT, 'build', 'CodeChecker')
 
+os.environ["CC_DATA_FILES_DIR"] = PKG_ROOT
+os.environ["CC_LIB_DIR"] = os.path.join(PKG_ROOT, "lib", "python3")
+
 sys.path.append(os.path.join(PKG_ROOT, 'lib', 'python3'))

web/tests/functional/diff_cmdline/__init__.py

@@ -0,0 +1,8 @@
+# coding=utf-8
+# -------------------------------------------------------------------------
+#
+#  Part of the CodeChecker project, under the Apache License v2.0 with
+#  LLVM Exceptions. See LICENSE for license information.
+#  SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+#
+# -------------------------------------------------------------------------