chore: 🔧 fork-cleanup tooling + bump kicad submodule
- kicad → a2c634f2: drop redundant wasm guards, restore upstream (modified upstream files 95→86, churn 3180→3104) - kicad-diff-stats.sh: fix fork-point detection (add missing commit authors + an @emergence-engineering.com domain net) so it reports the real divergence instead of 0 - build-kicad-target.sh: drop dead -DKICAD_PCM and -DBUILD_GITHUB_PLUGIN flags (not options in this KiCad version); keep -DKICAD_SPICE=OFF, which is read by wasm/cmake/Findngspice.cmake Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
cee569dc5d
commit
fdfabea6c8
3 changed files with 25 additions and 5 deletions
2
kicad
2
kicad
|
|
@ -1 +1 @@
|
||||||
Subproject commit c77a4aff28cc4710f773bf0284c8ad2e4732895a
|
Subproject commit a2c634f2f5f061ce13dc09fae3801c618f2a9f81
|
||||||
|
|
@ -20,12 +20,27 @@ mkdir -p "$LOGS_DIR"
|
||||||
TIMESTAMP="$(date +%Y%m%d-%H%M%S)"
|
TIMESTAMP="$(date +%Y%m%d-%H%M%S)"
|
||||||
LOG_FILE="$LOGS_DIR/${TIMESTAMP}.log"
|
LOG_FILE="$LOGS_DIR/${TIMESTAMP}.log"
|
||||||
|
|
||||||
# Our commit authors (add more if needed)
|
# Our commit authors (add more if needed).
|
||||||
|
# NOTE: every author whose commits land on top of the upstream base must be
|
||||||
|
# listed here (or be matched by OUR_DOMAINS below). If one is missing, the
|
||||||
|
# upstream-base detection loop stops early on that author's commit and the
|
||||||
|
# divergence is drastically under-counted.
|
||||||
OUR_AUTHORS=(
|
OUR_AUTHORS=(
|
||||||
"viktor.vaczi@emergence-engineering.com"
|
"viktor.vaczi@emergence-engineering.com"
|
||||||
|
"balint.ipkovich@emergence-engineering.com"
|
||||||
|
"torcsvari.gergo@gmail.com"
|
||||||
|
"119620946+matejcsok-ee@users.noreply.github.com"
|
||||||
"noreply@anthropic.com"
|
"noreply@anthropic.com"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Any commit whose author email ends with one of these domains is treated as
|
||||||
|
# ours too — a safety net so new emergence contributors don't silently break
|
||||||
|
# the count. Contributors using gmail/github-noreply addresses must still be
|
||||||
|
# listed explicitly in OUR_AUTHORS above.
|
||||||
|
OUR_DOMAINS=(
|
||||||
|
"@emergence-engineering.com"
|
||||||
|
)
|
||||||
|
|
||||||
echo "=== KiCad Fork Diff Statistics ===" | tee "$LOG_FILE"
|
echo "=== KiCad Fork Diff Statistics ===" | tee "$LOG_FILE"
|
||||||
echo "Generated: $(date)" | tee -a "$LOG_FILE"
|
echo "Generated: $(date)" | tee -a "$LOG_FILE"
|
||||||
echo "" | tee -a "$LOG_FILE"
|
echo "" | tee -a "$LOG_FILE"
|
||||||
|
|
@ -54,6 +69,14 @@ while read -r commit_hash author_email; do
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
if [ "$is_ours" = false ]; then
|
||||||
|
for our_domain in "${OUR_DOMAINS[@]}"; do
|
||||||
|
if [[ "$author_email" == *"$our_domain" ]]; then
|
||||||
|
is_ours=true
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
if [ "$is_ours" = false ]; then
|
if [ "$is_ours" = false ]; then
|
||||||
UPSTREAM_COMMIT="$commit_hash"
|
UPSTREAM_COMMIT="$commit_hash"
|
||||||
UPSTREAM_AUTHOR="$author_email"
|
UPSTREAM_AUTHOR="$author_email"
|
||||||
|
|
|
||||||
|
|
@ -451,9 +451,6 @@ emcmake cmake "${KICAD_DIR}" \
|
||||||
-DODBC_LINK_FLAGS:STRING="" \
|
-DODBC_LINK_FLAGS:STRING="" \
|
||||||
-DODBC_LIBRARIES:STRING="" \
|
-DODBC_LIBRARIES:STRING="" \
|
||||||
\
|
\
|
||||||
-DBUILD_GITHUB_PLUGIN=OFF \
|
|
||||||
-DKICAD_PCM=OFF \
|
|
||||||
\
|
|
||||||
-DHAVE_STRCASECMP=1 \
|
-DHAVE_STRCASECMP=1 \
|
||||||
-DHAVE_STRNCASECMP=1
|
-DHAVE_STRNCASECMP=1
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue