summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStef Walter <stef@memberwebs.com>2009-10-29 22:45:13 +0000
committerStef Walter <stef@memberwebs.com>2009-10-29 22:45:24 +0000
commit47c7b529cc46f0974f9ef954c90dd6495c14c6d6 (patch)
tree2f613e85352f54a74925afa854aa1edc13f9b539
parent70ccf1622c31ae7b925510735a16425592813cfe (diff)
Cleanup build process.
* Integrate better with git. * Git based ChangeLog * NEWS now does it's proper job.
-rw-r--r--ChangeLog35
-rw-r--r--Makefile.am13
-rw-r--r--NEWS7
-rwxr-xr-xautogen.sh14
4 files changed, 60 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 4617fb5..0bd7f42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,32 @@
-0.2
- - Add support for POST'd responses from IDP.
- - Fix problems with apache restarting and associations going away.
+=== ChangeLog discontinued ===
-0.1
- - Initial non-public implementation
+ With the move to git, this project is switching from a ChangeLog
+ file to relying on commit messages to provide change history. Please
+ write commit messages in the following format:
+=== begin example commit ===
+
+ Short explanation of the commit
+
+ Longer explanation explaining exactly what's changed, whether any
+ external or private interfaces changed, what bugs were fixed (with bug
+ tracker reference if applicable) and so forth. Be concise but not too
+ brief.
+
+=== end example commit ===
+
+ - Always add a brief description of the commit to the _first_ line of
+ the commit and terminate by two newlines. This may be the title of
+ a fixed bug, copied from Bugzilla.
+
+ - First line (the brief description) must only be one sentence and
+ should start with a capital letter unless it starts with a
+ lowercase symbol or identifier. Don't use a trailing full stop,
+ and don't exceed 72 characters.
+
+ - The main description (the body) is normal prose and should use
+ normal punctuation and capital letters where appropriate.
+
+ - When committing code on behalf of others use the --author option,
+ e.g. git commit -a --author "Joe Coder <joe@coder.org>" and
+ --signoff.
diff --git a/Makefile.am b/Makefile.am
index 13a52bf..e8a2ece 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,5 +2,16 @@
SUBDIRS = module tests
dist-hook:
- rm -rf `find $(distdir)/ -name '.??*'`
+ @if test -d "$(srcdir)/.git"; \
+ then \
+ echo Creating ChangeLog && \
+ ( cd "$(top_srcdir)" && \
+ echo '# Generate automatically. Do not edit.'; echo; \
+ $(top_srcdir)/missing --run git log --stat --date=short ) > ChangeLog.tmp \
+ && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
+ || ( rm -f ChangeLog.tmp ; \
+ echo Failed to generate ChangeLog >&2 ); \
+ else \
+ echo A git clone is required to generate a ChangeLog >&2; \
+ fi
diff --git a/NEWS b/NEWS
index c7ab92a..910b246 100644
--- a/NEWS
+++ b/NEWS
@@ -1 +1,6 @@
-See ChangeLog \ No newline at end of file
+0.2
+ - Add support for POST'd responses from IDP.
+ - Fix problems with apache restarting and associations going away.
+
+0.1
+ - Initial non-public implementation
diff --git a/autogen.sh b/autogen.sh
index 81fbba3..80d6f99 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,16 @@
-#!/bin/sh -ex
+#!/bin/sh
-set -ex
+set -e
+
+# Some boiler plate to get git setup as expected
+if test -d .git; then
+ if test -f .git/hooks/pre-commit.sample && \
+ test ! -f .git/hooks/pre-commit; then
+ cp -pv .git/hooks/pre-commit.sample .git/hooks/pre-commit
+ fi
+fi
+
+set -x
aclocal
autoheader