aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJonas Bernoulli <jonas@bernoul.li>2013-07-19 18:55:32 +0200
committerJonas Bernoulli <jonas@bernoul.li>2013-07-20 14:39:51 +0200
commitafb15b75ed897c47c18da049545ff03be065a7ec (patch)
tree04e2b555d4a20ba385f59e02b4f211ab1a764d3f /.gitignore
parent69ece2ae5e964f7aaa91b0daf62b61469d73a995 (diff)
improve version detection and build process
* Add new function `magit-version' which is called late when loading `magit.el' and sets the value of variable `magit-version'. * Use function `magit-version' in the `Makefile' instead of the old messy code used to set the version. * Improve the `Makefile'. It doesn't modify itself anymore. Contains a `help' target. etc. Generally it is much cleaner now. * Fix and improve `tests/magit-tests.el'. It now even works when travis is under high load. * Remove `tests/run-tests.el'. Use `make test'. Interactive tests will come back as a separate make target. * Remove `magit-pkg.el.in'. Instead generate `magit-pkg.el' only when creating the marmalade tarball. Elsewhere that file is not needed (including melpa). * Remove `magit.spec.in'. It is neither used by its original author nor the Fedora distribution (anymore). This file has to be removed because it depends on the name of the loaddefs file being `50magit.el' and insists on installing it below `/etc`. That isn't correct for many distributions and certainly not when installing Magit manually. Once this issues were addressed the spec file did not work anymore. * Cleanup `.gitignore', `.travis.yml' and `README.md' * Adapt `INSTALL.md' to above changes. PS: * I tried splitting this up into multiple commits but did not succeed. * When Magit is installed using Melpa `magit-version' still reports the "melpa time-stamp" as version, not the `git describe --tags' version.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore36
1 files changed, 10 insertions, 26 deletions
diff --git a/.gitignore b/.gitignore
index 10b464c..8c6441e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,38 +1,22 @@
-/INSTALL
-/Makefile.in
-/aclocal.m4
-/build-stamp
-/config.log
-/config.status
-/configure
-/debian/debhelper.log
-/debian/files
-/debian/magit.debhelper.log
-/debian/magit.postinst.debhelper
-/debian/magit.prerm.debhelper
-/install-sh
-/install-stamp
-/magit-*.tar.gz
-/magit.info
-/missing
-/texinfo.tex
-/debian/magit/
-/autom4te.cache/
*.elc
*~
+/debian/
+/dir
+/magit-*.tar
+/magit-*.tar.gz
+/magit-autoloads.el
+/magit-pkg.el
+/magit-version.el
/magit.aux
/magit.cp
/magit.dvi
/magit.fn
+/magit.info
/magit.ky
/magit.log
+/magit.pdf
/magit.pg
+/magit.ps
/magit.toc
/magit.tp
/magit.vr
-/magit.pdf
-/magit.ps
-/magit-pkg.el
-magit.spec
-50magit.el
-/dir