From 418ef87bda575be30e9f1c06615a0406ea4adc16 Mon Sep 17 00:00:00 2001

From: Peter Lemenkov <lemenkov@gmail.com>

Date: Thu, 27 May 2010 15:22:37 +0400

Subject: [PATCH 4/9] Remove bundled erlang-etap library

---

 configure                     |    3 -

 configure.ac                  |    1 -

 src/Makefile.am               |    2 +-

 src/Makefile.in               |    2 +-

 src/etap/Makefile.am          |   44 ----

 src/etap/Makefile.in          |  467 -----------------------------------------

 src/etap/etap.erl             |  416 ------------------------------------

 src/etap/etap_application.erl |   72 -------

 src/etap/etap_can.erl         |   79 -------

 src/etap/etap_exception.erl   |   66 ------

 src/etap/etap_process.erl     |   42 ----

 src/etap/etap_report.erl      |  343 ------------------------------

 src/etap/etap_request.erl     |   89 --------

 src/etap/etap_string.erl      |   47 ----

 src/etap/etap_web.erl         |   65 ------

 test/etap/test_util.erl.in    |    2 +-

 16 files changed, 3 insertions(+), 1737 deletions(-)

 delete mode 100644 src/etap/Makefile.am

 delete mode 100644 src/etap/Makefile.in

 delete mode 100644 src/etap/etap.erl

 delete mode 100644 src/etap/etap_application.erl

 delete mode 100644 src/etap/etap_can.erl

 delete mode 100644 src/etap/etap_exception.erl

 delete mode 100644 src/etap/etap_process.erl

 delete mode 100644 src/etap/etap_report.erl

 delete mode 100644 src/etap/etap_request.erl

 delete mode 100644 src/etap/etap_string.erl

 delete mode 100644 src/etap/etap_web.erl

diff --git a/configure b/configure

index 39dda91..ca7732f 100755

--- a/configure

+++ b/configure

@@ -12137,8 +12137,6 @@ ac_config_files="$ac_config_files src/couchdb/Makefile"

 ac_config_files="$ac_config_files src/couchdb/priv/Makefile"

-ac_config_files="$ac_config_files src/etap/Makefile"

-

 ac_config_files="$ac_config_files src/ibrowse/Makefile"

 ac_config_files="$ac_config_files src/mochiweb/Makefile"

@@ -13158,7 +13156,6 @@ do

     "src/couchdb/couch.app.tpl") CONFIG_FILES="$CONFIG_FILES src/couchdb/couch.app.tpl" ;;

     "src/couchdb/Makefile") CONFIG_FILES="$CONFIG_FILES src/couchdb/Makefile" ;;

     "src/couchdb/priv/Makefile") CONFIG_FILES="$CONFIG_FILES src/couchdb/priv/Makefile" ;;

-    "src/etap/Makefile") CONFIG_FILES="$CONFIG_FILES src/etap/Makefile" ;;

     "src/ibrowse/Makefile") CONFIG_FILES="$CONFIG_FILES src/ibrowse/Makefile" ;;

     "src/mochiweb/Makefile") CONFIG_FILES="$CONFIG_FILES src/mochiweb/Makefile" ;;

     "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;

diff --git a/configure.ac b/configure.ac

index effb28b..0478b4f 100644

--- a/configure.ac

+++ b/configure.ac

@@ -335,7 +335,6 @@ AC_CONFIG_FILES([src/Makefile])

 AC_CONFIG_FILES([src/couchdb/couch.app.tpl])

 AC_CONFIG_FILES([src/couchdb/Makefile])

 AC_CONFIG_FILES([src/couchdb/priv/Makefile])

-AC_CONFIG_FILES([src/etap/Makefile])

 AC_CONFIG_FILES([src/ibrowse/Makefile])

 AC_CONFIG_FILES([src/mochiweb/Makefile])

 AC_CONFIG_FILES([test/Makefile])

diff --git a/src/Makefile.am b/src/Makefile.am

index e577138..19a5d20 100644

--- a/src/Makefile.am

+++ b/src/Makefile.am

@@ -10,4 +10,4 @@

 ## License for the specific language governing permissions and limitations under

 ## the License.

-SUBDIRS = couchdb etap ibrowse mochiweb

+SUBDIRS = couchdb ibrowse mochiweb

diff --git a/src/Makefile.in b/src/Makefile.in

index 480da98..2422e39 100644

--- a/src/Makefile.in

+++ b/src/Makefile.in

@@ -239,7 +239,7 @@ version_minor = @version_minor@

 version_release = @version_release@

 version_revision = @version_revision@

 version_stage = @version_stage@

-SUBDIRS = couchdb etap ibrowse mochiweb

+SUBDIRS = couchdb ibrowse mochiweb

 all: all-recursive

 .SUFFIXES:

diff --git a/src/etap/Makefile.am b/src/etap/Makefile.am

deleted file mode 100644

index 732347b..0000000

--- a/src/etap/Makefile.am

+++ /dev/null

@@ -1,44 +0,0 @@

-## Licensed under the Apache License, Version 2.0 (the "License"); you may not

-## use this file except in compliance with the License.  You may obtain a copy

-## of the License at

-##

-##   http://www.apache.org/licenses/LICENSE-2.0

-##

-## Unless required by applicable law or agreed to in writing, software

-## distributed under the License is distributed on an "AS IS" BASIS, WITHOUT

-## WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the

-## License for the specific language governing permissions and limitations under

-## the License.

-

-etapebindir = $(localerlanglibdir)/etap/ebin

-

-etap_file_collection = \

-    etap.erl \

-   	etap_application.erl \

-    etap_can.erl \

-    etap_exception.erl \

-    etap_process.erl \

-	etap_report.erl \

-	etap_request.erl \

-	etap_string.erl \

-   	etap_web.erl

-

-etapebin_make_generated_file_list = \

-    etap.beam \

-   	etap_application.beam \

-    etap_can.beam \

-    etap_exception.beam \

-    etap_process.beam \

-	etap_report.beam \

-	etap_request.beam \

-	etap_string.beam \

-   	etap_web.beam

-

-etapebin_DATA = $(etapebin_make_generated_file_list)

-

-EXTRA_DIST =  $(etap_file_collection)

-

-CLEANFILES = $(etapebin_make_generated_file_list)

-

-%.beam: %.erl

-	$(ERLC) $(ERLC_FLAGS) $<

diff --git a/src/etap/Makefile.in b/src/etap/Makefile.in

deleted file mode 100644

index 2c752b3..0000000

--- a/src/etap/Makefile.in

+++ /dev/null

@@ -1,467 +0,0 @@

-# Makefile.in generated by automake 1.11 from Makefile.am.

-# @configure_input@

-

-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,

-# Inc.

-# This Makefile.in is free software; the Free Software Foundation

-# gives unlimited permission to copy and/or distribute it,

-# with or without modifications, as long as this notice is preserved.

-

-# This program is distributed in the hope that it will be useful,

-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without

-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A

-# PARTICULAR PURPOSE.

-

-@SET_MAKE@

-

-VPATH = @srcdir@

-pkgdatadir = $(datadir)/@PACKAGE@

-pkgincludedir = $(includedir)/@PACKAGE@

-pkglibdir = $(libdir)/@PACKAGE@

-pkglibexecdir = $(libexecdir)/@PACKAGE@

-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

-install_sh_DATA = $(install_sh) -c -m 644

-install_sh_PROGRAM = $(install_sh) -c

-install_sh_SCRIPT = $(install_sh) -c

-INSTALL_HEADER = $(INSTALL_DATA)

-transform = $(program_transform_name)

-NORMAL_INSTALL = :

-PRE_INSTALL = :

-POST_INSTALL = :

-NORMAL_UNINSTALL = :

-PRE_UNINSTALL = :

-POST_UNINSTALL = :

-build_triplet = @build@

-host_triplet = @host@

-subdir = src/etap

-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.m4 \

-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4/ac_check_icu.m4 \

-	$(top_srcdir)/configure.ac

-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

-	$(ACLOCAL_M4)

-mkinstalldirs = $(install_sh) -d

-CONFIG_HEADER = $(top_builddir)/config.h

-CONFIG_CLEAN_FILES =

-CONFIG_CLEAN_VPATH_FILES =

-SOURCES =

-DIST_SOURCES =

-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

-am__vpath_adj = case $$p in \

-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

-    *) f=$$p;; \

-  esac;

-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;

-am__install_max = 40

-am__nobase_strip_setup = \

-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`

-am__nobase_strip = \

-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"

-am__nobase_list = $(am__nobase_strip_setup); \

-  for p in $$list; do echo "$$p $$p"; done | \

-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \

-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \

-    if (++n[$$2] == $(am__install_max)) \

-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \

-    END { for (dir in files) print dir, files[dir] }'

-am__base_list = \

-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \

-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'

-am__installdirs = "$(DESTDIR)$(etapebindir)"

-DATA = $(etapebin_DATA)

-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

-ACLOCAL = @ACLOCAL@

-AMTAR = @AMTAR@

-AR = @AR@

-AUTOCONF = @AUTOCONF@

-AUTOHEADER = @AUTOHEADER@

-AUTOMAKE = @AUTOMAKE@

-AWK = @AWK@

-CC = @CC@

-CCDEPMODE = @CCDEPMODE@

-CFLAGS = @CFLAGS@

-CPP = @CPP@

-CPPFLAGS = @CPPFLAGS@

-CURL_CFLAGS = @CURL_CFLAGS@

-CURL_CONFIG = @CURL_CONFIG@

-CURL_LDFLAGS = @CURL_LDFLAGS@

-CURL_LIBS = @CURL_LIBS@

-CYGPATH_W = @CYGPATH_W@

-DEFS = @DEFS@

-DEPDIR = @DEPDIR@

-DSYMUTIL = @DSYMUTIL@

-DUMPBIN = @DUMPBIN@

-ECHO_C = @ECHO_C@

-ECHO_N = @ECHO_N@

-ECHO_T = @ECHO_T@

-EGREP = @EGREP@

-ERL = @ERL@

-ERLC = @ERLC@

-ERLC_FLAGS = @ERLC_FLAGS@

-EXEEXT = @EXEEXT@

-FGREP = @FGREP@

-FLAGS = @FLAGS@

-GREP = @GREP@

-HELP2MAN_EXECUTABLE = @HELP2MAN_EXECUTABLE@

-ICU_CFLAGS = @ICU_CFLAGS@

-ICU_CONFIG = @ICU_CONFIG@

-ICU_CXXFLAGS = @ICU_CXXFLAGS@

-ICU_LIBS = @ICU_LIBS@

-ICU_LOCAL_BIN = @ICU_LOCAL_BIN@

-ICU_LOCAL_CFLAGS = @ICU_LOCAL_CFLAGS@

-ICU_LOCAL_LDFLAGS = @ICU_LOCAL_LDFLAGS@

-INSTALL = @INSTALL@

-INSTALL_DATA = @INSTALL_DATA@

-INSTALL_PROGRAM = @INSTALL_PROGRAM@

-INSTALL_SCRIPT = @INSTALL_SCRIPT@

-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

-JSLIB = @JSLIB@

-LD = @LD@

-LDFLAGS = @LDFLAGS@

-LIBOBJS = @LIBOBJS@

-LIBS = @LIBS@

-LIBTOOL = @LIBTOOL@

-LIPO = @LIPO@

-LN_S = @LN_S@

-LTLIBOBJS = @LTLIBOBJS@

-MAKEINFO = @MAKEINFO@

-MKDIR_P = @MKDIR_P@

-NM = @NM@

-NMEDIT = @NMEDIT@

-OBJDUMP = @OBJDUMP@

-OBJEXT = @OBJEXT@

-OTOOL = @OTOOL@

-OTOOL64 = @OTOOL64@

-PACKAGE = @PACKAGE@

-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@

-PACKAGE_NAME = @PACKAGE_NAME@

-PACKAGE_STRING = @PACKAGE_STRING@

-PACKAGE_TARNAME = @PACKAGE_TARNAME@

-PACKAGE_URL = @PACKAGE_URL@

-PACKAGE_VERSION = @PACKAGE_VERSION@

-PATH_SEPARATOR = @PATH_SEPARATOR@

-RANLIB = @RANLIB@

-SED = @SED@

-SET_MAKE = @SET_MAKE@

-SHELL = @SHELL@

-STRIP = @STRIP@

-VERSION = @VERSION@

-abs_builddir = @abs_builddir@

-abs_srcdir = @abs_srcdir@

-abs_top_builddir = @abs_top_builddir@

-abs_top_srcdir = @abs_top_srcdir@

-ac_ct_CC = @ac_ct_CC@

-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@

-am__include = @am__include@

-am__leading_dot = @am__leading_dot@

-am__quote = @am__quote@

-am__tar = @am__tar@

-am__untar = @am__untar@

-bindir = @bindir@

-bug_uri = @bug_uri@

-build = @build@

-build_alias = @build_alias@

-build_cpu = @build_cpu@

-build_os = @build_os@

-build_vendor = @build_vendor@

-builddir = @builddir@

-datadir = @datadir@

-datarootdir = @datarootdir@

-docdir = @docdir@

-dvidir = @dvidir@

-exec_prefix = @exec_prefix@

-host = @host@

-host_alias = @host_alias@

-host_cpu = @host_cpu@

-host_os = @host_os@

-host_vendor = @host_vendor@

-htmldir = @htmldir@

-includedir = @includedir@

-infodir = @infodir@

-initdir = @initdir@

-install_sh = @install_sh@

-launchddir = @launchddir@

-libdir = @libdir@

-libexecdir = @libexecdir@

-localconfdir = @localconfdir@

-localdatadir = @localdatadir@

-localdocdir = @localdocdir@

-localedir = @localedir@

-localerlanglibdir = @localerlanglibdir@

-locallibbindir = @locallibbindir@

-locallibdir = @locallibdir@

-localstatedir = @localstatedir@

-localstatelibdir = @localstatelibdir@

-localstatelogdir = @localstatelogdir@

-localstaterundir = @localstaterundir@

-lt_ECHO = @lt_ECHO@

-mandir = @mandir@

-mkdir_p = @mkdir_p@

-oldincludedir = @oldincludedir@

-package_author_address = @package_author_address@

-package_author_name = @package_author_name@

-package_identifier = @package_identifier@

-package_name = @package_name@

-package_tarname = @package_tarname@

-pdfdir = @pdfdir@

-prefix = @prefix@

-program_transform_name = @program_transform_name@

-psdir = @psdir@

-sbindir = @sbindir@

-sharedstatedir = @sharedstatedir@

-srcdir = @srcdir@

-sysconfdir = @sysconfdir@

-target_alias = @target_alias@

-top_build_prefix = @top_build_prefix@

-top_builddir = @top_builddir@

-top_srcdir = @top_srcdir@

-version = @version@

-version_major = @version_major@

-version_minor = @version_minor@

-version_release = @version_release@

-version_revision = @version_revision@

-version_stage = @version_stage@

-etapebindir = $(localerlanglibdir)/etap/ebin

-etap_file_collection = \

-    etap.erl \

-   	etap_application.erl \

-    etap_can.erl \

-    etap_exception.erl \

-    etap_process.erl \

-	etap_report.erl \

-	etap_request.erl \

-	etap_string.erl \

-   	etap_web.erl

-

-etapebin_make_generated_file_list = \

-    etap.beam \

-   	etap_application.beam \

-    etap_can.beam \

-    etap_exception.beam \

-    etap_process.beam \

-	etap_report.beam \

-	etap_request.beam \

-	etap_string.beam \

-   	etap_web.beam

-

-etapebin_DATA = $(etapebin_make_generated_file_list)

-EXTRA_DIST = $(etap_file_collection)

-CLEANFILES = $(etapebin_make_generated_file_list)

-all: all-am

-

-.SUFFIXES:

-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)

-	@for dep in $?; do \

-	  case '$(am__configure_deps)' in \

-	    *$$dep*) \

-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \

-	        && { if test -f $@; then exit 0; else break; fi; }; \

-	      exit 1;; \

-	  esac; \

-	done; \

-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/etap/Makefile'; \

-	$(am__cd) $(top_srcdir) && \

-	  $(AUTOMAKE) --foreign src/etap/Makefile

-.PRECIOUS: Makefile

-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

-	@case '$?' in \

-	  *config.status*) \

-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \

-	  *) \

-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \

-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \

-	esac;

-

-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)

-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

-

-$(top_srcdir)/configure:  $(am__configure_deps)

-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)

-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

-$(am__aclocal_m4_deps):

-

-mostlyclean-libtool:

-	-rm -f *.lo

-

-clean-libtool:

-	-rm -rf .libs _libs

-install-etapebinDATA: $(etapebin_DATA)

-	@$(NORMAL_INSTALL)

-	test -z "$(etapebindir)" || $(MKDIR_P) "$(DESTDIR)$(etapebindir)"

-	@list='$(etapebin_DATA)'; test -n "$(etapebindir)" || list=; \

-	for p in $$list; do \

-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

-	  echo "$$d$$p"; \

-	done | $(am__base_list) | \

-	while read files; do \

-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(etapebindir)'"; \

-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(etapebindir)" || exit $$?; \

-	done

-

-uninstall-etapebinDATA:

-	@$(NORMAL_UNINSTALL)

-	@list='$(etapebin_DATA)'; test -n "$(etapebindir)" || list=; \

-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

-	test -n "$$files" || exit 0; \

-	echo " ( cd '$(DESTDIR)$(etapebindir)' && rm -f" $$files ")"; \

-	cd "$(DESTDIR)$(etapebindir)" && rm -f $$files

-tags: TAGS

-TAGS:

-

-ctags: CTAGS

-CTAGS:

-

-

-distdir: $(DISTFILES)

-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

-	list='$(DISTFILES)'; \

-	  dist_files=`for file in $$list; do echo $$file; done | \

-	  sed -e "s|^$$srcdirstrip/||;t" \

-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \

-	case $$dist_files in \

-	  */*) $(MKDIR_P) `echo "$$dist_files" | \

-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \

-			   sort -u` ;; \

-	esac; \

-	for file in $$dist_files; do \

-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

-	  if test -d $$d/$$file; then \

-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

-	    if test -d "$(distdir)/$$file"; then \

-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

-	    fi; \

-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

-	    fi; \

-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

-	  else \

-	    test -f "$(distdir)/$$file" \

-	    || cp -p $$d/$$file "$(distdir)/$$file" \

-	    || exit 1; \

-	  fi; \

-	done

-check-am: all-am

-check: check-am

-all-am: Makefile $(DATA)

-installdirs:

-	for dir in "$(DESTDIR)$(etapebindir)"; do \

-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \

-	done

-install: install-am

-install-exec: install-exec-am

-install-data: install-data-am

-uninstall: uninstall-am

-

-install-am: all-am

-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am

-

-installcheck: installcheck-am

-install-strip:

-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \

-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \

-	  `test -z '$(STRIP)' || \

-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install

-mostlyclean-generic:

-

-clean-generic:

-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)

-

-distclean-generic:

-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

-

-maintainer-clean-generic:

-	@echo "This command is intended for maintainers to use"

-	@echo "it deletes files that may require special tools to rebuild."

-clean: clean-am

-

-clean-am: clean-generic clean-libtool mostlyclean-am

-

-distclean: distclean-am

-	-rm -f Makefile

-distclean-am: clean-am distclean-generic

-

-dvi: dvi-am

-

-dvi-am:

-

-html: html-am

-

-html-am:

-

-info: info-am

-

-info-am:

-

-install-data-am: install-etapebinDATA

-

-install-dvi: install-dvi-am

-

-install-dvi-am:

-

-install-exec-am:

-

-install-html: install-html-am

-

-install-html-am:

-

-install-info: install-info-am

-

-install-info-am:

-

-install-man:

-

-install-pdf: install-pdf-am

-

-install-pdf-am:

-

-install-ps: install-ps-am

-

-install-ps-am:

-

-installcheck-am:

-

-maintainer-clean: maintainer-clean-am

-	-rm -f Makefile

-maintainer-clean-am: distclean-am maintainer-clean-generic

-

-mostlyclean: mostlyclean-am

-

-mostlyclean-am: mostlyclean-generic mostlyclean-libtool

-

-pdf: pdf-am

-

-pdf-am:

-

-ps: ps-am

-

-ps-am:

-

-uninstall-am: uninstall-etapebinDATA

-

-.MAKE: install-am install-strip

-

-.PHONY: all all-am check check-am clean clean-generic clean-libtool \

-	distclean distclean-generic distclean-libtool distdir dvi \

-	dvi-am html html-am info info-am install install-am \

-	install-data install-data-am install-dvi install-dvi-am \

-	install-etapebinDATA install-exec install-exec-am install-html \

-	install-html-am install-info install-info-am install-man \

-	install-pdf install-pdf-am install-ps install-ps-am \

-	install-strip installcheck installcheck-am installdirs \

-	maintainer-clean maintainer-clean-generic mostlyclean \

-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \

-	uninstall uninstall-am uninstall-etapebinDATA

-

-

-%.beam: %.erl

-	$(ERLC) $(ERLC_FLAGS) $<

-

-# Tell versions [3.59,3.63) of GNU make to not export all variables.

-# Otherwise a system limit (for SysV at least) may be exceeded.

-.NOEXPORT:

diff --git a/src/etap/etap.erl b/src/etap/etap.erl

deleted file mode 100644

index 5ad5dba..0000000

--- a/src/etap/etap.erl

+++ /dev/null

@@ -1,416 +0,0 @@

-%% Copyright (c) 2008-2009 Nick Gerakines <nick@gerakines.net>

-%% 

-%% Permission is hereby granted, free of charge, to any person

-%% obtaining a copy of this software and associated documentation

-%% files (the "Software"), to deal in the Software without

-%% restriction, including without limitation the rights to use,

-%% copy, modify, merge, publish, distribute, sublicense, and/or sell

-%% copies of the Software, and to permit persons to whom the

-%% Software is furnished to do so, subject to the following

-%% conditions:

-%% 

-%% The above copyright notice and this permission notice shall be

-%% included in all copies or substantial portions of the Software.

-%% 

-%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-%% EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

-%% OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-%% NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

-%% HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

-%% WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

-%% FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

-%% OTHER DEALINGS IN THE SOFTWARE.

-%% 

-%% @author Nick Gerakines <nick@gerakines.net> [http://socklabs.com/]

-%% @author Jeremy Wall <jeremy@marzhillstudios.com>

-%% @version 0.3.4

-%% @copyright 2007-2008 Jeremy Wall, 2008-2009 Nick Gerakines

-%% @reference http://testanything.org/wiki/index.php/Main_Page

-%% @reference http://en.wikipedia.org/wiki/Test_Anything_Protocol

-%% @todo Finish implementing the skip directive.

-%% @todo Document the messages handled by this receive loop.

-%% @todo Explain in documentation why we use a process to handle test input.

-%% @doc etap is a TAP testing module for Erlang components and applications.

-%% This module allows developers to test their software using the TAP method.

-%% 

-%% 

-%% TAP, the Test Anything Protocol, is a simple text-based interface between

-%% testing modules in a test harness. TAP started life as part of the test

-%% harness for Perl but now has implementations in C/C++, Python, PHP, Perl

-%% and probably others by the time you read this.

-%% 

-%% 

-%% The testing process begins by defining a plan using etap:plan/1, running

-%% a number of etap tests and then calling eta:end_tests/0. Please refer to

-%% the Erlang modules in the t directory of this project for example tests.

--module(etap).

--export([

-    ensure_test_server/0, start_etap_server/0, test_server/1,

-    diag/1, diag/2, plan/1, end_tests/0, not_ok/2, ok/2, is/3, isnt/3,

-    any/3, none/3, fun_is/3, is_greater/3, skip/1, skip/2,

-    ensure_coverage_starts/0, ensure_coverage_ends/0, coverage_report/0,

-    datetime/1, skip/3, bail/0, bail/1

-]).

--record(test_state, {planned = 0, count = 0, pass = 0, fail = 0, skip = 0, skip_reason = ""}).

--vsn("0.3.4").

-

-%% @spec plan(N) -> Result

-%%       N = unknown | skip | {skip, string()} | integer()

-%%       Result = ok

-%% @doc Create a test plan and boot strap the test server.

-plan(unknown) ->

-    ensure_coverage_starts(),

-    ensure_test_server(),

-    etap_server ! {self(), plan, unknown},

-    ok;

-plan(skip) ->

-    io:format("1..0 # skip~n");

-plan({skip, Reason}) ->

-    io:format("1..0 # skip ~s~n", [Reason]);

-plan(N) when is_integer(N), N > 0 ->

-    ensure_coverage_starts(),

-    ensure_test_server(),

-    etap_server ! {self(), plan, N},

-    ok.

-

-%% @spec end_tests() -> ok

-%% @doc End the current test plan and output test results.

-%% @todo This should probably be done in the test_server process.

-end_tests() ->

-    ensure_coverage_ends(),

-    etap_server ! {self(), state},

-    State = receive X -> X end,

-    if

-        State#test_state.planned == -1 ->

-            io:format("1..~p~n", [State#test_state.count]);

-        true ->

-            ok

-    end,

-    case whereis(etap_server) of

-        undefined -> ok;

-        _ -> etap_server ! done, ok

-    end.

-

-%% @private

-ensure_coverage_starts() ->

-    case os:getenv("COVER") of

-        false -> ok;