maint: Cleanup CMake files and delete not compiled files (#3667)

mamba-org · Dec 9, 2024 · 76d06a7 · 76d06a7
1 parent ddc3d40
commit 76d06a7
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 680 deletions.
diff --git a/libmamba/CMakeLists.txt b/libmamba/CMakeLists.txt
@@ -162,8 +162,8 @@ set(
     ${LIBMAMBA_SOURCE_DIR}/util/path_manip.cpp
     ${LIBMAMBA_SOURCE_DIR}/util/random.cpp
     ${LIBMAMBA_SOURCE_DIR}/util/string.cpp
-    ${LIBMAMBA_SOURCE_DIR}/util/url.cpp
     ${LIBMAMBA_SOURCE_DIR}/util/url_manip.cpp
+    ${LIBMAMBA_SOURCE_DIR}/util/url.cpp
     # Implementation of version and matching specs
     ${LIBMAMBA_SOURCE_DIR}/specs/archive.cpp
     ${LIBMAMBA_SOURCE_DIR}/specs/authentication_info.cpp
@@ -178,8 +178,8 @@ set(
     ${LIBMAMBA_SOURCE_DIR}/specs/regex_spec.cpp
     ${LIBMAMBA_SOURCE_DIR}/specs/repo_data.cpp
     ${LIBMAMBA_SOURCE_DIR}/specs/unresolved_channel.cpp
-    ${LIBMAMBA_SOURCE_DIR}/specs/version.cpp
     ${LIBMAMBA_SOURCE_DIR}/specs/version_spec.cpp
+    ${LIBMAMBA_SOURCE_DIR}/specs/version.cpp
     # Solver generic interface
     ${LIBMAMBA_SOURCE_DIR}/solver/helpers.cpp
     ${LIBMAMBA_SOURCE_DIR}/solver/problems_graph.cpp
@@ -192,61 +192,61 @@ set(
     ${LIBMAMBA_SOURCE_DIR}/solver/libsolv/solver.cpp
     ${LIBMAMBA_SOURCE_DIR}/solver/libsolv/unsolvable.cpp
     # Artifacts validation
-    ${LIBMAMBA_SOURCE_DIR}/validation/tools.cpp
     ${LIBMAMBA_SOURCE_DIR}/validation/errors.cpp
     ${LIBMAMBA_SOURCE_DIR}/validation/keys.cpp
-    ${LIBMAMBA_SOURCE_DIR}/validation/update_framework.cpp
+    ${LIBMAMBA_SOURCE_DIR}/validation/repo_checker.cpp
+    ${LIBMAMBA_SOURCE_DIR}/validation/tools.cpp
     ${LIBMAMBA_SOURCE_DIR}/validation/update_framework_v0_6.cpp
     ${LIBMAMBA_SOURCE_DIR}/validation/update_framework_v1.cpp
-    ${LIBMAMBA_SOURCE_DIR}/validation/repo_checker.cpp
+    ${LIBMAMBA_SOURCE_DIR}/validation/update_framework.cpp
     # Downloaders and mirrors
-    ${LIBMAMBA_SOURCE_DIR}/download/compression.hpp
     ${LIBMAMBA_SOURCE_DIR}/download/compression.cpp
-    ${LIBMAMBA_SOURCE_DIR}/download/curl.hpp
+    ${LIBMAMBA_SOURCE_DIR}/download/compression.hpp
     ${LIBMAMBA_SOURCE_DIR}/download/curl.cpp
+    ${LIBMAMBA_SOURCE_DIR}/download/curl.hpp
     ${LIBMAMBA_SOURCE_DIR}/download/downloader_impl.hpp
     ${LIBMAMBA_SOURCE_DIR}/download/downloader.cpp
-    ${LIBMAMBA_SOURCE_DIR}/download/mirror.cpp
-    ${LIBMAMBA_SOURCE_DIR}/download/mirror_map.cpp
-    ${LIBMAMBA_SOURCE_DIR}/download/mirror_impl.hpp
     ${LIBMAMBA_SOURCE_DIR}/download/mirror_impl.cpp
+    ${LIBMAMBA_SOURCE_DIR}/download/mirror_impl.hpp
+    ${LIBMAMBA_SOURCE_DIR}/download/mirror_map.cpp
+    ${LIBMAMBA_SOURCE_DIR}/download/mirror.cpp
     ${LIBMAMBA_SOURCE_DIR}/download/request.cpp
     # Core API (low-level)
-    ${LIBMAMBA_SOURCE_DIR}/core/singletons.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/activation.cpp
-    ${LIBMAMBA_SOURCE_DIR}/core/package_database_loader.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/channel_context.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/context.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/download_progress_bar.cpp
+    ${LIBMAMBA_SOURCE_DIR}/core/env_lockfile.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/environments_manager.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/error_handling.cpp
-    ${LIBMAMBA_SOURCE_DIR}/core/transaction_context.cpp
-    ${LIBMAMBA_SOURCE_DIR}/core/link.cpp
+    ${LIBMAMBA_SOURCE_DIR}/core/execution.cpp
+    ${LIBMAMBA_SOURCE_DIR}/core/fsutil.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/history.cpp
+    ${LIBMAMBA_SOURCE_DIR}/core/link.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/menuinst.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/output.cpp
-    ${LIBMAMBA_SOURCE_DIR}/core/package_handling.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/package_cache.cpp
-    ${LIBMAMBA_SOURCE_DIR}/core/prefix_data.cpp
-    ${LIBMAMBA_SOURCE_DIR}/core/progress_bar.cpp
-    ${LIBMAMBA_SOURCE_DIR}/core/progress_bar_impl.cpp
-    ${LIBMAMBA_SOURCE_DIR}/core/pinning.cpp
+    ${LIBMAMBA_SOURCE_DIR}/core/package_database_loader.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/package_fetcher.cpp
+    ${LIBMAMBA_SOURCE_DIR}/core/package_handling.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/package_paths.cpp
+    ${LIBMAMBA_SOURCE_DIR}/core/pinning.cpp
+    ${LIBMAMBA_SOURCE_DIR}/core/prefix_data.cpp
+    ${LIBMAMBA_SOURCE_DIR}/core/progress_bar_impl.cpp
+    ${LIBMAMBA_SOURCE_DIR}/core/progress_bar.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/query.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/repo_checker_store.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/run.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/shell_init.cpp
+    ${LIBMAMBA_SOURCE_DIR}/core/singletons.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/subdirdata.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/thread_utils.cpp
+    ${LIBMAMBA_SOURCE_DIR}/core/timeref.cpp
+    ${LIBMAMBA_SOURCE_DIR}/core/transaction_context.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/transaction.cpp
-    ${LIBMAMBA_SOURCE_DIR}/core/util.cpp
-    ${LIBMAMBA_SOURCE_DIR}/core/fsutil.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/util_os.cpp
+    ${LIBMAMBA_SOURCE_DIR}/core/util.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/virtual_packages.cpp
-    ${LIBMAMBA_SOURCE_DIR}/core/env_lockfile.cpp
-    ${LIBMAMBA_SOURCE_DIR}/core/execution.cpp
-    ${LIBMAMBA_SOURCE_DIR}/core/timeref.cpp
     # API (high-level)
     ${LIBMAMBA_SOURCE_DIR}/api/c_api.cpp
     ${LIBMAMBA_SOURCE_DIR}/api/channel_loader.cpp
@@ -301,36 +301,38 @@ set(
     ${LIBMAMBA_INCLUDE_DIR}/mamba/util/iterator.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/util/json.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/util/loop_control.hpp
-    ${LIBMAMBA_INCLUDE_DIR}/mamba/util/os.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/util/os_linux.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/util/os_osx.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/util/os_unix.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/util/os_win.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/util/os.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/util/parsers.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/util/path_manip.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/util/random.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/util/string.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/util/tuple_hash.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/util/type_traits.hpp
-    ${LIBMAMBA_INCLUDE_DIR}/mamba/util/url.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/util/url_manip.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/util/url.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/util/variant_cmp.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/util/weakening_map.hpp
     # Implementation of version and matching specs
     ${LIBMAMBA_INCLUDE_DIR}/mamba/specs/archive.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/specs/authentication_info.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/specs/build_number_spec.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/specs/channel.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/specs/chimera_string_spec.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/specs/conda_url.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/specs/error.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/specs/glob_spec.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/specs/match_spec.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/specs/package_info.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/specs/platform.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/specs/regex_spec.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/specs/repo_data.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/specs/unresolved_channel.hpp
-    ${LIBMAMBA_INCLUDE_DIR}/mamba/specs/version.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/specs/version_spec.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/specs/version.hpp
     # Solver generic interface
     ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/problems_graph.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/request.hpp
@@ -342,63 +344,64 @@ set(
     ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/libsolv/solver.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/libsolv/unsolvable.hpp
     # Artifacts validation
-    ${LIBMAMBA_INCLUDE_DIR}/mamba/validation/tools.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/validation/errors.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/validation/keys.hpp
-    ${LIBMAMBA_INCLUDE_DIR}/mamba/validation/update_framework.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/validation/repo_checker.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/validation/tools.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/validation/update_framework_v0_6.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/validation/update_framework_v1.hpp
-    ${LIBMAMBA_INCLUDE_DIR}/mamba/validation/repo_checker.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/validation/update_framework.hpp
     # Downloaders and mirrors
     ${LIBMAMBA_INCLUDE_DIR}/mamba/download/downloader.hpp
-    ${LIBMAMBA_INCLUDE_DIR}/mamba/download/mirror.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/download/mirror_map.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/download/mirror.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/download/request.hpp
     # Core API (low-level)
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/activation.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/channel_context.hpp
-    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/palette.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/common_types.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/context.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/download_progress_bar.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/env_lockfile.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/environments_manager.hpp
-    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/package_database_loader.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/error_handling.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/execution.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/fsutil.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/history.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/invoke.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/link.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/menuinst.hpp
-    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/mirror.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/output.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/package_cache.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/package_database_loader.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/package_fetcher.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/package_handling.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/package_paths.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/palette.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/pinning.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/prefix_data.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/progress_bar.hpp
-    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/pinning.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/query.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/repo_checker_store.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/run.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/shell_init.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/subdirdata.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/tasksync.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/thread_utils.hpp
-    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/transaction.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/timeref.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/transaction_context.hpp
-    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/util.hpp
-    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/fsutil.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/transaction.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/util_os.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/util_scope.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/util.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/virtual_packages.hpp
-    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/env_lockfile.hpp
-    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/tasksync.hpp
-    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/invoke.hpp
-    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/timeref.hpp
     # API (high-level)
     ${LIBMAMBA_INCLUDE_DIR}/mamba/api/c_api.h
     ${LIBMAMBA_INCLUDE_DIR}/mamba/api/channel_loader.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/api/clean.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/api/config.hpp
-    ${LIBMAMBA_INCLUDE_DIR}/mamba/api/configuration.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/api/configuration_impl.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/api/configuration.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/api/constants.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/api/create.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/api/info.hpp

diff --git a/libmamba/ext/solv-cpp/tests/CMakeLists.txt b/libmamba/ext/solv-cpp/tests/CMakeLists.txt
@@ -11,6 +11,7 @@ add_executable(
     src/main.cpp
     src/msvc_catch_string_view.cpp
     src/pool_data.cpp
+    src/pool_data.hpp
     src/test_pool.cpp
     src/test_queue.cpp
     src/test_repo.cpp