From 5c8db740a178e417b7afc4bf8acf5e9f475c4e82 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Tue, 17 Apr 2012 11:18:25 +0200 Subject: Release 0.4 --- .gitignore | 19 +++++++++++++++++++ ChangeLog | 33 +++++++++++++++++++++++++++++++-- INSTALL | 2 +- Makefile.am | 13 ++++++++++++- NEWS | 7 ++++++- autogen.sh | 19 +++++++++++++++++++ configure.ac | 43 +++++++++++++++++++++++++++++++++++++++++++ configure.in | 42 ------------------------------------------ www/Makefile.am | 2 +- 9 files changed, 132 insertions(+), 48 deletions(-) create mode 100644 .gitignore create mode 100755 autogen.sh create mode 100644 configure.ac delete mode 100644 configure.in diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ce898e5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,19 @@ +*.o +*.tar.gz + +.deps +aclocal.m4 +autom4te.cache +compile +config.h* +config.log +config.status +configure +depcomp +install-sh +missing +stamp-h1 +Makefile +Makefile.in + +/tools/rrdui-cgi diff --git a/ChangeLog b/ChangeLog index 23dda67..0bd7f42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,32 @@ -0.3 - - Initial public release +=== ChangeLog discontinued === + 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 " and + --signoff. diff --git a/INSTALL b/INSTALL index 5bb6e7b..cbd1c80 120000 --- a/INSTALL +++ b/INSTALL @@ -1 +1 @@ -/usr/share/automake-1.10/INSTALL \ No newline at end of file +/usr/share/automake-1.11/INSTALL \ No newline at end of file diff --git a/Makefile.am b/Makefile.am index 115359a..5536493 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,4 +4,15 @@ SUBDIRS = tools www EXTRA_DIST = graphics dist-hook: - rm -rf `find $(distdir)/ -name .svn` + @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..2487f71 100644 --- a/NEWS +++ b/NEWS @@ -1 +1,6 @@ -See ChangeLog \ No newline at end of file +0.4 + - Fix drag zoom problems with webkit and chrome + - Build cleanup + +0.3 + - Initial public release diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..1d0902a --- /dev/null +++ b/autogen.sh @@ -0,0 +1,19 @@ +#!/bin/sh -e + +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 +automake -a +autoconf +./configure "$@" diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..142374b --- /dev/null +++ b/configure.ac @@ -0,0 +1,43 @@ +dnl Process this file with autoconf to produce a configure script. +AC_INIT(rrdui, 0.4, stef@thewalter.net) +AM_INIT_AUTOMAKE(rrdui, 0.4) + +LDFLAGS="$LDFLAGS -L/usr/local/lib" +CFLAGS="$CFLAGS -I/usr/local/include" + +AC_CONFIG_SRCDIR([tools/rrdui-cgi.c]) +AM_CONFIG_HEADER([config.h]) + +CFLAGS="$CFLAGS -Wall" + +# Debug mode +AC_ARG_ENABLE(debug, + AC_HELP_STRING([--enable-debug], + [Compile binaries in debug mode])) + +if test "$enable_debug" = "yes"; then + CFLAGS="$CFLAGS -g -O0" + AC_DEFINE_UNQUOTED(_DEBUG, 1, [In debug mode]) + echo "enabling debug compile mode" +fi + +dnl Check for programs. +AC_PROG_CC +AM_PROG_CC_C_O +AC_PROG_INSTALL +AC_PROG_RANLIB + +dnl Checks for libraries +AC_CHECK_LIB(rrd, rrd_update, , + [echo "ERROR: librrd not found."; exit 1]) + +dnl Checks for typedefs, structures, and compiler characteristics. +AC_C_CONST +AC_C_INLINE + +AC_HEADER_STDC + +AC_MSG_RESULT() + +AC_CONFIG_FILES([Makefile tools/Makefile www/Makefile]) +AC_OUTPUT diff --git a/configure.in b/configure.in deleted file mode 100644 index 3facecc..0000000 --- a/configure.in +++ /dev/null @@ -1,42 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(rrdui, 0.4, stef@thewalter.net) -AM_INIT_AUTOMAKE(rrdui, 0.4) - -LDFLAGS="$LDFLAGS -L/usr/local/lib" -CFLAGS="$CFLAGS -I/usr/local/include" - -AC_CONFIG_SRCDIR([tools/rrdui-cgi.c]) -AM_CONFIG_HEADER([config.h]) - -CFLAGS="$CFLAGS -Wall" - -# Debug mode -AC_ARG_ENABLE(debug, - AC_HELP_STRING([--enable-debug], - [Compile binaries in debug mode])) - -if test "$enable_debug" = "yes"; then - CFLAGS="$CFLAGS -g -O0" - AC_DEFINE_UNQUOTED(_DEBUG, 1, [In debug mode]) - echo "enabling debug compile mode" -fi - -dnl Check for programs. -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_RANLIB - -dnl Checks for libraries -AC_CHECK_LIB(rrd, rrd_update, , - [echo "ERROR: librrd not found."; exit 1]) - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_C_INLINE - -AC_HEADER_STDC - -AC_MSG_RESULT() - -AC_CONFIG_FILES([Makefile tools/Makefile www/Makefile]) -AC_OUTPUT diff --git a/www/Makefile.am b/www/Makefile.am index 5bb713c..6755b7b 100644 --- a/www/Makefile.am +++ b/www/Makefile.am @@ -1,5 +1,5 @@ -EXTRA_DIST = ajax static +EXTRA_DIST = ajax htmldir = $(datadir)/rrdui/ nobase_html_DATA = \ -- cgit v1.2.3