cuberite/TCLAP
1
0
Fork 0
mirror of https://github.com/cuberite/TCLAP.git synced 2025-09-12 21:56:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.2'

Browse Source 
# Conflicts:
#	include/tclap/ZshCompletionOutput.h
#	tests/Makefile.am
#	tests/runtests.sh
#	tests/test79.sh
This commit is contained in:
Daniel Aarno 2017-12-26 21:28:10 +01:00
commit 642e48a667
7 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2017-12-26 14:30 macbishop
* Bugfix release for 1.2 branch (v1.2.2):
- Fixed a few typos
- Fixed ZshCompletionOutput
- Fixed brief output with TCLAP_NAMESTRING defined
- Initialize theDelimiter (supress warning) in DocBookOutput
- Fixed an issue with config.h and compiling on systems
without sstream.h
- Fixed } outside of include guards in ArgTraits.h
2011-04-10 17:08 mes5k 2011-04-10 17:08 mes5k
* include/tclap/Arg.h: patch that allows arg start strings to be * include/tclap/Arg.h: patch that allows arg start strings to be

2
NEWS
View File

@ -93,3 +93,5 @@ at test11.cpp and test12.cpp for examples on using ArgTraits for extending
tclap for different types. tclap for different types.
4/16/11 - Another long break! Several minor bug and memory leak fixes. 4/16/11 - Another long break! Several minor bug and memory leak fixes.
12/26/17 - v1.2 bug fix release

2
configure.in
View File

@ -2,7 +2,7 @@ AC_INIT(Makefile.am)
#AC_PREREQ(2.50) #AC_PREREQ(2.50)
AC_CONFIG_AUX_DIR(config) AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config/config.h) AM_CONFIG_HEADER(config/config.h)
AM_INIT_AUTOMAKE(tclap,1.2.1) AM_INIT_AUTOMAKE(tclap,1.2.2)
AC_PROG_CXX AC_PROG_CXX
AC_CXX_HAVE_SSTREAM AC_CXX_HAVE_SSTREAM
AC_CXX_HAVE_STRSTREAM AC_CXX_HAVE_STRSTREAM

5
docs/Makefile.am
View File

@ -19,7 +19,7 @@ install-data-local :
cp -R $(abs_srcdir)/html $(DESTDIR)$(docdir) cp -R $(abs_srcdir)/html $(DESTDIR)$(docdir)
uninstall-local : uninstall-local :
chmod -R +w $(DESTDIR)$(docdir) chmod -R o+w $(DESTDIR)$(docdir)
rm -rf $(DESTDIR)$(docdir) rm -rf $(DESTDIR)$(docdir)
dist-hook : dist-hook :
@ -27,5 +27,6 @@ dist-hook :
cp -R $(abs_srcdir)/html $(distdir) cp -R $(abs_srcdir)/html $(distdir)
clean-local: clean-local:
$(RM) -rf $(abs_srcdir)/html/* $(RM) -rf $(abs_builddir)/html/*
$(RM) -rf $(abs_builddir)/doxygen_sqlite3.db

4
include/tclap/Makefile.am
View File

@ -24,5 +24,5 @@ libtclapinclude_HEADERS = \
Constraint.h \ Constraint.h \
ValuesConstraint.h \ ValuesConstraint.h \
ArgTraits.h \ ArgTraits.h \
StandardTraits.h StandardTraits.h \
sstream.h

1
include/tclap/ZshCompletionOutput.h
View File

@ -239,6 +239,7 @@ inline void ZshCompletionOutput::printOption(Arg* a, std::string mutex)
std::string arg = a->shortID(); std::string arg = a->shortID();
// Example arg: "[-A <integer>] ..." // Example arg: "[-A <integer>] ..."
size_t pos = arg.rfind(" ..."); size_t pos = arg.rfind(" ...");
if (pos != std::string::npos) { if (pos != std::string::npos) {
arg.erase(pos); arg.erase(pos);
} }

2
tests/test79.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# success
../examples/test21 > tmp.out 2>&1 ../examples/test21 > tmp.out 2>&1
if cmp -s tmp.out $srcdir/test79.out; then if cmp -s tmp.out $srcdir/test79.out; then