eric
/
libpipecolors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'testing'

This commit is contained in:
R. Eric Wheeler 2015-07-15 14:01:11 -07:00
parent b8928bfa4c 62d3201851
commit b3dc8a602e
15 changed files with 83 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.gitignore vendored
View File

@ -1,9 +1,3 @@
# Ignore configuration files that may contain sensitive information.
sites/*/*settings*.php
# Ignore paths that contain generated content.
# Ignore default text files
.deps
config
/AUTHORS
@ -23,11 +17,7 @@ config.status
libtool
stamp-h1
# Ignore output files
libpipecolors.o
libpipecolors.so
.libs/
libpipecolors.la
libpipecolors.lo
libpipecolors.pc
tests/
test/
@ -35,4 +25,3 @@ test/
# Ignore backup files
*~
libpipecolors.h
cpp-btree/

46
Makefile.am
View File

@ -1,57 +1,15 @@
pkgconfig_DATA = libpipecolors.pc
AM_LDFLAGS = $(LDFLAGS)
SUBDIRS = src man
ACLOCAL_AMFLAGS = -I m4 -I config
LIBTOOL_DEPS = @LIBTOOL_DEPS@
lib_LTLIBRARIES = libpipecolors.la
libpipecolors_la_SOURCES = libpipecolors.cc
libpipecolors_la_LIBS = -lboost_regex
libpipecolors_la_CFLAGS = -fPIC -DPIC -pthread
if PC_REMOVE_INVALID
AM_CPPFLAGSINVALID = -DPC_REMOVE_INVALID
endif
AM_CPPFLAGS = $(AM_CPPFLAGSINVALID)
libpipecolors_la_LDFLAGS = -module \
-release ${PIPECOLORS_VERSION}
include_HEADERS = pipecolors.h
noinst_HEADERS = config.h
man_MANS = libpipecolors.7 pcprintf.3
docdir = $(datadir)/doc/@PACKAGE@
doc_DATA = README NEWS AUTHORS ChangeLog COPYING
MAINTAINERCLEANFILES = \
aclocal.m4 \
config.h \
config.h.in \
config.h.in~ \
config.log \
stamp-h1 \
-rf config \
-rf m4 \
configure \
Makefile.in \
-rf cpp-btree
install-man: install-man3 install-man7 install-man-gzip
uninstall-man: uninstall-man3 uninstall-man7 uninstall-man-gzip
install-man-gzip:
test -f $(mandir)/man3/pcprintf.3 && gzip -qf /usr/share/man/man3/pcprintf.3
test -f $(mandir)/man7/libpipecolors.7 && gzip -qf /usr/share/man/man7/libpipecolors.7
test -f $(mandir)/man3/pcprintf.3.gz && ln -sf /usr/share/man/man3/pcprintf.3.gz /usr/share/man/man3/pcsprintf.3.gz
uninstall-man-gzip:
test -f $(mandir)/man3/pcprintf.3.gz && rm -f /usr/share/man/man3/pcprintf.3.gz
test -h $(mandir)/man3/pcsprintf.3.gz && rm -f /usr/share/man/man3/pcsprintf.3.gz
test -f $(mandir)/man7/libpipecolors.7.gz && rm -f /usr/share/man/man7/libpipecolors.7.gz
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status libtool
Makefile.in

37
configure.ac
View File

@ -5,7 +5,7 @@ AC_PREREQ([2.69])
m4_define([pipecolors_version_major],[0])
m4_define([pipecolors_version_minor],[2])
m4_define([pipecolors_version_micro],[0])
m4_define([pipecolors_version_micro],[1])
m4_define([pipecolors_version], [pipecolors_version_major.pipecolors_version_minor.pipecolors_version_micro])
@ -17,19 +17,21 @@ AC_SUBST([PIPECOLORS_VERSION_MICRO], [pipecolors_version_micro])
AC_SUBST([PIPECOLORS_VERSION], [pipecolors_version])
PKG_INSTALLDIR
AC_CONFIG_SRCDIR([libpipecolors.cc])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([src/libpipecolors.cc])
AC_CONFIG_HEADERS([src/config.h])
AC_CONFIG_AUX_DIR([config])
AC_CANONICAL_TARGET
AC_CANONICAL_HOST
AC_CANONICAL_BUILD
PKG_PROG_PKG_CONFIG
AM_INIT_AUTOMAKE([gnu dist-bzip2 dist-zip])
AM_SILENT_RULES
AC_GNU_SOURCE
AM_INIT_AUTOMAKE([dist-bzip2 dist-zip])
#AC_GNU_SOURCE
# Checks for programs.
AC_PROG_INSTALL
AC_PROG_CXXCPP
AC_PROG_CXX
AM_PROG_AR
AC_PROG_LIBTOOL
AC_PROG_LN_S
@ -38,14 +40,19 @@ LT_INIT
AC_LANG_CPLUSPLUS
AC_PREFIX_DEFAULT([/usr])
# Checks for programs.
AC_CONFIG_MACRO_DIR([m4])
AC_SUBST([LIBTOOL_DEPS])
# Check for functions
AC_CHECK_FUNCS([vasprintf], [], [AC_MSG_ERROR([Why don't you have this? Install basic c++ header files.])])
AC_CHECK_HEADERS([stdarg.h stdlib.h unistd.h string iostream map],[],[AC_MSG_ERROR([We couldn't find one or more of the required headers.])])
# Check for Headers
AC_CHECK_HEADERS([cstdio iostream cstring cstdlib cstdarg],[],[AC_MSG_ERROR([We couldn't find one or more of the required headers.])])
# Check for boost_regex header
AC_CHECK_HEADER([boost/regex.hpp],[],[AC_MSG_ERROR([Please install the libboost-regex header library.])])
# Check that we can use boost_regex.so
AC_CHECK_LIB([boost_regex], [main], [], [AC_MSG_ERROR([Please install the libboost-regex libs on your system.])])
@ -63,13 +70,13 @@ AM_COND_IF([PC_REMOVE_INVALID],
[AC_MSG_NOTICE([Invalid pipe codes will be filtered.])],
[AC_MSG_NOTICE([Invalid pipe codes will not be filtered.])])
AC_ARG_ENABLE([the-force],
[AC_HELP_STRING([--enable-the-force], [use the force [default=no]])],
[], [enable_the_force=no])
AM_CONDITIONAL([ENABLE_THE_FORCE], [test "x$enable_the_force" = "xyes"])
#AC_ARG_ENABLE([the-force],
# [AC_HELP_STRING([--enable-the-force], [use the force [default=no]])],
# [], [enable_the_force=no])
#AM_CONDITIONAL([ENABLE_THE_FORCE], [test "x$enable_the_force" = "xyes"])
AC_CONFIG_FILES([Makefile libpipecolors.pc:libpipecolors.pc.in libpipecolors.h:libpipecolors.h.in],[],[APIVERSION=PIPECOLORS_VERSION])
AC_CONFIG_FILES([Makefile src/Makefile man/Makefile src/libpipecolors.pc:src/libpipecolors.pc.in src/libpipecolors.h:src/libpipecolors.h.in],[],[APIVERSION=PIPECOLORS_VERSION])
AC_CONFIG_COMMANDS([timestamp], [date >timestamp])
AC_OUTPUT

BIN
dist/pipecolors-0.2.1.tar.bz2 vendored Normal file
View File

Binary file not shown.

BIN
dist/pipecolors-0.2.1.tar.gz vendored Normal file
View File

Binary file not shown.

BIN
dist/pipecolors-0.2.1.zip vendored Normal file
View File

Binary file not shown.

0
releases/timestamp → dist/timestamp vendored
View File

19
man/Makefile.am Normal file
View File

@ -0,0 +1,19 @@
man_MANS = libpipecolors.7 pcprintf.3
MAINTAINERCLEANFILES = \
Makefile.in
install-man: install-man3 install-man7 install-man-gzip
uninstall-man: uninstall-man3 uninstall-man7 uninstall-man-gzip
install-man-gzip:
test -f $(mandir)/man3/pcprintf.3 && gzip -qf /usr/share/man/man3/pcprintf.3
test -f $(mandir)/man7/libpipecolors.7 && gzip -qf /usr/share/man/man7/libpipecolors.7
test -f $(mandir)/man3/pcprintf.3.gz && ln -sf /usr/share/man/man3/pcprintf.3.gz /usr/share/man/man3/pcsprintf.3.gz
uninstall-man-gzip:
test -f $(mandir)/man3/pcprintf.3.gz && rm -f /usr/share/man/man3/pcprintf.3.gz
test -h $(mandir)/man3/pcsprintf.3.gz && rm -f /usr/share/man/man3/pcsprintf.3.gz
test -f $(mandir)/man7/libpipecolors.7.gz && rm -f /usr/share/man/man7/libpipecolors.7.gz

0
libpipecolors.7 → man/libpipecolors.7
View File

0
pcprintf.3 → man/pcprintf.3
View File

39
src/Makefile.am Normal file
View File

@ -0,0 +1,39 @@
pkgconfig_DATA = libpipecolors.pc pipecolors.pc
AM_LDFLAGS = $(LDFLAGS)
ACLOCAL_AMFLAGS = -I m4 -I config
LIBTOOL_DEPS = @LIBTOOL_DEPS@
lib_LTLIBRARIES = libpipecolors.la
libpipecolors_la_SOURCES = libpipecolors.cc
libpipecolors_la_LIBS = -lboost_regex
libpipecolors_la_CFLAGS = -fPIC -DPIC -pthread
if PC_REMOVE_INVALID
AM_CPPFLAGSINVALID = -DPC_REMOVE_INVALID
endif
AM_CPPFLAGS = $(AM_CPPFLAGSINVALID)
libpipecolors_la_LDFLAGS = -module \
-release ${PIPECOLORS_VERSION}
include_HEADERS = pipecolors.h
noinst_HEADERS = config.h
MAINTAINERCLEANFILES = \
aclocal.m4 \
config.h \
config.h.in \
config.h.in~ \
config.log \
stamp-h1 \
Makefile.in \
pipecolors.pc
libtool: $(LIBTOOL_DEPS)
$(SHELL) ../config.status libtool
pipecolors.pc:
cp libpipecolors.pc pipecolors.pc

0
libpipecolors.cc → src/libpipecolors.cc
View File

0
libpipecolors.h.in → src/libpipecolors.h.in
View File

2
libpipecolors.pc.in → src/libpipecolors.pc.in
View File

@ -7,4 +7,4 @@ Name: libpipecolors
Description: Uses old renegade pipe color codes to print colors to the terminal
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lpipecolors
Cflags: -I${includedir}/pipecolors
Cflags: -I${includedir}

0
pipecolors.h → src/pipecolors.h
View File