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.

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

Various Makefile improvements #5326

Merged
merged 11 commits into from Mar 18, 2018

Conversation

Projects
None yet
2 participants
@tarsius
Member

tarsius commented Feb 22, 2018

Most importantly make it possible to load a package-build.el that is not located inside the melpa repository, which is very useful when you are working on that library as I currently am.

This is done by adding a LOAD_PATH variable. Also add a LISP_CONFIG variable, which makes it possible to set the various path variables used by package-build. Finally load config.mk if that exists, which provides a convenient way to set the mentioned variables.

And to top if of also some more or less cosmetic changes.

tarsius added some commits Feb 22, 2018

make: do not claim we wrote something if we didn't
If the build failed, then print nothing.

If the build succeeded either because we did a great job or because
there was nothing to be done, then print the list of relevant files
as before.  But prefix that with "Success" instead of "Wrote" because
in the later case we did not actually write those files just now.

Also put the "Success" message on a separate line so that the first
file aligns with the others.
make: do not prefix paths with "./"
Also rearrange the variable definitions a bit.
make: remove unnecessary let-bindings
Variable `package-build-stable' is only relevant when building a
package.  These make targets don't call any elisp that does that.
Setting that variable anyway does no harm, except that the Makefile
becomes less readable due to overlong lines.
make: add new LOAD_PATH variable
That makes it possible to test a development version
of `package-build' without having to first merge it
into this repository.

@purcell purcell merged commit 191ec70 into master Mar 18, 2018

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@purcell

This comment has been minimized.

Member

purcell commented Mar 18, 2018

Thanks - took me a while to get around to looking at this, sorry. Will also follow up with your big package-build refactoring. I'm keen to merge both changes, but just wary of debugging any breaking changes that occur only on the build server.

@tarsius

This comment has been minimized.

Member

tarsius commented Mar 19, 2018

It would have been better to merge this (possibly after rebasing). If there is a bug, then it will be harder now to find it.

@purcell

This comment has been minimized.

Member

purcell commented Mar 19, 2018

Oh, I see - github remembers the squash/merge preference, and I routinely squash PRs here to avoid interim commits while contributors make requested changes to PRs.

If there is a bug, then it will be harder now to find it.

On the flip side, it's easy to revert in case of emergency. Trade-offs, trade-offs! :-)

@tarsius

This comment has been minimized.

Member

tarsius commented Mar 19, 2018

I figured that's what happened 😉

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