Skip to content

Commit c4f7f8f

Browse files
author
mergetest
committed
Merge PR #222: repo reorg + load-on-demand settings companion (12.1 lane)
The repo root becomes a container holding two addons: DandersFrames (resident) and DandersFrames_Options (## LoadOnDemand: 1, loads on /df). ~25% less memory at login for anyone who never opens the settings panel. Clean auto-merge; the only overlapping file was .github/workflows/release.yml, where the local locale-validation hardening and the PR's path updates combined without conflict — both verified present afterwards. Post-merge checks: both TOCs complete in both directions (90 and 36 entries, zero missing, zero orphans); all 36 companion files bind the parent table correctly via 'local DF = DandersFrames' with none using the companion's own vararg; both TOC versions in step at v5.0.0-alpha.13. ⚠ Local setup change: AddOns/DandersFrames can no longer point at the repo root on this branch. Each install needs two junctions, into DandersFrames/ and DandersFrames_Options/. Remove the old link with 'cmd //c rmdir', never rm -rf — it is a junction and Git Bash follows it into the working tree.
2 parents 0c4ee7f + e0586ad commit c4f7f8f

227 files changed

Lines changed: 38003 additions & 37736 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
DOMINATED=true
3737
for f in $(git diff --name-only HEAD~1..HEAD 2>/dev/null); do
3838
case "$f" in
39-
*.md|*.sh|.github/*|.gitignore|.pkgmeta|Changelog.lua) ;;
39+
*.md|*.sh|.github/*|.gitignore|.pkgmeta|DandersFrames/Core/Changelog.lua|DandersFrames_Options/Changelog.lua) ;;
4040
*) DOMINATED=false; break ;;
4141
esac
4242
done
@@ -57,8 +57,8 @@ jobs:
5757
fi
5858
./generate_changelog.sh
5959
60-
VERSION=$(grep '^## Version:' DandersFrames.toc | sed 's/^## Version: //')
61-
CHANNEL=$(grep 'DF.RELEASE_CHANNEL' Changelog.lua | sed 's/.*= "\(.*\)"/\1/')
60+
VERSION=$(grep '^## Version:' DandersFrames/DandersFrames.toc | sed 's/^## Version: //')
61+
CHANNEL=$(grep 'DF.RELEASE_CHANNEL' DandersFrames/Core/Changelog.lua | sed 's/.*= "\(.*\)"/\1/')
6262
echo "version=$VERSION" >> $GITHUB_OUTPUT
6363
echo "channel=$CHANNEL" >> $GITHUB_OUTPUT
6464

.pkgmeta

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,35 @@
11
package-as: DandersFrames
22
enable-nolib-creation: no
33

4+
# The repo root is a container: it holds the addon folders rather than being
5+
# one. The packager copies the checkout into .release/<package-as>/, so both
6+
# land a level too deep; move-folders lifts them back out to the zip root.
7+
#
8+
# move-folders keys are relative to the working directory and INCLUDE the
9+
# package name as the root; values are relative to the package root. So
10+
# "DandersFrames/DandersFrames: DandersFrames" reads as "the DandersFrames
11+
# folder inside the package dir becomes the top-level DandersFrames" -- it
12+
# looks like it collides with its own parent and does not. This is the
13+
# documented shape for a container repo that ships more than one folder;
14+
# verified against a working example before writing it, after talking myself
15+
# out of it once on the assumption that it would collide.
16+
#
17+
# Everything at the repo root that is not an addon folder is stripped by the
18+
# ignore list below, so the zip contains only the two addon folders.
19+
move-folders:
20+
DandersFrames/DandersFrames: DandersFrames
21+
DandersFrames/DandersFrames_Options: DandersFrames_Options
22+
423
ignore:
524
- CHANGELOG.md
625
- README.md
26+
- TRANSLATING.md
727
- generate_changelog.sh
828
- Tools
929
- .github
1030
- .gitignore
31+
# Editor/tooling metadata (wow-api.json and friends). Nothing reads it at runtime.
32+
- .gitnexus
1133
# Contributor documentation. Tracked in git so it travels with pull requests,
1234
# stripped here so it never reaches the packaged addon users download.
1335
- docs

AuraDesigner/Options.lua

Lines changed: 0 additions & 8997 deletions
This file was deleted.

Changelog.lua

Lines changed: 0 additions & 1498 deletions
This file was deleted.
File renamed without changes.

DandersFrames/AuraDesigner/Migrations.lua

Lines changed: 622 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)