Skip to content

Commit

Permalink
Merge pull request #4978 from MCGallaspy/makefile-bettering
Browse files Browse the repository at this point in the history
Do one-pass finds in Makefile
  • Loading branch information
benjaoming committed Mar 23, 2016
2 parents d4d09a8 + b7a47ae commit f4ac347
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,10 @@ clean-build:
rm -fr dist-packages/
rm -fr dist-packages-temp/
rm -fr kalite/database/templates
find . -name '*.egg-info' -exec rm -fr {} +
find . -name '*.egg' -exec rm -f {} +
find . -regextype posix-extended -regex '.*\.(egg-info|egg)' -exec rm -fr {} +

clean-pyc:
find . -name '*.pyc' -exec rm -f {} +
find . -name '*.pyo' -exec rm -f {} +
find . -name '*~' -exec rm -f {} +
find . -name '__pycache__' -exec rm -fr {} +
find . -regextype posix-extended -regex '.*\.(pyc|pyo|~|__pycache__)' -exec rm -fr {} +

clean-test:
rm -fr .tox/
Expand Down

2 comments on commit f4ac347

@cpauya
Copy link
Contributor

@cpauya cpauya commented on f4ac347 Mar 23, 2016

Choose a reason for hiding this comment

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

Hi @benjaoming - these merged changes to the 0.16.x branch caused a failing build on our Bamboo server for the OS X installer for 0.16.x. Here are the logs on Bamboo: http://dungeon.learningequality.org/browse/KL-MT16-98/log

Found this as the possible solution (aside from reverting the merge): http://stackoverflow.com/questions/25094004/extended-posix-utilities-using-command-find-on-mac-os-x#27083611

I'm unsure of what to do on my part so I'm leaving this comment in case one of you guys can help.

/cc: @MCGallaspy @aronasorman

@aronasorman
Copy link
Collaborator

Choose a reason for hiding this comment

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

Are these just simplifications of the multiline find commands? Let's revert this if so.

Please sign in to comment.