From cc05b19836f337e09c01afbb1d5ff92d4da528ab Mon Sep 17 00:00:00 2001
From: Christian Stimming <stimming@tuhh.de>
Date: Fri, 9 Feb 2007 11:30:48 +0000
Subject: [PATCH] Remove indent which is no longer needed; add make check at
 gwenhywfar build.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15532 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 packaging/win32/custom.sh  | 13 +++++--------
 packaging/win32/install.sh | 15 +--------------
 packaging/win32/reset.sh   |  2 +-
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/packaging/win32/custom.sh b/packaging/win32/custom.sh
index 37ee43d9cf..ba69888cf8 100644
--- a/packaging/win32/custom.sh
+++ b/packaging/win32/custom.sh
@@ -45,7 +45,8 @@ DISABLE_OPTIMIZATIONS=no
 MSYS_DIR=$GLOBAL_DIR\\msys
 
 # tools here means binaries runnable without other DLLs or data files
-WGET_DIR=$GLOBAL_DIR\\tools
+TOOLS_DIR=$GLOBAL_DIR\\tools
+WGET_DIR=$TOOLS_DIR
 #WGET=
 
 SF_MIRROR="http://heanet.dl.sourceforge.net/sourceforge"
@@ -60,7 +61,7 @@ MINGW_URL="$SF_MIRROR/mingw/MinGW-5.1.0.exe"
 MINGW_DIR=$GLOBAL_DIR\\mingw
 
 UNZIP_URL="$SF_MIRROR/gnuwin32/unzip-5.51-1.exe"
-UNZIP_DIR=$GLOBAL_DIR\\tools
+UNZIP_DIR=$TOOLS_DIR
 
 # do not use regex-gnu or regex-spencer v3.8.g3, see bug #382852
 REGEX_URL="$GNOME_WIN32_DEPS_URL/libgnurx-2.5.zip"
@@ -71,9 +72,6 @@ READLINE_BIN_URL="$SF_MIRROR/gnuwin32/readline-5.0-bin.zip"
 READLINE_LIB_URL="$SF_MIRROR/gnuwin32/readline-5.0-lib.zip"
 READLINE_DIR=$GLOBAL_DIR\\readline
 
-INDENT_BIN_URL="$SF_MIRROR/gnuwin32/indent-2.2.9-bin.zip"
-INDENT_DIR=$GLOBAL_DIR\\tools
-
 ACTIVE_PERL_URL="http://downloads.activestate.com/ActivePerl/Windows/5.6/ActivePerl-5.6.1.638-MSWin32-x86.zip"
 ACTIVE_PERL_DIR=$GLOBAL_DIR\\active-perl
 
@@ -91,10 +89,10 @@ OPENSSL_LIB_URL="$SF_MIRROR/gnuwin32/openssl-0.9.7c-lib.zip"
 OPENSSL_DIR=$GLOBAL_DIR\\openssl
 
 PEXPORTS_URL="http://www.emmestech.com/software/cygwin/pexports-0.43/pexports-0.43.zip"
-PEXPORTS_DIR=$GLOBAL_DIR\\tools
+PEXPORTS_DIR=$TOOLS_DIR
 
 EXETYPE_SCRIPT=`pwd`/exetype.pl
-EXETYPE_DIR=$GLOBAL_DIR\\tools
+EXETYPE_DIR=$TOOLS_DIR
 
 LIBXML2_URL="http://www.zlatkovic.com/pub/libxml/libxml2-2.6.27.win32.zip"
 LIBXML2_DIR=$GLOBAL_DIR\\gnome #avoid XML_FLAGS
@@ -201,7 +199,6 @@ if test x$cross_compile != xyes ; then
 fi
 add_step inst_regex
 add_step inst_readline
-add_step inst_indent
 if test x$cross_compile != xyes ; then
  add_step inst_active_perl
 fi
diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh
index 203b049db8..1cd7434769 100644
--- a/packaging/win32/install.sh
+++ b/packaging/win32/install.sh
@@ -169,20 +169,6 @@ function inst_readline() {
     quiet ${LD} $READLINE_LDFLAGS -lreadline -o $TMP_UDIR/ofile || die "readline not installed correctly"
 }
 
-function inst_indent() {
-    setup Indent
-    _INDENT_UDIR=`unix_path $INDENT_DIR`
-    add_to_env $_INDENT_UDIR/bin PATH
-    if quiet which indent
-    then
-        echo "indent already installed.  skipping."
-    else
-        mkdir -p $_INDENT_UDIR
-        wget_unpacked $INDENT_BIN_URL $DOWNLOAD_DIR $INDENT_DIR
-    fi
-    quiet which indent || die "indent unavailable"
-}
-
 function inst_active_perl() {
     setup ActivePerl \(intltool\)
     _ACTIVE_PERL_WFSDIR=`win_fs_path $ACTIVE_PERL_DIR`
@@ -718,6 +704,7 @@ function inst_gwenhywfar() {
 	        CPPFLAGS="${REGEX_CPPFLAGS}" \
 		LDFLAGS="${REGEX_LDFLAGS}"
 	    make
+	    make check
 	    make install
 	qpopd
     fi
diff --git a/packaging/win32/reset.sh b/packaging/win32/reset.sh
index 3d33e206f5..05c1d19842 100644
--- a/packaging/win32/reset.sh
+++ b/packaging/win32/reset.sh
@@ -33,7 +33,7 @@ qpushd "$(dirname $(unix_path "$0"))"
 basedir=`unix_path $GLOBAL_DIR`
 qpushd $basedir
 
-rm -rf regex readline indent guile pexports gnome swig autotools
+rm -rf regex readline guile pexports gnome swig autotools
 rm -rf libgsf goffice glade gnucash tmp
 
 rm -f /etc/profile.d/installer.sh