AI_Assistant/pcbjam
Watch
1
0
Fork
You've already forked pcbjam
 0
Code Issues Pull requests Projects Releases 4 Packages Wiki Activity Actions 2

Reduce KiCad fork divergence with CMake cleanup

Browse source 
- Update kicad submodule: reverted 12 Find*.cmake to upstream,
  deleted FindCURL.cmake (-284 lines, -13 files changed)
- Add GLM_VERSION to build-pcbnew.sh (workaround for KiCad
  overwriting CMAKE_MODULE_PATH)
- Update kicad-diff-stats.sh to compare working tree vs upstream

Fork diff reduced from 81 to 68 files.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Viktor Vaczi 2026-01-05 14:03:03 +01:00
commit 85e0f2f59a
4 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
scripts/kicad-diff-stats.sh
View file

@ -1,8 +1,10 @@
#!/bin/bash
# Show diff statistics between current KiCad HEAD and last upstream commit
# Show diff statistics between current KiCad working tree and last upstream commit
#
# This helps track how far our KiCad fork has diverged from upstream.
# We want to keep changes minimal to ease future porting.
#
# Note: Compares working tree (including uncommitted changes) vs upstream
set -e
@ -81,19 +83,19 @@ OUR_COMMIT_COUNT=$(git rev-list --count "$UPSTREAM_COMMIT"..HEAD)
echo "Our commits on top of upstream: $OUR_COMMIT_COUNT" | tee -a "$LOG_FILE"
echo "" | tee -a "$LOG_FILE"
# Get diff statistics
# Get diff statistics (comparing working tree to upstream)
echo "=== Diff Statistics ===" | tee -a "$LOG_FILE"
echo "" | tee -a "$LOG_FILE"
# Overall stats
DIFF_STAT=$(git diff --stat "$UPSTREAM_COMMIT"..HEAD)
DIFF_SHORTSTAT=$(git diff --shortstat "$UPSTREAM_COMMIT"..HEAD)
# Overall stats - compare working tree to upstream (not HEAD)
DIFF_STAT=$(git diff --stat "$UPSTREAM_COMMIT")
DIFF_SHORTSTAT=$(git diff --shortstat "$UPSTREAM_COMMIT")
echo "Summary: $DIFF_SHORTSTAT" | tee -a "$LOG_FILE"
echo "" | tee -a "$LOG_FILE"
# Detailed breakdown
DIFF_NUMSTAT=$(git diff --numstat "$UPSTREAM_COMMIT"..HEAD)
DIFF_NUMSTAT=$(git diff --numstat "$UPSTREAM_COMMIT")
# Count files by type
TOTAL_FILES=0
@ -155,8 +157,8 @@ echo "" | tee -a "$LOG_FILE"
echo "=== Changed Files ===" | tee -a "$LOG_FILE"
echo "" | tee -a "$LOG_FILE"
# Get list with change type
git diff --name-status "$UPSTREAM_COMMIT"..HEAD | while IFS=$'\t' read -r status filename; do
# Get list with change type (working tree vs upstream)
git diff --name-status "$UPSTREAM_COMMIT" | while IFS=$'\t' read -r status filename; do
case "$status" in
A) status_text="[ADDED] " ;;
M) status_text="[MODIFIED] " ;;