[Libreoffice-commits] libvisio.git: 7 commits - configure.ac src/lib src/test

David Tardon dtardon at redhat.com
Fri Dec 11 04:27:04 PST 2015 

 configure.ac            |   14 ++------------
 src/lib/Makefile.am     |   41 +++++++++++++++--------------------------
 src/test/importtest.cpp |    4 ++++
 3 files changed, 21 insertions(+), 38 deletions(-)

New commits:
commit 91fe658052c2cca6a9781c3df406180075182c17
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Dec 11 13:25:28 2015 +0100

    Werror=effc++
    
    Change-Id: If89c203529602bce6e06033aa9ecdaac94185134

diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp
index 82d27f0..d35eaa6 100644
--- a/src/test/importtest.cpp
+++ b/src/test/importtest.cpp
@@ -149,6 +149,10 @@ xmlDocPtr parse(const char *filename, xmlBufferPtr buffer)
 
 class ImportTest : public CPPUNIT_NS::TestFixture
 {
+  // disable copying
+  ImportTest(const ImportTest &);
+  ImportTest &operator=(const ImportTest &);
+
   CPPUNIT_TEST_SUITE(ImportTest);
   CPPUNIT_TEST(testVsdxMetadataTitle);
   CPPUNIT_TEST(testVsdMetadataTitleMs1252);
commit 57f388c290aa3c39e48d997fa65a7bf8aab652f1
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Dec 11 13:17:42 2015 +0100

    space -> tab
    
    Change-Id: I03156d8fb090db15acd3af989d6b5c0facbf4373

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index fb0284b..7585770 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -108,6 +108,6 @@ MOSTLYCLEANFILES = \
 EXTRA_DIST = \
 	$(BUILT_SOURCES) \
 	tokens.txt \
-    gentoken.pl \
+	gentoken.pl \
 	libvisio.rc \
 	libvisio.rc.in
commit c2a0bbd9e0f95bb2a59f20692338f43e2257016a
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Dec 11 13:17:30 2015 +0100

    BUILD_EXTRA_DIST does not work
    
    Change-Id: Ib1ad01453358bd463f3e098eb1442f7db85cdfc8

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index d11435c..fb0284b 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -109,8 +109,5 @@ EXTRA_DIST = \
 	$(BUILT_SOURCES) \
 	tokens.txt \
     gentoken.pl \
+	libvisio.rc \
 	libvisio.rc.in
-
-# These may be in the builddir too
-BUILD_EXTRA_DIST = \
-	libvisio.rc
commit 7e59bcba921da321688547336fcecaf66b930c9f
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Dec 11 13:16:30 2015 +0100

    avoid explicit object file deps
    
    Change-Id: I3872e63e7b4c368feb2bbd437619abbaa3f52bda

diff --git a/configure.ac b/configure.ac
index 0c64863..38eaf80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,7 @@ dnl ===================================================================
 dnl Check for gperf
 dnl ===================================================================
 AM_MISSING_PROG([GPERF], [gperf])
+AM_MISSING_PROG([PERL], [perl])
 
 # ====================
 # Find additional apps
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 0cc35c7..d11435c 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -20,9 +20,7 @@ AM_CXXFLAGS = \
 	$(LIBVISIO_CXXFLAGS) \
 	$(DEBUG_CXXFLAGS)
 
-generated_files = \
-	$(top_builddir)/src/lib/tokens.h \
-	$(top_builddir)/src/lib/tokenhash.h
+BUILT_SOURCES = tokens.h tokenhash.h
 
 libvisio_ at VSD_MAJOR_VERSION@_ at VSD_MINOR_VERSION@_la_LIBADD  = $(LIBVISIO_LIBS) @LIBVISIO_WIN32_RESOURCE@
 libvisio_ at VSD_MAJOR_VERSION@_ at VSD_MINOR_VERSION@_la_DEPENDENCIES = @LIBVISIO_WIN32_RESOURCE@
@@ -83,25 +81,17 @@ libvisio_ at VSD_MAJOR_VERSION@_ at VSD_MINOR_VERSION@_la_SOURCES = \
 	libvisio_utils.cpp \
 	libvisio_utils.h \
 	libvisio_xml.cpp \
-	libvisio_xml.h \
-	$(generated_files)
+	libvisio_xml.h
 
-VDXParser.lo : $(generated_files)
-VSDXMLParserBase.lo : $(generated_files)
-VSDXMLTokenMap.lo : $(generated_files)
-VSDXParser.lo : $(generated_files)
-VSDXTheme.lo : $(generated_files)
-VSDXMetaData.lo : $(generated_files)
+tokens.h : tokens.gperf
 
-$(top_builddir)/src/lib/tokens.h : $(top_builddir)/src/lib/tokens.gperf
+tokenhash.h : tokens.gperf
+	$(GPERF) --compare-strncmp -C -m 20 tokens.gperf \
+		| $(SED) -e 's/(char\*)0/(char\*)0, 0/g' > tokenhash.h
 
-$(top_builddir)/src/lib/tokenhash.h : $(top_builddir)/src/lib/tokens.gperf
-	$(GPERF) --compare-strncmp -C -m 20 $(top_builddir)/src/lib/tokens.gperf \
-		| $(SED) -e 's/(char\*)0/(char\*)0, 0/g' > $(top_builddir)/src/lib/tokenhash.h
-
-$(top_builddir)/src/lib/tokens.gperf : $(top_srcdir)/src/lib/tokens.txt gentoken.pl
+tokens.gperf : $(top_srcdir)/src/lib/tokens.txt $(top_srcdir)/src/lib/gentoken.pl
 	$(PERL) $(top_srcdir)/src/lib/gentoken.pl $(top_srcdir)/src/lib/tokens.txt \
-		$(top_builddir)/src/lib/tokens.h $(top_builddir)/src/lib/tokens.gperf
+		tokens.h tokens.gperf
 
 if OS_WIN32
 
@@ -111,11 +101,12 @@ if OS_WIN32
 
 endif
 
-MAINTAINERCLEANFILES = \
-	$(generated_files) \
-	$(top_builddir)/src/lib/*.gperf
+MOSTLYCLEANFILES = \
+	$(BUILT_SOURCES) \
+	tokens.gperf
 
 EXTRA_DIST = \
+	$(BUILT_SOURCES) \
 	tokens.txt \
     gentoken.pl \
 	libvisio.rc.in
commit 5d6578867ebe9fe0a83a7b2309f43ab9f1270adf
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Sep 22 12:40:39 2015 +0200

    check for perl too
    
    Change-Id: I559576aef58d8e0321609efb06c845e4ebef6930

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 000a424..0cc35c7 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -100,7 +100,7 @@ $(top_builddir)/src/lib/tokenhash.h : $(top_builddir)/src/lib/tokens.gperf
 		| $(SED) -e 's/(char\*)0/(char\*)0, 0/g' > $(top_builddir)/src/lib/tokenhash.h
 
 $(top_builddir)/src/lib/tokens.gperf : $(top_srcdir)/src/lib/tokens.txt gentoken.pl
-	perl $(top_srcdir)/src/lib/gentoken.pl $(top_srcdir)/src/lib/tokens.txt \
+	$(PERL) $(top_srcdir)/src/lib/gentoken.pl $(top_srcdir)/src/lib/tokens.txt \
 		$(top_builddir)/src/lib/tokens.h $(top_builddir)/src/lib/tokens.gperf
 
 if OS_WIN32
commit e9ef78c7e5313230768ba00f1b0e0cfb4fe0613a
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Sep 22 12:40:14 2015 +0200

    use pre-defined var.
    
    Change-Id: I8fa5769f35ef8de627c46c109bd6241155fd163b

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index c433655..000a424 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -111,8 +111,9 @@ if OS_WIN32
 
 endif
 
-distclean-local :
-	rm -f $(generated_files) $(top_builddir)/src/lib/*.gperf
+MAINTAINERCLEANFILES = \
+	$(generated_files) \
+	$(top_builddir)/src/lib/*.gperf
 
 EXTRA_DIST = \
 	tokens.txt \
commit ac497901123b3efe3c693709700cd432e68a8396
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Sep 22 12:36:29 2015 +0200

    do not require gperf for build from tarball
    
    Change-Id: I10fe90e36d651d5db8264166568d83f832ea5ef6

diff --git a/configure.ac b/configure.ac
index 97944d6..0c64863 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,18 +41,7 @@ AC_PROG_SED
 dnl ===================================================================
 dnl Check for gperf
 dnl ===================================================================
-AC_ARG_VAR(GPERF, [Setting this variable will override the gperf detection])
-AC_PATH_PROG(GPERF, gperf)
-if test -z "$GPERF"; then
-    AC_MSG_ERROR([gperf not found but needed. Install it.])
-fi
-AC_MSG_CHECKING([gperf version])
-if test "`$GPERF --version | $EGREP ^GNU\ gperf | $AWK '{ print $3 }' | cut -d. -f1`" -ge "3"; then
-    AC_MSG_RESULT([OK])
-else
-    AC_MSG_ERROR([too old, you need at least 3.0.0])
-fi
-AC_SUBST(GPERF)
+AM_MISSING_PROG([GPERF], [gperf])
 
 # ====================
 # Find additional apps

More information about the Libreoffice-commits mailing list