Permalink
Browse files

Merge branch 'home-desktop-simple-build-system'

  • Loading branch information...
2 parents fc01cd5 + eb0da05 commit 9d7f9d57b6601b66188474731c6489a4f3c978c6 @philjackson philjackson committed Sep 3, 2010
Showing with 54 additions and 832 deletions.
  1. +0 −1 .gitignore
  2. +0 −6 AUTHORS
  3. +0 −676 COPYING
  4. +0 −1 ChangeLog
  5. +43 −0 Makefile
  6. +0 −25 Makefile.am
  7. +0 −93 NEWS
  8. +0 −1 README
  9. +1 −3 README.md
  10. +0 −2 autogen.sh
  11. +3 −6 bin/mk_rel.bash
  12. +0 −15 configure.ac
  13. +6 −2 magit.el
  14. +1 −1 magit.spec.in
View
@@ -1,5 +1,4 @@
/INSTALL
-/Makefile
/Makefile.in
/aclocal.m4
/build-stamp
View
@@ -1,6 +0,0 @@
-Marius Vollmer <marius.vollmer@uni-dortmund.de>
-Linh Dang <dang.linh@gmail.com>
-Alex Ott <ott@flash.lan>
-Marcin Bachry <hegel666@gmail.com>
-Alexey Voinov <alexey.v.voinov@gmail.com
-John Wiegley <johnw@newartisans.com>
View
Oops, something went wrong.
View
@@ -1 +0,0 @@
-There is no ChangeLog.
View
@@ -0,0 +1,43 @@
+VERSION=0.8.2
+PREFIX=/usr/local
+ELS=magit.el magit-svn.el magit-topgit.el
+ELCS=$(ELS:.el=.elc)
+DIST_FILES=$(ELS) Makefile magit.texi README.md magit.spec.in magit-pkg.el.in 50magit.el
+
+.PHONY=install
+
+%.elc: %.el
+ emacs --batch --eval "(add-to-list 'load-path \"$(CURDIR)\")" \
+ --eval '(byte-compile-file "$<")'
+
+all: $(ELCS) magit.info magit.spec magit-pkg.el
+
+magit.spec: magit.spec.in
+ sed -e s/@VERSION@/$(VERSION)/ < $< > $@
+
+magit-pkg.el: magit-pkg.el.in
+ sed -e s/@VERSION@/$(VERSION)/ < $< > $@
+
+magit.elc: magit.el
+magit-svn.elc: magit-svn.el
+magit-topgit.elc: magit-topgit.el
+magit.info:
+
+# yuck - this needs cleaning up a bit...
+dist: $(DIST_FILES)
+ mkdir -p magit-$(VERSION)
+ cp $(DIST_FILES) magit-$(VERSION)
+ tar -cvzf magit-$(VERSION).tar.gz magit-$(VERSION)
+ rm -rf magit-$(VERSION)
+
+install: all
+ mkdir -p $(DESTDIR)/$(PREFIX)/share/emacs/site-lisp
+ install -m 644 $(ELS) $(ELCS) $(DESTDIR)/$(PREFIX)/share/emacs/site-lisp
+ mkdir -p $(DESTDIR)/$(PREFIX)/share/info
+ install -m 644 magit.info $(DESTDIR)/$(PREFIX)/share/info
+ install-info --info-dir=$(DESTDIR)/$(PREFIX)/share/info $(DESTDIR)/$(PREFIX)/share/info/magit.info
+ mkdir -p $(DESTDIR)/etc/emacs/site-start.d
+ install -m 644 50magit.el $(DESTDIR)/etc/emacs/site-start.d/50magit.el
+
+clean:
+ rm -fr magit-pkg.el magit.spec magit.info $(ELCS) *.tar.gz magit-$(VERSION)
View
@@ -1,25 +0,0 @@
-lispdir = $(datadir)/emacs/site-lisp
-sitestartdir = @SITESTART@
-
-lisp_DATA = magit.el magit.elc magit-svn.el magit-svn.elc magit-topgit.el magit-topgit.elc
-sitestart_DATA = 50magit.el
-
-info_TEXINFOS = magit.texi
-
-CLEANFILES = magit-*.elc
-EXTRA_DIST = magit.el 50magit.el magit.spec magit-svn.el magit-topgit.el
-
-%.elc: %.el
- @if [ $(builddir) != $(srcdir) ]; then ln $(srcdir)/$*.el .; fi
- emacs --batch --eval "(add-to-list 'load-path \"$(srcdir)\")" \
- --eval '(byte-compile-file "$*.el")'
- @if [ $(builddir) != $(srcdir) ]; then rm -f $*.el; fi
-
-
-elpa: magit-pkg.el info
- -@rm -rf magit-$(VERSION)
- mkdir magit-$(VERSION)
- cp magit.el magit-pkg.el magit.info magit-$(VERSION)
- (cd magit-$(VERSION); ginstall-info --dir-file=dir magit.info)
- tar cf magit-$(VERSION).tar magit-$(VERSION)
- @rm -rf magit-$(VERSION)
View
@@ -1,93 +0,0 @@
-Changes in magit 0.8:
-
-* By setting magit-repo-dirs, you can get better repo completion.
- Magit will offer all subdirectories (upto magit-repo-dirs level
- deep) of the listed directories when magit-status asks for a
- directory to work on.
-
- You can get the old behavior with a double prefix to magit-status.
-
-* Hitting 'c' or 'C' while resolving a conflict in the middle of a
- rebase will offer to continue the rebase instead of trying to commit
- your changes.
-
-* Pulling will ask which branch to pull from when you don't have a
- default branch configured.
-
-* Switching to a remote branch will offer to create a local tracking
- branch for it.
-
-* Hitting C-c C-s while editing a commit message will toggle the
- "--signoff" option.
-
-* Hitting 's' on the "Untracked files" section title will stage all
- untracked files.
-
-* Hitting 'C-u S' will stage all untracked and tracked files.
-
-* Performance improvements in the status buffer.
-
-* Bug fixes to make Magit work better with newer Gits.
-
-Changes in magit 0.7:
-
-* Tagging, on 't' and 'T'.
-
-* Stashing, on 'z' and 'Z'.
-
-* Wazzup, on 'w'. Wazzup gives you an overview over how other
- branches relate to the current one.
-
-* There is more control over pushing. 'P' now takes a prefix argument
- and pushing a branch without a default remote will ask for one.
-
-* Logs have changed a bit: 'l' shows the traditional brief log, and
- 'L' shows a more verbose log. Use the prefix arg to specify the
- range of the log.
-
-* M-x magit-status doesn't prompt anymore for a directory when invoked
- from within a Git repository. Use C-u to force a prompt.
-
-* When you have nothing staged, 'c' will now explicitly ask whether to
- commit everything instead of just going ahead and do it. This can
- be customized.
-
-* The digit keys '1', '2', '3', and '4' now show sections on the
- respective level and hide everything below. With Meta, they work on
- all sections; without, they work only on sections that are a parent
- or child of the current section.
-
-* Typing '+' and '-' will change the size of hunks, via the "-U"
- option to git diff. '0' resets hunks to their default size.
-
-* Typing 'k' on the "Untracked files" section title will offer to
- delete all untracked files.
-
-* Magit understands a bit of git-svn: the status buffer shows unpushed
- and unpulled commits, 'N r' runs git svn rebase, and 'N c' runs git
- svn dcommit.
-
-* Magit now also works when the direcory is accessed via tramp.
-
-* M-x magit-status can also create new repositories when given a
- directory that is not a Git repository.
-
-* Magit works better with oldish Gits that don't understand "--graph",
- for example.
-
-* The name of the Git program and common options for it can be
- customized.
-
-Changes in magit 0.6:
-
-Almost everything has changed. Please read the manual again. Some
-highlights:
-
-* Magit now works with Git 1.6.0. (John Wiegley)
-
-* Support for interactive rewriting.
-
-* Sections can be shown and hidden.
-
-* Staging, unstaging, applying, reverting and discarding changes can
- now be done line-by-line, not only hunk-by-hunk.
View
View
@@ -16,9 +16,7 @@ Installing
Download the latest tarball from [the github download page][download],
then Magit can be installed with the popular recipe of:
- ./autogen.sh # If you got the sources directly from Git
- ./configure
- make install
+make && sudo make install
This will put magit.el into `/usr/local/share/emacs/site-lisp`, where
Emacs should be able to find it. Then add
View
@@ -1,2 +0,0 @@
-#! /bin/sh
-autoreconf --install
View
@@ -3,7 +3,7 @@
set -e
function configure_ac_ver_ok {
- cat configure.ac | grep "${1}" || return 1
+ cat Makefile | grep "VERSION=${1}" || return 1
}
function magit_el_ver_ok {
@@ -43,12 +43,9 @@ if ! configure_ac_ver_ok "$tag"; then
fi
# clean up if we need to
-[ -f Makefile ] && make distclean
-
-./autogen.sh
-
-./configure
+make clean
make dist
+# back to master
git co master
View
@@ -1,15 +0,0 @@
-AC_INIT(magit, 0.8.2)
-AC_CONFIG_SRCDIR([magit.el])
-AM_INIT_AUTOMAKE([1.10])
-
-AC_ARG_WITH([site-start],
- AS_HELP_STRING([--with-site-start], [Provide the emacs site-start directory. The default is $(sysconfdir)/emacs/site-start.el.]),
- [ SITESTART="$withval" ],
- [ SITESTART='$(sysconfdir)/emacs/site-start.d' ])
-
-AC_SUBST([SITESTART])
-AC_CONFIG_FILES([Makefile
- magit-pkg.el
- magit.spec])
-
-AC_OUTPUT
View
@@ -1,6 +1,7 @@
;;; magit.el -- control Git from Emacs.
-;; Copyright (C) 2008 Alex Ott.
+;; Copyright (C) 2010 Alan Falloon.
+;; Copyright (C) 2008, 2010 Alex Ott.
;; Copyright (C) 2008, 2009, 2010 Alexey Voinov.
;; Copyright (C) 2010 Ben Walton.
;; Copyright (C) 2008 Daniel Farina.
@@ -19,13 +20,16 @@
;; Copyright (C) 2009 Pavel Holejsovsky.
;; Copyright (C) 2009, 2010 Phil Jackson.
;; Copyright (C) 2010 Ramkumar Ramachandra.
+;; Copyright (C) 2010 Remco van 't Veer.
;; Copyright (C) 2009 René Stadler.
;; Copyright (C) 2010 Roger Crew.
;; Copyright (C) 2009, 2010 Rémi Vanicat.
+;; Copyright (C) 2010 Sean Bryant.
;; Copyright (C) 2009 Steve Purcell.
+;; Copyright (C) 2010 Timo Juhani Lindfors.
+;; Copyright (C) 2010 Yann Hodique.
;; Copyright (C) 2010 Ævar Arnfjörð Bjarmason.
;; Copyright (C) 2010 Óscar Fuentes.
-;; Copyright (C) 2010 Yann Hodique
;; Author: Marius Vollmer <marius.vollmer@nokia.com>
;; Maintainer: Phil Jackson <phil@shellarchive.co.uk>
View
@@ -36,7 +36,7 @@ rm -rf $RPM_BUILD_ROOT
/usr/share/emacs/site-lisp/site-start.d/50magit.el
/usr/share/emacs/site-lisp/magit.el
/usr/share/emacs/site-lisp/magit.elc
-%doc README NEWS COPYING AUTHORS
+%doc README.md
/usr/share/info/magit.info.gz
%changelog

0 comments on commit 9d7f9d5

Please sign in to comment.