AUTHORS | 16 ++++++++++------
inc/libmspub/Makefile.am | 4 +++-
src/conv/raw/pub2raw.cpp | 30 +++++++++++++++++++++++++++---
src/conv/svg/pub2xhtml.cpp | 28 +++++++++++++++++++++++++---
src/lib/Makefile.am | 4 ----
5 files changed, 65 insertions(+), 17 deletions(-)
New commits:
commit ef9e59b64f3cb168459c2625da7582a4372df7ec
Author: David Tardon <dtar...@redhat.com>
Date: Sat Dec 26 20:25:50 2015 +0100
make --help output more help2man-friendly
Change-Id: I58c2eae1b449370e6f2a286b84c8b423fc2c8d42
diff --git a/src/conv/raw/pub2raw.cpp b/src/conv/raw/pub2raw.cpp
index 1205949..6084d27 100644
--- a/src/conv/raw/pub2raw.cpp
+++ b/src/conv/raw/pub2raw.cpp
@@ -7,6 +7,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <string.h>
@@ -15,19 +19,37 @@
#include <librevenge/librevenge.h>
#include <libmspub/libmspub.h>
+#ifndef PACKAGE
+#define PACKAGE "libmspub"
+#endif
+#ifndef VERSION
+#define VERSION "UNKNOWN VERSION"
+#endif
+
namespace
{
int printUsage()
{
- printf("Usage: pub2raw [OPTION] <Microsoft Publisher Document>\n");
+ printf("`pub2raw' is used to test " PACKAGE ".\n");
+ printf("\n");
+ printf("Usage: pub2raw [OPTION] FILE\n");
printf("\n");
printf("Options:\n");
- printf("--callgraph Display the call graph nesting level\n");
- printf("--help Shows this help message\n");
+ printf("\t--callgraph display the call graph nesting level\n");
+ printf("\t--help show this help message\n");
+ printf("\t--version show version information\n");
+ printf("\n");
+ printf("Report bugs to <https://bugs.documentfoundation.org/>.\n");
return -1;
}
+int printVersion()
+{
+ printf("pub2raw " VERSION "\n");
+ return 0;
+}
+
} // anonymous namespace
int main(int argc, char *argv[])
@@ -42,6 +64,8 @@ int main(int argc, char *argv[])
{
if (!strcmp(argv[i], "--callgraph"))
printIndentLevel = true;
+ else if (!strcmp(argv[i], "--version"))
+ return printVersion();
else if (!file && strncmp(argv[i], "--", 2))
file = argv[i];
else
diff --git a/src/conv/svg/pub2xhtml.cpp b/src/conv/svg/pub2xhtml.cpp
index 35cfc84..61349f7 100644
--- a/src/conv/svg/pub2xhtml.cpp
+++ b/src/conv/svg/pub2xhtml.cpp
@@ -7,6 +7,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <iostream>
#include <sstream>
#include <fstream>
@@ -16,18 +20,33 @@
#include <librevenge/librevenge.h>
#include <libmspub/libmspub.h>
+#ifndef VERSION
+#define VERSION "UNKNOWN VERSION"
+#endif
+
namespace
{
int printUsage()
{
- printf("Usage: pub2xhtml [OPTION] <Microsoft Publisher Document> [<Output
filename>]\n");
+ printf("`pub2xhtml' converts Microsoft Publisher documents to SVG.\n");
+ printf("\n");
+ printf("Usage: pub2xhtml [OPTION] INPUT [OUTPUT]\n");
printf("\n");
printf("Options:\n");
- printf("--help Shows this help message\n");
+ printf("\t--help show this help message\n");
+ printf("\t--version show version information\n");
+ printf("\n");
+ printf("Report bugs to <https://bugs.documentfoundation.org/>.\n");
return -1;
}
+int printVersion()
+{
+ printf("pub2raw " VERSION "\n");
+ return 0;
+}
+
} // anonymous namespace
int main(int argc, char *argv[])
@@ -41,7 +60,9 @@ int main(int argc, char *argv[])
{
if (!in_file)
{
- if (strncmp(argv[i], "--", 2))
+ if (!strcmp(argv[i], "--version"))
+ return printVersion();
+ else if (strncmp(argv[i], "--", 2))
in_file = argv[i];
}
else if (!out_file)
@@ -106,4 +127,5 @@ int main(int argc, char *argv[])
return 0;
}
+
/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
commit 85308f9016c7c19fb0e80dc07b8184fe56cf5a31
Author: David Tardon <dtar...@redhat.com>
Date: Sat Dec 26 20:19:37 2015 +0100
simplify dist. and inst. of headers
Change-Id: I453df50bad6be0ca366b281f11742bfa6dad68ce
diff --git a/inc/libmspub/Makefile.am b/inc/libmspub/Makefile.am
index 3d3628c..5a278a5 100644
--- a/inc/libmspub/Makefile.am
+++ b/inc/libmspub/Makefile.am
@@ -1,3 +1,5 @@
-EXTRA_DIST = \
+libmspubdir =
$(includedir)/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@/libmspub
+
+dist_libmspub_HEADERS = \
libmspub.h \
MSPUBDocument.h
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index f54feaa..2573363 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -5,10 +5,6 @@ version_info = -version-info
$(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
endif
lib_LTLIBRARIES = libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@.la
-libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_includedir =
$(includedir)/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@/libmspub
-libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_include_HEADERS = \
- $(top_srcdir)/inc/libmspub/libmspub.h \
- $(top_srcdir)/inc/libmspub/MSPUBDocument.h
AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(ZLIB_CFLAGS)
$(ICU_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBMSPUB_BUILD=1
commit 376db4e42b2aec4ada22e3b95eebd5f00d17081e
Author: David Tardon <dtar...@redhat.com>
Date: Sat Dec 26 20:18:11 2015 +0100
update CREDITS to reflect reality
Change-Id: I0223ebdc4ef03732fe9826b8443143cc545e1d8a
diff --git a/AUTHORS b/AUTHORS
index 6150fe5..5dfa4ab 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,14 +1,18 @@
CREDITS
-Current maintainers and authors of libmspub
----------------------------------------------
-Brennan Vincent (brennan.vinc...@gmail.com)
+Current maintainers
+-------------------
+David Tardon (dtar...@redhat.com)
Fridrich Strba (fridrich.st...@bluewin.ch)
+Retired maintainers
+-------------------
+Brennan Vincent (brennan.vinc...@gmail.com)
+
Contributors
----------------------------------------------
-David Tardon (dtar...@redhat.com)
+------------
+Franz Schmid (fr...@linux-hp-i7.site)
Special thanks
----------------------------------------------
+--------------
Valek Filippov
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
