Skip to content
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

Remove deprecated QUANTUM_DIR code blocks from makefiles #4754

Merged
merged 5 commits into from
Jan 4, 2019
Merged

Remove deprecated QUANTUM_DIR code blocks from makefiles #4754

merged 5 commits into from
Jan 4, 2019

Conversation

noroadsleft
Copy link
Member

Description

This PR will remove the

 ifndef QUANTUM_DIR
   include ../../../../Makefile
 endif

code blocks from nearly the entire repository.

Please Advise:

I haven't touched any of the instances in /users/ or /layouts/ because I wasn't sure if that was appropriate to do, though I'm willing to do so if it's desired.

I also debated deleting the edited makefiles that are now empty, though I thought that might be more disorienting should an affected user update their files, versus just leaving the empty file in place.

Commit Log

Remove QUANTUM_DIR code blocks from keyboard rules (20c9233)

This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files that affect entire keyboards.

remove QUANTUM_DIR code blocks from rules for default keymaps (9ec68b9)

This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files that affect default keymaps.

remove QUANTUM_DIR code blocks from rules for user keymaps (7a63220)

This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files that affect "user" keymaps. (It's actually any keymap
that isn't named default.)

@noroadsleft
Copy link
Member Author

Files edited by this PR:

files_edited_on_branch.txt

@noroadsleft
Copy link
Member Author

Weirdness I Found:

The rules.mk file for @ishtob's Planck keymap is actually named rule.mk. Similarly, the same file for @That-Canadian's Preonic keymap is named Makefile. Jack actually advised That-Canadian to rename the file when it was submitted, but that never happened.

I bring this up because I believe that the filenames mean that the corresponding keymaps don't actually compile as intended. I can rename them, but it may break other things; in fact, ishtob's keymap fails to compile for me locally if I rename it (using make planck/rev5:ishtob).

@drashna
Copy link
Member

drashna commented Dec 31, 2018

Removing them from layouts and user space should be fine.

As for renaming, I'd say leave it

@noroadsleft
Copy link
Member Author

noroadsleft commented Dec 31, 2018 •
edited
Loading

@drashna

Travis CI error seems to be with your JJ50 keymap (which doesn't exist in my branch; is this a new change?) being too large.

I'll update the Userspace and Layouts files shortly.

@noroadsleft
Copy link
Member Author

Done.

Files edited by the last two commits:

- 05528be
  - layouts/community/ergodox/berfarah/rules.mk
  - layouts/community/ortho_4x12/grahampheath/rules.mk
  - layouts/community/ortho_4x12/xyverz/rules.mk

- 6e61e2f
  - users/losinggeneration/rules.mk

@drashna
Copy link
Member

drashna commented Jan 2, 2019

I don't actually have a jj50 board, but I do have a layout that supports it. :D

drashna
drashna approved these changes Jan 2, 2019
View reviewed changes
Copy link
Member

@drashna drashna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

vomindoraan
vomindoraan suggested changes Jan 3, 2019
View reviewed changes
Copy link
Contributor

@vomindoraan vomindoraan left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't gone through all the files (for obvious reasons), but overall it LGTM.

@noroadsleft
Copy link
Member Author

I'll fix the merge conflicts. Just getting set up at home again after being out of town for two weeks.

Being on a 1080p screen is nice after two weeks of 1024x600. ☺️

@noroadsleft
Remove QUANTUM_DIR code blocks from keyboard rules
b9ecfe4 
This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files that affect entire keyboards.
@noroadsleft
remove QUANTUM_DIR code blocks from rules for default keymaps
b4216aa 
This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files that affect default keymaps.
@noroadsleft
remove QUANTUM_DIR code blocks from rules for user keymaps
58e6548 
This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files that affect "user" keymaps. (It's actually any keymap
that isn't named `default`.)
@noroadsleft
remove QUANTUM_DIR code blocks from rules for community layouts
56d18e7 
This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files for community layouts.
@noroadsleft
remove QUANTUM_DIR code blocks from rules for userspaces
80a1df9 
This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files for userspaces.
mechmerlin
mechmerlin approved these changes Jan 4, 2019
View reviewed changes
Copy link
Contributor

@mechmerlin mechmerlin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great!

@mechmerlin mechmerlin merged commit 7f4f0f7 into qmk:master Jan 4, 2019
@noroadsleft noroadsleft deleted the quantum_dir_cleanup branch January 4, 2019 17:38
rseymour pushed a commit to rseymour/qmk_firmware that referenced this pull request Mar 13, 2019
@noroadsleft @rseymour
Remove deprecated QUANTUM_DIR code blocks from makefiles (qmk#4754)
a2f4808 
* Remove QUANTUM_DIR code blocks from keyboard rules

This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files that affect entire keyboards.

* remove QUANTUM_DIR code blocks from rules for default keymaps

This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files that affect default keymaps.

* remove QUANTUM_DIR code blocks from rules for user keymaps

This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files that affect "user" keymaps. (It's actually any keymap
that isn't named `default`.)

* remove QUANTUM_DIR code blocks from rules for community layouts

This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files for community layouts.

* remove QUANTUM_DIR code blocks from rules for userspaces

This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files for userspaces.
djthread pushed a commit to djthread/qmk_firmware that referenced this pull request Mar 17, 2019
@noroadsleft @djthread
Remove deprecated QUANTUM_DIR code blocks from makefiles (qmk#4754)
1651e0e 
* Remove QUANTUM_DIR code blocks from keyboard rules

This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files that affect entire keyboards.

* remove QUANTUM_DIR code blocks from rules for default keymaps

This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files that affect default keymaps.

* remove QUANTUM_DIR code blocks from rules for user keymaps

This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files that affect "user" keymaps. (It's actually any keymap
that isn't named `default`.)

* remove QUANTUM_DIR code blocks from rules for community layouts

This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files for community layouts.

* remove QUANTUM_DIR code blocks from rules for userspaces

This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files for userspaces.
dlhextall pushed a commit to dlhextall/qmk_firmware that referenced this pull request May 24, 2019
@noroadsleft
Remove deprecated QUANTUM_DIR code blocks from makefiles (qmk#4754)
02ca280 
* Remove QUANTUM_DIR code blocks from keyboard rules

This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files that affect entire keyboards.

* remove QUANTUM_DIR code blocks from rules for default keymaps

This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files that affect default keymaps.

* remove QUANTUM_DIR code blocks from rules for user keymaps

This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files that affect "user" keymaps. (It's actually any keymap
that isn't named `default`.)

* remove QUANTUM_DIR code blocks from rules for community layouts

This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files for community layouts.

* remove QUANTUM_DIR code blocks from rules for userspaces

This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files for userspaces.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mechmerlin mechmerlin mechmerlin approved these changes

@drashna drashna drashna approved these changes

@vomindoraan vomindoraan vomindoraan approved these changes

@jackhumbert jackhumbert jackhumbert approved these changes

@skullydazed skullydazed Awaiting requested review from skullydazed

@ezuk ezuk Awaiting requested review from ezuk

@fredizzimo fredizzimo Awaiting requested review from fredizzimo

Assignees
No one assigned
Labels
optimization
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@noroadsleft @drashna @jackhumbert @vomindoraan @mechmerlin