New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Refactor]: Move sources into subdirectories #2119

Merged

Caellian merged 2 commits into main from dev/move-files

Jan 5, 2025

Collaborator

Caellian commented Dec 16, 2024 •

edited

Loading

A refactor that moves sources from src/ directory into appropriate subdirectories.

This PR contains no changes to conky functionality.

I wanted to do this ever since my first commit 😆, but yeah, I feel like the src/ directory is too crowded and very difficult to navigate. To the extent that it takes me a minute of scrolling sometimes before I can find the source file I'm looking for - and I'm familiar with this project.

When I first started I remember having to navigate though include statements.

TODO

Rename files in a separate commit
Fix build files and include statements

Caellian added the enhancement label

github-actions bot added the sources label

netlify bot commented Dec 16, 2024 •

edited

Loading

✅ Deploy Preview for conkyweb canceled.

Name	Link
🔨 Latest commit	`050e965`
🔍 Latest deploy log	https://app.netlify.com/sites/conkyweb/deploys/677aa8613f741a000873b2d2

Caellian force-pushed the dev/move-files branch from 5042138 to f6efceb Compare

December 16, 2024 07:01

Collaborator Author

Caellian commented Dec 16, 2024 •

edited

Loading

@brndnmtthws can you please confirm whether I should continue with this PR?

I made sure to separate commit with renames so this PR can be hidden in .git-blame-ignore-revs and rebasing should work out well for other active PRs?

The only important thing is that you'd need to merge the commits without squashing because squashing them will make git fumble renames - I will have to modify files to update imports. I'll make sure there's only 2 to keep the main branch history clean.

Caellian added a commit that referenced this pull request


          Move sources into appropriate subdirectories (#2119)

0499a7e

Part 1 of refactor commit. This commit only renames the files to
preserve git history.

Signed-off-by: Tin Švagelj <[email protected]>

Caellian force-pushed the dev/move-files branch from f6efceb to 0499a7e Compare

December 16, 2024 07:12

Caellian added a commit that referenced this pull request


          Move sources into appropriate subdirectories (#2119)

ef6feef

Part 1 of refactor commit. This commit only renames the files to
preserve git history.

Signed-off-by: Tin Švagelj <[email protected]>

Caellian force-pushed the dev/move-files branch from 0499a7e to ef6feef Compare

December 16, 2024 07:13

Caellian added a commit that referenced this pull request


          Fix build and includes after moving sources (#2119)

9db9e57

This is part 2 of #2119. The parent commit (ef6feef) only moved files
to retain their correct history, this commit fixes all the includes and
build files.

Signed-off-by: Tin Švagelj <[email protected]>

Caellian requested a review from brndnmtthws

December 16, 2024 07:18

brndnmtthws approved these changes

View reviewed changes

Owner

brndnmtthws left a comment

This is a good idea! Really cleans things up.

Caellian added a commit that referenced this pull request


          Move sources into appropriate subdirectories (#2119)

6a27b1a

Part 1 of refactor commit. This commit only renames the files to
preserve git history.

Signed-off-by: Tin Švagelj <[email protected]>

Caellian added a commit that referenced this pull request


          Fix build and includes after moving sources (#2119)

f9c2b43

This is part 2 of #2119. The parent commit (ef6feef) only moved files
to retain their correct history, this commit fixes all the includes and
build files.

Signed-off-by: Tin Švagelj <[email protected]>

Caellian force-pushed the dev/move-files branch from 9db9e57 to f9c2b43 Compare

January 5, 2025 06:09

Caellian added a commit that referenced this pull request


          Fix build and includes after moving sources (#2119)

a96ee5f

This is part 2 of #2119. The parent commit (ef6feef) only moved files
to retain their correct history, this commit fixes all the includes and
build files.

Signed-off-by: Tin Švagelj <[email protected]>

Caellian force-pushed the dev/move-files branch from f9c2b43 to a96ee5f Compare

January 5, 2025 06:37

github-actions bot added the build system label

Caellian added a commit that referenced this pull request


          Fix build and includes after moving sources (#2119)

528a9e9

This is part 2 of #2119. The parent commit (ef6feef) only moved files
to retain their correct history, this commit fixes all the includes and
build files.

Signed-off-by: Tin Švagelj <[email protected]>

Caellian force-pushed the dev/move-files branch from a96ee5f to 528a9e9 Compare

January 5, 2025 07:18

Caellian added a commit that referenced this pull request


          Fix build and includes after moving sources (#2119)

6baa86a

This is part 2 of #2119. The parent commit (ef6feef) only moved files
to retain their correct history, this commit fixes all the includes and
build files.

Signed-off-by: Tin Švagelj <[email protected]>

Caellian force-pushed the dev/move-files branch from 528a9e9 to 6baa86a Compare

January 5, 2025 13:37

github-actions bot added tests mouse events labels

Caellian added a commit that referenced this pull request


          Fix build and includes after moving sources (#2119)

8df4595

This is part 2 of #2119. The parent commit (ef6feef) only moved files
to retain their correct history, this commit fixes all the includes and
build files.

Signed-off-by: Tin Švagelj <[email protected]>

Caellian force-pushed the dev/move-files branch from 6baa86a to 8df4595 Compare

January 5, 2025 14:21

Caellian added a commit that referenced this pull request


          Fix build and includes after moving sources (#2119)

041d86e

This is part 2 of #2119. The parent commit (ef6feef) only moved files
to retain their correct history, this commit fixes all the includes and
build files.

Signed-off-by: Tin Švagelj <[email protected]>

Caellian force-pushed the dev/move-files branch from 8df4595 to 041d86e Compare

January 5, 2025 14:26

Caellian added a commit that referenced this pull request


          Fix build and includes after moving sources (#2119)

949beb2

This is part 2 of #2119. The parent commit (ef6feef) only moved files
to retain their correct history, this commit fixes all the includes and
build files.

Signed-off-by: Tin Švagelj <[email protected]>

Caellian force-pushed the dev/move-files branch from 041d86e to 949beb2 Compare

January 5, 2025 14:28

Caellian added a commit that referenced this pull request


          Fix build and includes after moving sources (#2119)

1503add

This is part 2 of #2119. The parent commit (ef6feef) only moved files
to retain their correct history, this commit fixes all the includes and
build files.

Signed-off-by: Tin Švagelj <[email protected]>

Caellian force-pushed the dev/move-files branch from 949beb2 to 1503add Compare

January 5, 2025 14:32

Caellian added a commit that referenced this pull request


          Fix build and includes after moving sources (#2119)

0ef870b

This is part 2 of #2119. The parent commit (ef6feef) only moved files
to retain their correct history, this commit fixes all the includes and
build files.

Signed-off-by: Tin Švagelj <[email protected]>

Caellian force-pushed the dev/move-files branch from 1503add to 0ef870b Compare

January 5, 2025 14:34

Caellian added a commit that referenced this pull request


          Fix build and includes after moving sources (#2119)

5beaa64

This is part 2 of #2119. The parent commit (ef6feef) only moved files
to retain their correct history, this commit fixes all the includes and
build files.

Signed-off-by: Tin Švagelj <[email protected]>

Caellian force-pushed the dev/move-files branch from 0ef870b to 5beaa64 Compare

January 5, 2025 14:38

Caellian added a commit that referenced this pull request


          Fix build and includes after moving sources (#2119)

97e568f

This is part 2 of #2119. The parent commit (ef6feef) only moved files
to retain their correct history, this commit fixes all the includes and
build files.

Signed-off-by: Tin Švagelj <[email protected]>

Caellian force-pushed the dev/move-files branch from 5beaa64 to 97e568f Compare

January 5, 2025 14:39

Caellian added a commit that referenced this pull request


          Move sources into appropriate subdirectories (#2119)

c3ff1a7

Part 1 of refactor commit. This commit only renames the files to
preserve git history.

Signed-off-by: Tin Švagelj <[email protected]>

Caellian added a commit that referenced this pull request


          Fix build and includes after moving sources (#2119)

1829c4a

This is part 2 of #2119. The parent commit (c3ff1a7) only moved files
to retain their correct history, this commit fixes all the includes and
build files.

Signed-off-by: Tin Švagelj <[email protected]>

Caellian force-pushed the dev/move-files branch from 97e568f to 1829c4a Compare

January 5, 2025 15:16

github-actions bot removed the mouse events label


          Move sources into appropriate subdirectories (#2119)

916d416

Part 1 of refactor commit. This commit only renames the files to
preserve git history.

Signed-off-by: Tin Švagelj <[email protected]>

Caellian force-pushed the dev/move-files branch from 1829c4a to 0e653fd Compare

January 5, 2025 15:26

Caellian added a commit that referenced this pull request


          Fix build and includes after moving sources (#2119)

0e653fd

This is part 2 of #2119. The parent commit (916d416) only moved files
to retain their correct history, this commit fixes all the includes and
build files.

Signed-off-by: Tin Švagelj <[email protected]>

Collaborator Author

Caellian commented Jan 5, 2025

Tested all include path with a script, it only yells out generated headers and library includes, so this should be good to go.


          Fix build and includes after moving sources (#2119)

050e965

This is part 2 of #2119. The parent commit only moved files to retain
their correct history, this commit fixes all the includes and build files.

Signed-off-by: Tin Švagelj <[email protected]>

Caellian force-pushed the dev/move-files branch from 0e653fd to 050e965 Compare

January 5, 2025 15:42

Caellian merged commit ae8f1fa into main

38 checks passed

Caellian added a commit that referenced this pull request


          Move sources into appropriate subdirectories (#2119)

342f07b

Part 1 of refactor commit. This commit only renames the files to
preserve git history.

Signed-off-by: Tin Švagelj <[email protected]>

Caellian deleted the dev/move-files branch

January 5, 2025 15:46

Caellian mentioned this pull request

Update blame ignore & labeler #2133

Merged

Collaborator Author

Caellian commented Jan 5, 2025 •

edited

Loading

I lo-lo-love how GH was like "oh, a commit signature?! how... un_microsofty of you" *throws it in the trash*

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

build system enhancement sources tests