From 79d939cb466d0f91185e2dea7e9902746a661ce1 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Mon, 11 Jan 2010 01:47:38 +0000 Subject: [PATCH] remove another autotools piece and mark failing tests as TODO for next release --- bootstrap | 75 ------------------------ tests/python_tests/introspection_test.py | 3 +- 2 files changed, 2 insertions(+), 76 deletions(-) delete mode 100755 bootstrap diff --git a/bootstrap b/bootstrap deleted file mode 100755 index 4a5a7e84b..000000000 --- a/bootstrap +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/sh -# Run this to bootstrap the files - -PACKAGE=mapnik - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -DIE=0 - -# check if configure.ac is there -(test -f $srcdir/configure.ac) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level package directory" - exit 1 -} - -# check for autoconf -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`autoconf' installed." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -# check for libtool -(libtool --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`libtool' installed." - echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -# check for automake -(automake --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`automake' installed." - echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" - DIE=1 - NO_AUTOMAKE=yes -} - - -# if no automake, don't bother testing for aclocal -test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: Missing \`aclocal'. The version of \`automake'" - echo "installed doesn't appear recent enough." - echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -if test "$DIE" -eq 1; then - exit 1 -fi - -echo "Running libtoolize..." -libtoolize --force --copy - -aclocalinclude="$ACLOCAL_FLAGS -I config" -echo "Running aclocal $aclocalinclude ..." -aclocal $aclocalinclude - -echo "Running autoheader..." -autoheader - -echo "Running automake..." -automake --add-missing --foreign $am_opt - -echo "Running autoconf ..." -autoconf - -echo "You could now exec ./configure --help to see available options" - diff --git a/tests/python_tests/introspection_test.py b/tests/python_tests/introspection_test.py index d8a02e960..433a38cec 100644 --- a/tests/python_tests/introspection_test.py +++ b/tests/python_tests/introspection_test.py @@ -52,7 +52,8 @@ def test_introspect_symbolizers(): ## but we need to be able to do: p2 = syms[0] # get the actual symbolizer, not the variant object - # this will throw for now... + # this will throw ... + raise Todo('need to expose symbolizer instances') assert isinstance(p2,mapnik.PointSymbolizer) eq_(p2.allow_overlap, True)