unify: Move various identical files to Core#2858
Conversation
|
| Filename | Overview |
|---|---|
| Core/GameEngine/CMakeLists.txt | Uncomments 116 previously disabled header and source entries across Common, GameClient, and GameLogic — the Core-side half of the three-way CMakeLists sync. |
| Generals/Code/GameEngine/CMakeLists.txt | Comments out all 232 entries whose files were deleted; mirrors the Core uncomment and GeneralsMD comment-out operations symmetrically. |
| GeneralsMD/Code/GameEngine/CMakeLists.txt | Comments out all entries whose files were moved to Core; the GeneralsMD source is the origin of the moved files (R100 git renames). |
| scripts/cpp/unify_move_files.py | Adds 116 newly processed unify_file() calls to the historical log (all commented out post-execution); script logic and CMakeLists modification helpers are unchanged. |
| Core/GameEngine/Include/Common/BezFwdIterator.h | Representative moved header — 100% identical rename from GeneralsMD; content and include guards unchanged. |
Flowchart
%%{init: {'theme': 'neutral'}}%%
flowchart TD
A["unify_move_files.py\nunify_file(ZEROHOUR → CORE)"] --> B["Move file from\nGeneralsMD/ to Core/"]
A --> C["Delete duplicate from\nGenerals/"]
A --> D["Comment out entry in\nGeneralsMD/CMakeLists.txt"]
A --> E["Comment out entry in\nGenerals/CMakeLists.txt"]
A --> F["Uncomment entry in\nCore/CMakeLists.txt"]
B --> G["Core/GameEngine/\nInclude + Source"]
C --> H["Generals file removed"]
D --> I["GeneralsMD defers to Core"]
E --> J["Generals defers to Core"]
F --> K["Core now owns file"]
%%{init: {'theme': 'base', 'themeVariables': {"darkMode": true, "background": "#0d1117", "primaryColor": "#21262d", "primaryTextColor": "#e6edf3", "primaryBorderColor": "#8b949e", "lineColor": "#8b949e", "textColor": "#e6edf3", "edgeLabelBackground": "#161b22", "actorBkg": "#21262d", "actorBorder": "#8b949e", "actorTextColor": "#e6edf3", "actorLineColor": "#8b949e", "signalColor": "#8b949e", "signalTextColor": "#e6edf3", "noteBkgColor": "#373320", "noteBorderColor": "#d4a72c", "noteTextColor": "#f0e6c0", "labelBoxBkgColor": "#21262d", "labelBoxBorderColor": "#8b949e", "labelTextColor": "#e6edf3", "loopTextColor": "#e6edf3", "activationBkgColor": "#30363d", "activationBorderColor": "#8b949e"}}}%%
flowchart TD
A["unify_move_files.py\nunify_file(ZEROHOUR → CORE)"] --> B["Move file from\nGeneralsMD/ to Core/"]
A --> C["Delete duplicate from\nGenerals/"]
A --> D["Comment out entry in\nGeneralsMD/CMakeLists.txt"]
A --> E["Comment out entry in\nGenerals/CMakeLists.txt"]
A --> F["Uncomment entry in\nCore/CMakeLists.txt"]
B --> G["Core/GameEngine/\nInclude + Source"]
C --> H["Generals file removed"]
D --> I["GeneralsMD defers to Core"]
E --> J["Generals defers to Core"]
F --> K["Core now owns file"]
Reviews (2): Last reviewed commit: "unify: Move various identical files to C..." | Re-trigger Greptile
5921b5c to
390e5d8
Compare
|
We had such mass move pulls opened in the past but always closed them. The concern is that it creates mass merge conflicts on other branches and adds more compile errors in Generals before ZH is replicated. Generally it is good to first merge select files, and then move a collection of related files to Core. So for example merge all Control Bar files, then move all of them to Core. This is how we did it until now. |
Moves 232 identical files (header only changes) to Core. Checked that these are .cpp/.h pairs.
For review I used this PowerShell one-liner to check the diff of all files:
This looks at all deleted files in current PR (which are from Generals), rewrites those paths to GeneralsMD, then does a diff of those files on the main branch, then puts all the diffs in a single txt file.