clean(conan): fix pre-commit

Author: jusito-iem

.pre-commit-config.yaml

@@ -5,7 +5,9 @@ repos:
     rev: v4.3.0
     hooks:
     -   id: trailing-whitespace
+        exclude: "^.*\\.patch$"
     -   id: end-of-file-fixer
+        exclude: "^.*\\.patch$"
     -   id: check-yaml
     -   id: check-added-large-files
     -   id: requirements-txt-fixer

cmake/phasar_macros.cmake

@@ -68,17 +68,17 @@ function(generate_ll_file)
     message(STATUS "HINTS to find clang/clang++/opt: ${binary_hint_paths}")
 
     if ("${CMAKE_VERSION}" VERSION_LESS "3.25") # VALIDATOR requires it
-      
+
       find_program(clang REQUIRED
         NAMES clang-14 clang
         HINTS ${binary_hint_paths})
       find_program(clangcpp REQUIRED
-        NAMES clang++ 
+        NAMES clang++
         HINTS ${binary_hint_paths})
       find_program(opt REQUIRED
         NAMES opt
         HINTS ${binary_hint_paths})
-        
+
       set(IS_VALID_VERSION "")
       validate_binary_version("IS_VALID_VERSION" "${clang}")
       if (NOT "${IS_VALID_VERSION}")
@@ -99,8 +99,8 @@ function(generate_ll_file)
         VALIDATOR validate_binary_version)
       message(STATUS "found clang binary in \"${clang}\"")
       find_program(clangcpp REQUIRED
-        NAMES clang++ 
-        HINTS ${binary_hint_paths} 
+        NAMES clang++
+        HINTS ${binary_hint_paths}
         VALIDATOR validate_binary_version)
       message(STATUS "found clang binary in \"${clangpp}\"")
       find_program(opt REQUIRED

conanfile.py

@@ -118,14 +118,14 @@ class PhasarRecipe(ConanFile):
     # Binary configuration
     settings = "os", "compiler", "build_type", "arch"
     options = {
-        "with_z3": [True, False], 
-        "shared": [True, False], 
+        "with_z3": [True, False],
+        "shared": [True, False],
         "fPIC": [True, False],
         "tests": [True, False],
     }
     default_options = {
-        "with_z3": True, 
-        "shared": False, 
+        "with_z3": True,
+        "shared": False,
         "fPIC": True,
         "tests": False,
     }
@@ -141,7 +141,7 @@ def _parse_gitignore(self, folder, additional_exclusions = [], invert=False):
                     inclusions = f"!{exc}"
         else:
             exclusions = additional_exclusions
-        
+
         with open(f'{folder}/.gitignore', 'r') as file:
             for line in file:
                 line = line.strip()
@@ -154,18 +154,18 @@ def _parse_gitignore(self, folder, additional_exclusions = [], invert=False):
                         inclusions.append("!" + line)
                 else:
                     exclusions.append(line)
-        
+
         if invert:
             return inclusions
         else:
             return exclusions
 
     def export_sources(self):
         exclusions = self._parse_gitignore(".", [
-            "test_package", 
-            "utils", 
-            "img", 
-            "githooks", 
+            "test_package",
+            "utils",
+            "img",
+            "githooks",
             "external"
         ])
 
@@ -185,7 +185,7 @@ def _info_file(self):
         if self.export_folder is None:
             return None
         return PurePosixPath(self.export_folder) / "info.json"
-    
+
     def _read_info(self):
         if self._info_file is not None and exists(self._info_file):
             with open(self._info_file, encoding="utf-8") as fp:
@@ -194,12 +194,12 @@ def _read_info(self):
             return {
                 "version": None,
             }
-        
+
     def _write_info(self, info):
         if self._info_file is not None:
             with open(self._info_file, "w", encoding="utf-8") as fp:
                 json.dump(info, fp, indent=2)
-    
+
     def set_version(self):
         if self.version is not None:
             return
@@ -240,14 +240,14 @@ def requirements(self):
             self.requires("z3/[>=4.7.1 <5]")
             llvm_options["with_z3"] = True
         self.requires("llvm-core/14.0.6@secure-software-engineering", transitive_libs=True, transitive_headers=True, options=llvm_options)
-    
+
     def build_requirements(self):
         self.tool_requires("cmake/[>=3.25.0 <4.0.0]") # find_program validator
         self.tool_requires("ninja/[>=1.9.0 <2.0.0]")
         if self.options.tests:
             self.test_requires("openssl/[>2 <4]")
             self.test_requires("gtest/1.14.0")
-    
+
     def configure(self):
         if self.options.shared:
             self.options.rm_safe("fPIC")
@@ -282,7 +282,7 @@ def _cmake_configure(self):
             ]
         )
         return cmake
-    
+
     def _handle_graphviz(self):
         exclude_patterns = [
             "LLVMTableGenGlobalISel.*",
@@ -322,7 +322,7 @@ def _write_build_info(self):
         # maybe process original config
         cmake_config = Path(self.package_folder / self._cmake_module_path / "phasarConfig.cmake").read_text("utf-8")
         components = components_from_dotfile(load(self, self._graphviz_file))
-        
+
         build_info = {
             "components": components,
         }
@@ -341,7 +341,7 @@ def package_id(self):
 
     def package(self):
         copy(self, "LICENSE.txt", self.source_folder, join(self.package_folder, "licenses"))
-        
+
         cmake = self._cmake_configure()
         cmake.install()
         rm(self, "phasarConfig*.cmake", join("lib", "cmake", "phasar"))
@@ -359,7 +359,6 @@ def package_info(self):
 
         for component_name, data in components.items():
             self.cpp_info.components[component_name].set_property("cmake_target_name", component_name)
-            self.cpp_info.components[component_name].libs = [component_name] if component_name not in interfaces else [] 
+            self.cpp_info.components[component_name].libs = [component_name] if component_name not in interfaces else []
             self.cpp_info.components[component_name].requires = data["requires"]
             self.cpp_info.components[component_name].system_libs = data["system_libs"]
-    

utils/conan/clang/conanfile.py

@@ -60,7 +60,7 @@ def _compilers_minimum_version(self):
             "msvc": "191",
             "Visual Studio": "15",
         }
-    
+
     def export_sources(self):
         export_conandata_patches(self)
 

utils/conan/clang/test_package/test_package.cpp

@@ -1,4 +1,5 @@
-// A basic clang libtooling example from https://clang.llvm.org/docs/LibTooling.html
+// A basic clang libtooling example from
+// https://clang.llvm.org/docs/LibTooling.html
 
 // Declares clang::SyntaxOnlyAction.
 #include "clang/Frontend/FrontendActions.h"
@@ -28,7 +29,7 @@ int main(int argc, const char **argv) {
     llvm::errs() << ExpectedParser.takeError();
     return 1;
   }
-  CommonOptionsParser& OptionsParser = ExpectedParser.get();
+  CommonOptionsParser &OptionsParser = ExpectedParser.get();
   ClangTool Tool(OptionsParser.getCompilations(),
                  OptionsParser.getSourcePathList());
   return Tool.run(newFrontendActionFactory<clang::SyntaxOnlyAction>().get());

utils/conan/llvm-core/conanfile.py

@@ -131,7 +131,7 @@ def _compilers_minimum_version(self):
             "msvc": "191",
             "Visual Studio": "15",
         }
-        
+
     def export_sources(self):
         export_conandata_patches(self)
 

utils/conan/llvm-core/test_package/test_package.cpp

@@ -1,38 +1,32 @@
-#include <llvm/ExecutionEngine/Interpreter.h>
-#include <llvm/ExecutionEngine/GenericValue.h>
+#include <memory>
+
 #include <llvm/ExecutionEngine/ExecutionEngine.h>
-#include <llvm/IRReader/IRReader.h>
+#include <llvm/ExecutionEngine/GenericValue.h>
+#include <llvm/ExecutionEngine/Interpreter.h>
 #include <llvm/IR/LLVMContext.h>
-#include <llvm/Support/TargetSelect.h>
+#include <llvm/IRReader/IRReader.h>
 #include <llvm/Support/SourceMgr.h>
+#include <llvm/Support/TargetSelect.h>
 
-#include <memory>
-
-
-int main(int argc, char const* argv[]) {
-    if (argc < 2)
-        return 0;
+int main(int argc, char const *argv[]) {
+  if (argc < 2)
+    return 0;
 
-    llvm::InitializeNativeTarget();
-    llvm::SMDiagnostic smd;
-    llvm::LLVMContext context;
-    std::string error;
+  llvm::InitializeNativeTarget();
+  llvm::SMDiagnostic smd;
+  llvm::LLVMContext context;
+  std::string error;
 
-    llvm::EngineBuilder engine_builder{
-        llvm::parseIRFile(argv[1], smd, context)
-    };
-    engine_builder.setEngineKind(llvm::EngineKind::Interpreter);
-    engine_builder.setErrorStr(&error);
+  llvm::EngineBuilder engine_builder{llvm::parseIRFile(argv[1], smd, context)};
+  engine_builder.setEngineKind(llvm::EngineKind::Interpreter);
+  engine_builder.setErrorStr(&error);
 
-    auto execution_engine = std::unique_ptr<llvm::ExecutionEngine>(
-        engine_builder.create()
-    );
-    execution_engine->runStaticConstructorsDestructors(false);
+  auto execution_engine =
+      std::unique_ptr<llvm::ExecutionEngine>(engine_builder.create());
+  execution_engine->runStaticConstructorsDestructors(false);
 
-    auto test_function = execution_engine->FindFunctionNamed("test");
-    auto result = execution_engine->runFunction(
-        test_function,
-        llvm::ArrayRef<llvm::GenericValue>()
-    );
-    return result.IntVal.getSExtValue();
+  auto test_function = execution_engine->FindFunctionNamed("test");
+  auto result = execution_engine->runFunction(
+      test_function, llvm::ArrayRef<llvm::GenericValue>());
+  return result.IntVal.getSExtValue();
 }

utils/conan/test_conan_build.sh

@@ -5,10 +5,10 @@ set -euo pipefail
 (
     cd "$(dirname "$0")"
     cd ../..
-    conan create . --version dev --build=missing -s build_type=RelWithDebInfo 
+    conan create . --version dev --build=missing -s build_type=RelWithDebInfo
     cd test_package/build/
     mkdir -p Debug/generators
     cd Debug/generators
     conan install -of . --requires phasar/dev --build=missing -s build_type=Release -g VirtualRunEnv -g CMakeDeps
     conan install -of . --requires phasar/dev --build=missing -s build_type=Debug -g VirtualRunEnv -g CMakeDeps
-)
+)