Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,17 @@ CLAUDE.md -> relevant docs -> code

Dependencies: Conan (`conanfile.txt`).

## Branch Convention

- PRs target **`main`** (`gh repo view --json defaultBranchRef`). There is no
`development` branch — earlier docs/state hints may say otherwise; they are
stale.
- The official PlotJuggler plugin collection lives in a separate repo,
`pj-official-plugins` (not bundled here). If you see a local
`pj_ported_plugins/` directory inside this checkout, it's an external repo
you cloned for staging; this build system does not depend on or descend
into it.

## Pre-commit Validation

Before committing, first check whether the code changes require documentation updates. If documentation is stale
Expand Down
6 changes: 0 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ option(
ON
)
option(PJ_BUILD_DATASTORE "Build pj_datastore module (requires nanoarrow)" ON)
option(PJ_BUILD_PORTED_PLUGINS "Build pj_ported_plugins (ported plugins collection)" ON)
option(PJ_BUILD_TESTS "Build tests, benchmarks, and examples" ON)
option(PJ_ENABLE_ABI_CHECK "Enable abidiff-based ABI drift gate (requires libabigail)" OFF)

Expand Down Expand Up @@ -176,11 +175,6 @@ if(PJ_BUILD_DATASTORE)
endif()
add_subdirectory(pj_plugins)

if(PJ_BUILD_PORTED_PLUGINS AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/pj_ported_plugins/CMakeLists.txt")
set(PJ_HAS_PORTED_PLUGINS TRUE)
add_subdirectory(pj_ported_plugins)
endif()

# ---------------------------------------------------------------------------
# plotjuggler_core package install
#
Expand Down
9 changes: 0 additions & 9 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,6 @@ build_config() {
-o "plotjuggler_core/*:with_parquet_example=True" \
"${conan_extra[@]+"${conan_extra[@]}"}"

# Install dependencies from subdirectory conanfiles (e.g. pj_ported_plugins)
for sub_conan in "$SCRIPT_DIR"/pj_ported_plugins/conanfile.txt; do
if [[ -f "$sub_conan" ]]; then
echo "--- Installing deps from $(dirname "$sub_conan") ---"
conan install "$(dirname "$sub_conan")" --output-folder="$build_dir" --build=missing \
-s build_type="$build_type" -s compiler.cppstd=20 \
"${conan_extra[@]+"${conan_extra[@]}"}"
fi
done
cmake -S "$SCRIPT_DIR" -B "$build_dir" \
-DCMAKE_TOOLCHAIN_FILE="$build_dir/conan_toolchain.cmake" \
-DCMAKE_BUILD_TYPE="$build_type" \
Expand Down
1 change: 0 additions & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ def generate(self):
tc.cache_variables["PJ_INSTALL_SDK"] = True
tc.cache_variables["PJ_BUILD_DATASTORE"] = bool(self.options.with_datastore)
tc.cache_variables["PJ_BUILD_TESTS"] = bool(self.options.with_tests)
tc.cache_variables["PJ_BUILD_PORTED_PLUGINS"] = False
tc.cache_variables["PJ_BUILD_PARQUET_IMPORT_EXAMPLE"] = bool(
self.options.with_parquet_example
)
Expand Down
Loading