[med-svn] [Git][med-team/libzeep][master] 3 commits: New upstream version 5.0.2
Maarten L. Hekkelman
gitlab at salsa.debian.org
Sat Nov 14 08:01:49 GMT 2020
Maarten L. Hekkelman pushed to branch master at Debian Med / libzeep
Commits:
f1de54f5 by Maarten L. Hekkelman at 2020-11-13T20:45:24+01:00
New upstream version 5.0.2
- - - - -
ff2e741d by Maarten L. Hekkelman at 2020-11-13T20:45:28+01:00
Update upstream source from tag 'upstream/5.0.2'
Update to upstream version '5.0.2'
with Debian dir 06be9ad1dc46d37df3d3df62e8f1d3ffe627272e
- - - - -
d5ace6a2 by Maarten L. Hekkelman at 2020-11-13T21:14:59+01:00
for new, unified lib
- - - - -
23 changed files:
- .gitignore
- .travis.yml
- GNUmakefile.in
- configure
- configure.ac
- debian/control
- − debian/libzeep-json5.docs
- − debian/libzeep-xml5.docs
- debian/libzeep-http5.docs → debian/libzeep5.docs
- debian/patches/install-targets
- debian/rules
- examples/http-server-1.cpp
- − lib-http/GNUmakefile.in
- lib-http/test/processor-test.cpp
- − lib-json/GNUmakefile.in
- − lib-json/libzeep-json.pc.in
- lib-json/src/parser.cpp → lib-json/src/json-parser.cpp
- − lib-xml/GNUmakefile.in
- − lib-xml/libzeep-xml.pc.in
- lib-xml/src/parser.cpp → lib-xml/src/xml-parser.cpp
- lib-xml/test/parser-test.cpp
- + libzeep.pc
- lib-http/libzeep-http.pc.in → libzeep.pc.in
Changes:
=====================================
.gitignore
=====================================
@@ -22,4 +22,7 @@ lib/
libzeep-*.pc
examples/bin/
lib-xml/.gdb_history
+tests/
+.libs/
+libzeep.la
.pc/
=====================================
.travis.yml
=====================================
@@ -38,6 +38,7 @@ before_install:
script:
- ./configure
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then gmake; else make; fi
+ - if [ "$TRAVIS_OS_NAME" = "osx" ]; then gmake test; else make test; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then sudo gmake install; else sudo make install; fi
jobs:
=====================================
GNUmakefile.in
=====================================
@@ -12,9 +12,9 @@ SHELL = @SHELL@
firstTarget: all
CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@ @BOOST_CPPFLAGS@
+CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ @BOOST_CPPFLAGS@
LDFLAGS = @LDFLAGS@ @BOOST_LDFLAGS@
-LIBS = @LIBS@
+LIBS = @BOOST_PROGRAM_OPTIONS_LIB@ @BOOST_DATE_TIME_LIB@ @LIBS@
prefix = @prefix@
exec_prefix = @exec_prefix@
@@ -24,11 +24,6 @@ includedir = @includedir@
docdir = @docdir@
pkgconfigdir = $(libdir)/pkgconfig
-BOOST_LIBS = program_options
-ZEEP_LIBS = http json xml
-
-LIBS += $(BOOST_LIBS:%=-lboost_%) $(ZEEP_LIBS:%=-lzeep-%)
-
ifneq "$(CHECK_CONFIG)" ""
GNUmakefile: config.status GNUmakefile.in
@@ -42,6 +37,12 @@ configure: configure.ac
endif
+LIB_NAME = @PACKAGE_NAME@
+LIB_VERSION = @LZ_LT_VERSION@
+LIB_TARGET = $(LIB_NAME).la
+VERSION = @PACKAGE_VERSION@
+DIST_NAME = @PACKAGE_NAME at -@PACKAGE_VERSION@
+
# libtool stuff
LIBTOOL_DEPS = @LIBTOOL_DEPS@
@@ -50,55 +51,98 @@ libtool: $(LIBTOOL_DEPS)
LIBTOOL = $(SHELL) @abs_top_builddir@/libtool
CXXCOMPILE = $(LIBTOOL) --silent --tag=CXX --mode=compile $(CXX) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --silent --tag=CXX --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) --silent --tag=CXX --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -version-info $(LIB_VERSION) -o $@
# main build variables
-CXXFLAGS += -Wall -Wno-multichar
-
-VERSION = @PACKAGE_VERSION@
-DIST_NAME = @PACKAGE_NAME at -@PACKAGE_VERSION@
-
-OUTPUT_DIR ?= ./lib
+CXXFLAGS += -Wall -Wno-multichar -I include
# documentation rules
- at BUILD_DOCS_TRUE@BUILD_DOCS = 1
+BUILD_DOCS = @BUILD_DOCS_TRUE@
BJAM = @BJAM@
-# targets
-
-$(OUTPUT_DIR):
- mkdir -p $(OUTPUT_DIR)
-
-ZEEP_LIB_PARTS = xml json http
+# resource support?
+MRC = @MRC@
-define ZEEPLIB_template =
+VPATH += lib-http/src:lib-json/src:lib-xml/src:lib-http/test:lib-json/test:lib-xml/test
- .PHONY: $(1)_clean
- $(1)_clean:
- +$(MAKE) -C lib-$(1) clean
+# Debug support
- .PHONY: $(1)_test
- $(1)_test: libraries
- +$(MAKE) -C lib-$(1) test
+DEBUG = @DEBUG@
-.PHONY: lib-$(1)
-lib-$(1):
- +$(MAKE) -C lib-$(1) lib
+ifeq "$(DEBUG)" "1"
+DEFINES += DEBUG
+CXXFLAGS += -g -O0
+LDFLAGS += -g
+else
+CXXFLAGS += -O3
+DEFINES += NDEBUG
+endif
-endef
+CXXFLAGS += $(DEFINES:%=-D%)
-$(foreach part,$(ZEEP_LIB_PARTS),$(eval $(call ZEEPLIB_template,$(part))))
+# Objects
-.PHONY: libraries
-libraries: $(ZEEP_LIBS:%=lib-%) | $(OUTPUT_DIR)
+OBJDIR = obj
+ifeq "$(DEBUG)" "1"
+ OBJDIR := $(OBJDIR).dbg
+endif
-.PHONY: test
-test: $(ZEEP_LIB_PARTS:%=%_test)
+$(OBJDIR):
+ mkdir -p $(OBJDIR)
+
+OBJECTS = \
+ $(OBJDIR)/connection.lo \
+ $(OBJDIR)/controller.lo \
+ $(OBJDIR)/controller-rsrc.lo \
+ $(OBJDIR)/crypto.lo \
+ $(OBJDIR)/daemon.lo \
+ $(OBJDIR)/el-processing.lo \
+ $(OBJDIR)/error-handler.lo \
+ $(OBJDIR)/format.lo \
+ $(OBJDIR)/glob.lo \
+ $(OBJDIR)/html-controller.lo \
+ $(OBJDIR)/login-controller.lo \
+ $(OBJDIR)/message-parser.lo \
+ $(OBJDIR)/preforked-server.lo \
+ $(OBJDIR)/reply.lo \
+ $(OBJDIR)/request.lo \
+ $(OBJDIR)/rest-controller.lo \
+ $(OBJDIR)/security.lo \
+ $(OBJDIR)/server.lo \
+ $(OBJDIR)/soap-controller.lo \
+ $(OBJDIR)/tag-processor-v2.lo \
+ $(OBJDIR)/tag-processor.lo \
+ $(OBJDIR)/template-processor.lo \
+ $(OBJDIR)/element.lo \
+ $(OBJDIR)/json-parser.lo \
+ $(OBJDIR)/character-classification.lo \
+ $(OBJDIR)/doctype.lo \
+ $(OBJDIR)/document.lo \
+ $(OBJDIR)/node.lo \
+ $(OBJDIR)/xml-parser.lo \
+ $(OBJDIR)/xpath.lo
+
+-include $(OBJECTS:%.lo=%.d)
+
+$(OBJDIR)/%.lo: %.cpp | $(OBJDIR)
+ @ echo ">>" $<
+ @ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(OBJDIR)/$*.d -c -o $@ $<
+
+$(OBJDIR)/%.o: %.cpp | $(OBJDIR)
+ @ echo ">>" $<
+ @ $(CXX) $(CXXFLAGS) -MT $@ -MD -MP -MF $(OBJDIR)/$*.d -c -o $@ $<
+
+$(LIB_TARGET): $(OBJECTS)
+ $(CXXLINK) -rpath $(libdir) $(OBJECTS) $(LDFLAGS) $(LIBS)
+
+# Example code
.PHONY: examples
-examples: libraries
+examples: $(LIB_TARGET)
+$(MAKE) -C examples all
+# Documentation
+
.PHONY: doc
ifeq "$(BUILD_DOCS)" "1"
doc:
@@ -109,22 +153,21 @@ doc:
endif
.PHONY: all
-all: libraries
+all: $(LIB_TARGET)
+
ifeq "$(BUILD_DOCS)" "1"
all: doc
endif
# Install the libraries
-.PHONY: install-libs
-install-libs: libraries
+.PHONY: install-lib
+install-lib: $(LIB_TARGET)
install -d $(libdir)
- for lib in $(ZEEP_LIB_PARTS); do \
- $(LIBTOOL) --mode=install install lib-$${lib}/libzeep-$${lib}.la $(libdir);\
- done
+ $(LIBTOOL) --mode=install install $(LIB_TARGET) $(libdir);
# Install header files and .pc files
.PHONY: install-dev
-install-dev: libraries
+install-dev: $(LIB_TARGET)
for dir in . ./http ./json ./xml ; do \
install -d $(includedir)/zeep/$${dir}; \
for hdr in include/zeep/$${dir}/*.hpp ; do \
@@ -132,32 +175,79 @@ install-dev: libraries
done; \
done
install -d $(pkgconfigdir)
- for lib in $(ZEEP_LIB_PARTS); do \
- install -m 644 lib-$${lib}/libzeep-$${lib}.pc $(pkgconfigdir)/libzeep-$${lib}.pc; \
- done
+ install -m 644 libzeep.pc $(pkgconfigdir)/libzeep.pc;
+ cd examples; for d in `find . -type d`; do install -d $(docdir)/libzeep-dev/examples/$$d; done
+ cd examples; for f in `find . -type f`; do install -m644 $$f $(docdir)/libzeep-dev/examples/$$f; done
.PHONY: install-doc
install-doc: doc
cd doc; for d in `find html -type d`; do install -d $(docdir)/libzeep-doc/$$d; done
- cd doc; for f in `find html -type f`; do install $$f $(docdir)/libzeep-doc/$$f; done
- mkdir $(DIST_NAME)
- git archive master | tar -x -C $(DIST_NAME)
- cd $(DIST_NAME); tar cvf ../examples.tgz examples/
- install examples.tgz $(docdir)/libzeep-doc/examples.tgz
- rm -rf $(DIST_NAME) examples.tgz
+ cd doc; for f in `find html -type f`; do install -m644 $$f $(docdir)/libzeep-doc/$$f; done
.PHONY: install
-install: install-libs install-dev
+install: install-lib install-dev
ifeq "$(BUILD_DOCS)" "1"
+$(MAKE) install-doc
endif
+# Test rules
+
+tests:
+ mkdir -p tests
+
+$(OBJDIR)/test_rsrc.o: lib-http/test/fragment-file.xhtml
+ $(MRC) -o $@ $<
+
+QUESTIONABLE_XML_TEST_IDS = \
+ ibm-valid-P28-ibm28v02.xml \
+ ibm-valid-P29-ibm29v01.xml \
+ ibm-valid-P29-ibm29v02.xml \
+ ibm-1-1-valid-P03-ibm03v09.xml \
+ rmt-e2e-34 \
+ rmt-e2e-55 \
+ rmt-054 \
+ rmt-ns10-006 \
+ rmt-e3e-13
+
+parser_PARAMS = lib-xml/test/XML-Test-Suite/xmlconf/xmlconf.xml $(QUESTIONABLE_XML_TEST_IDS:%=--questionable=%) --print-ids
+xpath_PARAMS = lib-xml/test/XPath-Test-Suite/xpath-tests.xml
+
+define TEST_template =
+
+-include $$(OBJDIR)/$(1)-test.d
+
+$(1)_OBJECTS = $$(OBJDIR)/client-test-code.o $$(OBJDIR)/$(1)-test.o
+
+ifneq "x$(MRC)" "x"
+$(1)_OBJECTS += $$(OBJDIR)/test_rsrc.o
+endif
+
+tests/$(1)-test: $(LIB_TARGET) $$($(1)_OBJECTS) | tests
+ @ echo ">>> building $(1)-test"
+ @ $(CXX) -o $$@ $$($(1)_OBJECTS) $$(CFLAGS) $$(CXXFLAGS) $(LDFLAGS) -L.libs -lzeep $(LIBS)
+
+.PHONY: $(1)-test
+$(1)-test: tests/$(1)-test
+ LD_LIBRARY_PATH=.libs tests/$(1)-test $$($(1)_PARAMS)
+
+endef
+
+TESTS = unit parser serializer xpath json crypto http processor webapp soap rest
+
+ifneq "x$(MRC)" "x"
+TESTS += rsrc_webapp
+endif
+
+$(foreach part,$(TESTS),$(eval $(call TEST_template,$(part))))
+
+.PHONY: test
+test: $(TESTS:%=%-test)
+
.PHONY: clean
-clean: $(ZEEP_LIB_PARTS:%=%_clean)
- rm -rf lib/*
+clean:
+ rm -rf $(LIB_TARGET) $(OBJDIR) $(DIST_NAME).tgz .libs
$(MAKE) -C examples clean
cd doc; $$(which $(BJAM) > /dev/null) && $(BJAM) clean || echo "No $(BJAM) installed, cannot clean doc"
- rm -f $(DIST_NAME).tgz
.PHONY: dist
dist: doc
@@ -167,6 +257,3 @@ dist: doc
find doc/html -depth | cpio -pd $(DIST_NAME)
tar czf $(DIST_NAME).tgz $(DIST_NAME)
rm -rf $(DIST_NAME)
-
-.PHONY: FORCE
-FORCE:
=====================================
configure
=====================================
@@ -635,7 +635,6 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
-BUILD_DOCS_FALSE
BUILD_DOCS_TRUE
BJAM
FOP
@@ -18139,22 +18138,18 @@ else
fi
-if test "$enable_documentation" = "yes" && test "$DOXYGEN" = "nodoxygen" -o "$QUICKBOOX" = "noquickbook" -o "$XSLTPROC" = "noxsltproc" -o "$FOP" = "nofop" -o "$BJAM" = "nobjam"; then :
+if test "$enable_documentation" = "yes"; then :
+
+ if test "$DOXYGEN" = "nodoxygen" -o "$QUICKBOOX" = "noquickbook" -o "$XSLTPROC" = "noxsltproc" -o "$FOP" = "nofop" -o "$BJAM" = "nobjam"; then :
as_fn_error $? "could not find the tools necessary to build the documentation" "$LINENO" 5
fi
- if test "$enable_documentation" = "yes"; then
- BUILD_DOCS_TRUE=
- BUILD_DOCS_FALSE='#'
-else
- BUILD_DOCS_TRUE='#'
- BUILD_DOCS_FALSE=
-fi
+ BUILD_DOCS_TRUE=1
-BUILD_DIR="$abs_top_builddir"
+fi
-ac_config_files="$ac_config_files GNUmakefile lib-xml/GNUmakefile lib-json/GNUmakefile lib-http/GNUmakefile lib-xml/libzeep-xml.pc lib-json/libzeep-json.pc lib-http/libzeep-http.pc"
+ac_config_files="$ac_config_files GNUmakefile libzeep.pc"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -18301,10 +18296,6 @@ LIBOBJS=$ac_libobjs
LTLIBOBJS=$ac_ltlibobjs
-if test -z "${BUILD_DOCS_TRUE}" && test -z "${BUILD_DOCS_FALSE}"; then
- as_fn_error $? "conditional \"BUILD_DOCS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
@@ -19258,12 +19249,7 @@ do
case $ac_config_target in
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"GNUmakefile") CONFIG_FILES="$CONFIG_FILES GNUmakefile" ;;
- "lib-xml/GNUmakefile") CONFIG_FILES="$CONFIG_FILES lib-xml/GNUmakefile" ;;
- "lib-json/GNUmakefile") CONFIG_FILES="$CONFIG_FILES lib-json/GNUmakefile" ;;
- "lib-http/GNUmakefile") CONFIG_FILES="$CONFIG_FILES lib-http/GNUmakefile" ;;
- "lib-xml/libzeep-xml.pc") CONFIG_FILES="$CONFIG_FILES lib-xml/libzeep-xml.pc" ;;
- "lib-json/libzeep-json.pc") CONFIG_FILES="$CONFIG_FILES lib-json/libzeep-json.pc" ;;
- "lib-http/libzeep-http.pc") CONFIG_FILES="$CONFIG_FILES lib-http/libzeep-http.pc" ;;
+ "libzeep.pc") CONFIG_FILES="$CONFIG_FILES libzeep.pc" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
=====================================
configure.ac
=====================================
@@ -35,7 +35,7 @@ AC_ARG_VAR([DEBUG], [Build a debug version of the library])
AC_ARG_VAR([MRC], [Specify a location for the mrc executable])
-dnl We really want to use mrc
+dnl We really like to use mrc
if test "x$MRC" = "x"; then
AC_PATH_PROG([MRC], [mrc])
fi
@@ -98,18 +98,15 @@ AC_PATH_TOOL([XSLTPROC], [xsltproc], [noxsltproc])
AC_PATH_TOOL([FOP], [fop], [nofop])
AC_PATH_TOOL([BJAM], [bjam], [nobjam])
-AS_IF([test "$enable_documentation" = "yes" && test "$DOXYGEN" = "nodoxygen" -o "$QUICKBOOX" = "noquickbook" -o "$XSLTPROC" = "noxsltproc" -o "$FOP" = "nofop" -o "$BJAM" = "nobjam"],
- [AC_MSG_ERROR([could not find the tools necessary to build the documentation])])
-
-AM_CONDITIONAL([BUILD_DOCS], [[test "$enable_documentation" = "yes"]])
+AS_IF([test "$enable_documentation" = "yes"],
+ [
+ AS_IF([test "$DOXYGEN" = "nodoxygen" -o "$QUICKBOOX" = "noquickbook" -o "$XSLTPROC" = "noxsltproc" -o "$FOP" = "nofop" -o "$BJAM" = "nobjam"],
+ [AC_MSG_ERROR([could not find the tools necessary to build the documentation])])
-BUILD_DIR="$abs_top_builddir"
+ BUILD_DOCS_TRUE=1
+ AC_SUBST(BUILD_DOCS_TRUE)
+])
dnl Process Makefile.in to create Makefile
AC_OUTPUT([GNUmakefile
- lib-xml/GNUmakefile
- lib-json/GNUmakefile
- lib-http/GNUmakefile
- lib-xml/libzeep-xml.pc
- lib-json/libzeep-json.pc
- lib-http/libzeep-http.pc])
+ libzeep.pc])
=====================================
debian/control
=====================================
@@ -11,6 +11,7 @@ Build-Depends: debhelper-compat (= 13),
libboost-date-time-dev,
libboost-system-dev,
libboost-tools-dev,
+ mrc,
doxygen,
docbook-website,
xsltproc,
@@ -70,11 +71,11 @@ Description: Documentation for libzeep
This specific package contains the documentation you can use to develop new
software using libzeep.
-Package: libzeep-xml5
+Package: libzeep5
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends}
-Description: XML Library file for libzeep
+Description: Library file for libzeep
Libzeep is a C++ library providing a validating XML parser, XML DOM tree
implementation, XPath 1.0 support and code to create SOAP/REST servers as
well as a full web application framework.
@@ -88,46 +89,4 @@ Description: XML Library file for libzeep
C++ methods as web services. And there's a full web application framework to
create dynamic web sites in C++ and XHTML.
.
- This package contains the shared library for XML processing only.
-
-Package: libzeep-json5
-Architecture: any
-Depends: ${misc:Depends},
- ${shlibs:Depends}
-Description: JSON Library file for libzeep
- Libzeep is a C++ library providing a validating XML parser, XML DOM tree
- implementation, XPath 1.0 support and code to create SOAP/REST servers as
- well as a full web application framework.
- .
- libzeep was originally designed to create SOAP servers in C++ easily. The
- current incarnation provides a full validating XML parser creating a DOM tree
- that can be iterated using STL container like methods. The tree can be searched
- using XPath 1.0 queries.
- .
- There's also code to create SOAP and REST servers based allowing to export
- C++ methods as web services. And there's a full web application framework to
- create dynamic web sites in C++ and XHTML.
- .
- This package contains the shared library for JSON processing only.
-
-Package: libzeep-http5
-Architecture: any
-Depends: ${misc:Depends},
- ${shlibs:Depends},
- libzeep-xml5 (= ${binary:Version}),
- libzeep-json5 (= ${binary:Version})
-Description: HTTP Library file for libzeep
- Libzeep is a C++ library providing a validating XML parser, XML DOM tree
- implementation, XPath 1.0 support and code to create SOAP/REST servers as
- well as a full web application framework.
- .
- libzeep was originally designed to create SOAP servers in C++ easily. The
- current incarnation provides a full validating XML parser creating a DOM tree
- that can be iterated using STL container like methods. The tree can be searched
- using XPath 1.0 queries.
- .
- There's also code to create SOAP and REST servers based allowing to export
- C++ methods as web services. And there's a full web application framework to
- create dynamic web sites in C++ and XHTML.
- .
- This package contains the shared library for the web application part.
+ This package contains the shared library only.
=====================================
debian/libzeep-json5.docs deleted
=====================================
@@ -1 +0,0 @@
-README.md
=====================================
debian/libzeep-xml5.docs deleted
=====================================
@@ -1 +0,0 @@
-README.md
=====================================
debian/libzeep-http5.docs → debian/libzeep5.docs
=====================================
=====================================
debian/patches/install-targets
=====================================
@@ -5,139 +5,29 @@ Forwarded: not-needed
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
-@@ -12,11 +12,11 @@
- firstTarget: all
-
- CXX = @CXX@
--CXXFLAGS = @CXXFLAGS@ @BOOST_CPPFLAGS@
-+CXXFLAGS = $(CPPFLAGS) @CXXFLAGS@ @BOOST_CPPFLAGS@
+@@ -16,7 +16,7 @@
LDFLAGS = @LDFLAGS@ @BOOST_LDFLAGS@
- LIBS = @LIBS@
+ LIBS = @BOOST_PROGRAM_OPTIONS_LIB@ @BOOST_DATE_TIME_LIB@ @LIBS@
-prefix = @prefix@
+prefix = $(DESTDIR)@prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@
datarootdir = @datarootdir@
-@@ -85,6 +85,19 @@
- lib-$(1):
- +$(MAKE) -C lib-$(1) lib
-
-+.PHONY: install-$(1)-so
-+install-$(1)-so:
+@@ -163,11 +163,15 @@
+ .PHONY: install-lib
+ install-lib: $(LIB_TARGET)
+ install -d $(libdir)
+- $(LIBTOOL) --mode=install install $(LIB_TARGET) $(libdir);
++ $(LIBTOOL) --mode=install install $(LIB_TARGET) $(libdir)
++ rm -f $(libdir)/libzeep.so $(libdir)/libzeep.so.5 $(libdir)/libzeep.a $(libdir)/libzeep.la
+
+ # Install header files and .pc files
+ .PHONY: install-dev
+ install-dev: $(LIB_TARGET)
+ install -d $(libdir)
-+ install lib-$(1)/.libs/libzeep-$(1).so.5.0.0 $(libdir)
-+ cd $(libdir); ln -s -f libzeep-$(1).so.5.0.0 libzeep-$(1).so.5
-+
-+.PHONY: install-$(1)-dev
-+install-$(1)-dev:
-+ install -d $(libdir)
-+ $(LIBTOOL) --mode=install install lib-$(1)/libzeep-$(1).la $(libdir);
-+ rm $(libdir)/libzeep-$(1).so.5.0.0
-+ rm $(libdir)/libzeep-$(1).so.5
-+
- endef
-
- $(foreach part,$(ZEEP_LIB_PARTS),$(eval $(call ZEEPLIB_template,$(part))))
-@@ -140,11 +153,6 @@
- install-doc: doc
- cd doc; for d in `find html -type d`; do install -d $(docdir)/libzeep-doc/$$d; done
- cd doc; for f in `find html -type f`; do install $$f $(docdir)/libzeep-doc/$$f; done
-- mkdir $(DIST_NAME)
-- git archive master | tar -x -C $(DIST_NAME)
-- cd $(DIST_NAME); tar cvf ../examples.tgz examples/
-- install examples.tgz $(docdir)/libzeep-doc/examples.tgz
-- rm -rf $(DIST_NAME) examples.tgz
-
- .PHONY: install
- install: install-libs install-dev
---- a/lib-http/GNUmakefile.in
-+++ b/lib-http/GNUmakefile.in
-@@ -14,7 +14,7 @@
- LDFLAGS = @LDFLAGS@ @LIBS@ @BOOST_LDFLAGS@
- LIBS = @LIBS@
-
--prefix = @prefix@
-+prefix = $(DESTDIR)@prefix@
- exec_prefix = @exec_prefix@
- libdir = @libdir@
- includedir = @includedir@
-@@ -131,12 +131,10 @@
- -include $(OBJECTS:%.lo=%.d)
-
- $(OBJDIR)/%.lo: %.cpp | $(OBJDIR)
-- @ echo ">>" $<
-- @ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(OBJDIR)/$*.d -c -o $@ $<
-+ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(OBJDIR)/$*.d -c -o $@ $<
-
- $(OBJDIR)/%.o: %.cpp | $(OBJDIR)
-- @ echo ">>" $<
-- @ $(CXX) $(CXXFLAGS) -MT $@ -MD -MP -MF $(OBJDIR)/$*.d -c -o $@ $<
-+ $(CXX) $(CXXFLAGS) -MT $@ -MD -MP -MF $(OBJDIR)/$*.d -c -o $@ $<
-
- .PHONY: clean
- clean:
-@@ -162,8 +160,7 @@
- endif
-
- test/$(1)-test: lib $$($(1)_OBJECTS)
-- @ echo ">>> building $(1)-test"
-- @ $(CXX) -o $$@ $$($(1)_OBJECTS) $$(CFLAGS) $$(CXXFLAGS) $(LDFLAGS) -L../lib $(ZEEP_LIBS:%=-lzeep-%) $(BOOST_LIBS:%=-lboost_%) $(LIBS)
-+ $(CXX) -o $$@ $$($(1)_OBJECTS) $$(CFLAGS) $$(CXXFLAGS) $(LDFLAGS) -L../lib $(ZEEP_LIBS:%=-lzeep-%) $(BOOST_LIBS:%=-lboost_%) $(LIBS)
-
- .PHONY: $(1)-test
- $(1)-test: test/$(1)-test
---- a/lib-json/GNUmakefile.in
-+++ b/lib-json/GNUmakefile.in
-@@ -92,12 +92,10 @@
- -include $(OBJECTS:%.lo=%.d)
-
- $(OBJDIR)/%.lo: %.cpp | $(OBJDIR)
-- @ echo ">>" $<
-- @ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(OBJDIR)/$*.d -c -o $@ $<
-+ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(OBJDIR)/$*.d -c -o $@ $<
-
- $(OBJDIR)/%.o: %.cpp | $(OBJDIR)
-- @ echo ">>" $<
-- @ $(CXX) $(CXXFLAGS) -MT $@ -MD -MP -MF $(OBJDIR)/$*.d -c -o $@ $<
-+ $(CXX) $(CXXFLAGS) -MT $@ -MD -MP -MF $(OBJDIR)/$*.d -c -o $@ $<
-
- .PHONY: clean
- clean:
-@@ -115,8 +113,7 @@
- $(1)_OBJECTS = $$(OBJDIR)/$(1)-test.o
-
- test/$(1)-test: lib $$($(1)_OBJECTS)
-- @ echo ">>> building $(1)-test"
-- @ $(CXX) -o $$@ $$($(1)_OBJECTS) $$(CFLAGS) $$(CXXFLAGS) $(LDFLAGS) -L../lib $(ZEEP_LIBS:%=-lzeep-%) $(BOOST_LIBS:%=-lboost_%) $(LIBS)
-+ $(CXX) -o $$@ $$($(1)_OBJECTS) $$(CFLAGS) $$(CXXFLAGS) $(LDFLAGS) -L../lib $(ZEEP_LIBS:%=-lzeep-%) $(BOOST_LIBS:%=-lboost_%) $(LIBS)
-
- .PHONY: $(1)-test
- $(1)-test: test/$(1)-test
---- a/lib-xml/GNUmakefile.in
-+++ b/lib-xml/GNUmakefile.in
-@@ -98,12 +98,10 @@
- -include $(OBJECTS:%.lo=%.d)
-
- $(OBJDIR)/%.lo: %.cpp | $(OBJDIR)
-- @ echo ">>" $<
-- @ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(OBJDIR)/$*.d -c -o $@ $<
-+ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(OBJDIR)/$*.d -c -o $@ $<
-
- $(OBJDIR)/%.o: %.cpp | $(OBJDIR)
-- @ echo ">>" $<
-- @ $(CXX) $(CXXFLAGS) -MT $@ -MD -MP -MF $(OBJDIR)/$*.d -c -o $@ $<
-+ $(CXX) $(CXXFLAGS) -MT $@ -MD -MP -MF $(OBJDIR)/$*.d -c -o $@ $<
-
- .PHONY: clean
- clean:
-@@ -133,8 +131,7 @@
- $(1)_OBJECTS = $$(OBJDIR)/$(1)-test.o
-
- test/$(1)-test: lib $$($(1)_OBJECTS)
-- @ echo ">>> building $(1)-test"
-- @ $(CXX) -o $$@ $$($(1)_OBJECTS) $$(CFLAGS) $$(CXXFLAGS) $(LDFLAGS) -L../lib $(ZEEP_LIBS:%=-lzeep-%) $(BOOST_LIBS:%=-lboost_%) $(LIBS)
-+ $(CXX) -o $$@ $$($(1)_OBJECTS) $$(CFLAGS) $$(CXXFLAGS) $(LDFLAGS) -L../lib $(ZEEP_LIBS:%=-lzeep-%) $(BOOST_LIBS:%=-lboost_%) $(LIBS)
-
- .PHONY: $(1)-test
- $(1)-test: test/$(1)-test
++ $(LIBTOOL) --mode=install install $(LIB_TARGET) $(libdir)
++ rm -f $(libdir)/libzeep.so.5.0.0
+ for dir in . ./http ./json ./xml ; do \
+ install -d $(includedir)/zeep/$${dir}; \
+ for hdr in include/zeep/$${dir}/*.hpp ; do \
=====================================
debian/rules
=====================================
@@ -14,11 +14,8 @@ override_dh_auto_configure:
dh_auto_configure -- --enable-shared --enable-documentation
override_dh_auto_install:
- $(MAKE) DESTDIR=$(CURDIR)/debian/libzeep-json5 install-json-so
- $(MAKE) DESTDIR=$(CURDIR)/debian/libzeep-http5 install-http-so
- $(MAKE) DESTDIR=$(CURDIR)/debian/libzeep-xml5 install-xml-so
- $(MAKE) DESTDIR=$(CURDIR)/debian/libzeep-dev \
- install-json-dev install-http-dev install-xml-dev install-dev
+ $(MAKE) DESTDIR=$(CURDIR)/debian/libzeep5 install-lib
+ $(MAKE) DESTDIR=$(CURDIR)/debian/libzeep-dev install-dev
$(MAKE) DESTDIR=$(CURDIR)/debian/libzeep-doc install-doc
override_dh_auto_test:
=====================================
examples/http-server-1.cpp
=====================================
@@ -1,7 +1,3 @@
-/* compile:
-clang++ -o http-server-1 http-server-1.cpp -I ~/projects/boost_1_73_0 -DWEBAPP_USES_RESOURCES -I. -fPIC -pthread -std=c++17 -Wall -g -DDEBUG -I ../../include/ -L ../../lib -lzeep-http -lzeep-xml -lzeep-json dummy_rsrc.o -lstdc++fs
-*/
-
//[ simple_http_server
#include <zeep/http/server.hpp>
#include <zeep/http/controller.hpp>
=====================================
lib-http/GNUmakefile.in deleted
=====================================
@@ -1,185 +0,0 @@
-# Makefile for the libzeep-http library
-#
-# Copyright Maarten L. Hekkelman, UMC St. Radboud 2008-2013.
-# Copyright Maarten L. Hekkelman, 2014-2019
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-.PHONY: firstTarget
-firstTarget: lib
-
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@ @BOOST_CPPFLAGS@
-LDFLAGS = @LDFLAGS@ @LIBS@ @BOOST_LDFLAGS@
-LIBS = @LIBS@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-libdir = @libdir@
-includedir = @includedir@
-pkgconfigdir = $(libdir)/pkgconfig
-
-LIB_NAME = @PACKAGE_NAME at -http
-LIB_VERSION = @LZ_LT_VERSION@
-LIB_TARGET = $(LIB_NAME).la
-STAGE_DIR = @abs_top_builddir@/lib
-
-ifneq "$(CHECK_CONFIG)" ""
-
-GNUmakefile: ../config.status GNUmakefile.in
- cd ..; $(SHELL) ./config.status
-
-../config.status: ../configure
- cd ..; $(SHELL) ./config.status --recheck
-
-../configure: ../configure.ac
- cd ..; autoconf
-
-endif
-
-$(LIB_NAME).pc: $(LIB_NAME).pc.in GNUmakefile
- cd ..; $(SHELL) ./config.status lib-http/$(LIB_NAME).pc
-
-# libtool stuff
-
-LIBTOOL = $(SHELL) @abs_top_builddir@/libtool
-CXXCOMPILE = $(LIBTOOL) --silent --tag=CXX --mode=compile $(CXX) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --silent --tag=CXX --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -version-info $(LIB_VERSION) -o $@
-
-# main build variables
-CXXFLAGS += -I. -I ../include/
-WARNINGS += all no-multichar
-
-# Use the DEBUG flag to build debug versions of the code
-DEBUG = @DEBUG@
-
-# resource support?
-MRC = @MRC@
-ifneq "x$(MRC)" "x"
-USE_RSRC = 1
-DEFINES += USE_RSRC WEBAPP_USES_RESOURCES
-else
-USE_RSRC = 0
-endif
-
-ifeq "$(DEBUG)" "1"
-DEFINES += DEBUG
-CXXFLAGS += -g -O0
-LDFLAGS += -g
-else
-CXXFLAGS += -O3
-DEFINES += NDEBUG
-endif
-
-# targets
-
-VPATH += src:test
-
-CXXFLAGS += $(DEFINES:%=-D%)
-CXXFLAGS += $(WARNINGS:%=-W%)
-
-OBJDIR = obj
-ifeq "$(DEBUG)" "1"
- OBJDIR := $(OBJDIR).dbg
-endif
-
-$(OBJDIR):
- mkdir -p $(OBJDIR)
-
-OBJECTS = \
- $(OBJDIR)/connection.lo \
- $(OBJDIR)/controller.lo \
- $(OBJDIR)/crypto.lo \
- $(OBJDIR)/daemon.lo \
- $(OBJDIR)/el-processing.lo \
- $(OBJDIR)/error-handler.lo \
- $(OBJDIR)/format.lo \
- $(OBJDIR)/glob.lo \
- $(OBJDIR)/html-controller.lo \
- $(OBJDIR)/login-controller.lo \
- $(OBJDIR)/message-parser.lo \
- $(OBJDIR)/preforked-server.lo \
- $(OBJDIR)/reply.lo \
- $(OBJDIR)/request.lo \
- $(OBJDIR)/rest-controller.lo \
- $(OBJDIR)/security.lo \
- $(OBJDIR)/server.lo \
- $(OBJDIR)/soap-controller.lo \
- $(OBJDIR)/tag-processor-v2.lo \
- $(OBJDIR)/tag-processor.lo \
- $(OBJDIR)/template-processor.lo
-
-ifneq ($(USE_RSRC),0)
-OBJECTS += \
- $(OBJDIR)/controller-rsrc.lo
-
-$(OBJDIR)/controller-rsrc.lo: src/mrsrc.h
-
-src/mrsrc.h:
- $(MRC) --header > $@
-
-endif
-
-$(LIB_TARGET): $(OBJECTS)
- $(CXXLINK) -rpath $(libdir) $(OBJECTS) $(LIBS)
- $(LIBTOOL) --mode=install cp $@ $(STAGE_DIR)
-
-.PHONY: lib
-lib: $(LIB_TARGET) $(LIB_NAME).pc
-
--include $(OBJECTS:%.lo=%.d)
-
-$(OBJDIR)/%.lo: %.cpp | $(OBJDIR)
- @ echo ">>" $<
- @ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(OBJDIR)/$*.d -c -o $@ $<
-
-$(OBJDIR)/%.o: %.cpp | $(OBJDIR)
- @ echo ">>" $<
- @ $(CXX) $(CXXFLAGS) -MT $@ -MD -MP -MF $(OBJDIR)/$*.d -c -o $@ $<
-
-.PHONY: clean
-clean:
- rm -rf $(OBJDIR)/* $(LIB_TARGET) .libs ../lib/$(LIB_NAME)* $(LIB_NAME).pc
-
-$(OBJDIR)/test_rsrc.o: test/fragment-file.xhtml src/mrsrc.h
- $(MRC) -o $@ $<
-
-http_PARAMS =
-webapp_PARAMS =
-
-ZEEP_LIBS = http xml json
-BOOST_LIBS = system
-
-define TEST_template =
-
--include $$(OBJDIR)/$(1)-test.d
-
-$(1)_OBJECTS = $$(OBJDIR)/client-test-code.o $$(OBJDIR)/$(1)-test.o
-
-ifneq ($(USE_RSRC),0)
-$(1)_OBJECTS += $$(OBJDIR)/test_rsrc.o
-endif
-
-test/$(1)-test: lib $$($(1)_OBJECTS)
- @ echo ">>> building $(1)-test"
- @ $(CXX) -o $$@ $$($(1)_OBJECTS) $$(CFLAGS) $$(CXXFLAGS) $(LDFLAGS) -L../lib $(ZEEP_LIBS:%=-lzeep-%) $(BOOST_LIBS:%=-lboost_%) $(LIBS)
-
-.PHONY: $(1)-test
-$(1)-test: test/$(1)-test
- cd test; LD_LIBRARY_PATH=$(STAGE_DIR) ./$(1)-test $$($(1)_PARAMS)
-
-endef
-
-TESTS = crypto http processor webapp soap rest
-
-ifneq ($(USE_RSRC),0)
-TESTS += rsrc_webapp
-endif
-
-$(foreach part,$(TESTS),$(eval $(call TEST_template,$(part))))
-
-.PHONY: test
-test: $(TESTS:%=%-test)
-
-FORCE:
=====================================
lib-http/test/processor-test.cpp
=====================================
@@ -8,12 +8,14 @@
using namespace std;
+#define DOCROOT "./lib-http/test/"
+
using json = zeep::json::element;
using namespace zeep::xml::literals;
void process_and_compare(zeep::xml::document& a, zeep::xml::document& b, const zeep::http::scope& scope = {})
{
- zeep::http::template_processor p;
+ zeep::http::template_processor p(DOCROOT);
zeep::http::tag_processor_v2 tp;
tp.process_xml(a.child(), scope, "", p);
@@ -376,7 +378,7 @@ BOOST_AUTO_TEST_CASE(test_14)
</data>
)"_xml;
- zeep::http::template_processor p;
+ zeep::http::template_processor p(DOCROOT);
zeep::http::tag_processor_v2 tp;
zeep::http::request req("GET", "/", { 1, 0 }, { { "Accept-Language", "nl, en-US;q=0.7, en;q=0.3" }}, "");
@@ -411,7 +413,7 @@ BOOST_AUTO_TEST_CASE(test_15)
</data>
)"_xml;
- zeep::http::template_processor p;
+ zeep::http::template_processor p(DOCROOT);
zeep::http::tag_processor_v2 tp;
zeep::http::request req("GET", "/", { 1, 0 }, { { "Accept-Language", "da, en-US;q=0.7, en;q=0.3" }}, "");
@@ -652,7 +654,7 @@ BOOST_AUTO_TEST_CASE(test_22)
BOOST_AUTO_TEST_CASE(test_22a)
{
- zeep::http::template_processor p;
+ zeep::http::template_processor p(DOCROOT);
zeep::xml::document doc1;
p.load_template("fragment-file :: frag1", doc1);
=====================================
lib-json/GNUmakefile.in deleted
=====================================
@@ -1,134 +0,0 @@
-# Makefile for the libzeep-json library
-#
-# Copyright Maarten L. Hekkelman, UMC St. Radboud 2008-2013.
-# Copyright Maarten L. Hekkelman, 2014-2019
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-.PHONY: firstTarget
-firstTarget: lib
-
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@ @BOOST_CPPFLAGS@
-LDFLAGS = @LDFLAGS@ @LIBS@ @BOOST_LDFLAGS@
-LIBS = @BOOST_DATE_TIME_LIB@ @LIBS@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-libdir = @libdir@
-includedir = @includedir@
-pkgconfigdir = $(libdir)/pkgconfig
-
-LIB_NAME = @PACKAGE_NAME at -json
-LIB_VERSION = @LZ_LT_VERSION@
-LIB_TARGET = $(LIB_NAME).la
-STAGE_DIR = @abs_top_builddir@/lib
-
-ifneq "$(CHECK_CONFIG)" ""
-
-GNUmakefile: ../config.status GNUmakefile.in
- cd ..; $(SHELL) ./config.status
-
-../config.status: ../configure
- cd ..; $(SHELL) ./config.status --recheck
-
-../configure: ../configure.ac
- cd ..; autoconf
-
-endif
-
-$(LIB_NAME).pc: $(LIB_NAME).pc.in GNUmakefile
- cd ..; $(SHELL) ./config.status lib-json/$(LIB_NAME).pc
-
-# libtool stuff
-
-LIBTOOL = $(SHELL) @abs_top_builddir@/libtool
-CXXCOMPILE = $(LIBTOOL) --silent --tag=CXX --mode=compile $(CXX) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --silent --tag=CXX --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -version-info $(LIB_VERSION) -o $@
-
-# main build variables
-CXXFLAGS += -I. -I ../include/
-WARNINGS += all no-multichar
-
-# Use the DEBUG flag to build debug versions of the code
-DEBUG = @DEBUG@
-
-ifeq "$(DEBUG)" "1"
-DEFINES += DEBUG
-CXXFLAGS += -g -O0
-LDFLAGS += -g
-else
-CXXFLAGS += -O3
-DEFINES += NDEBUG
-endif
-
-# targets
-
-VPATH += src:test
-
-CXXFLAGS += $(DEFINES:%=-D%)
-CXXFLAGS += $(WARNINGS:%=-W%)
-
-OBJDIR = obj
-ifeq "$(DEBUG)" "1"
- OBJDIR := $(OBJDIR).dbg
-endif
-
-$(OBJDIR):
- mkdir -p $(OBJDIR)
-
-OBJECTS = \
- $(OBJDIR)/element.lo \
- $(OBJDIR)/parser.lo
-
-$(LIB_TARGET): $(OBJECTS)
- $(CXXLINK) -rpath $(libdir) $(OBJECTS) $(LIBS)
- $(LIBTOOL) --mode=install cp $@ $(STAGE_DIR)
-
-.PHONY: lib
-lib: $(LIB_TARGET) $(LIB_NAME).pc
-
--include $(OBJECTS:%.lo=%.d)
-
-$(OBJDIR)/%.lo: %.cpp | $(OBJDIR)
- @ echo ">>" $<
- @ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(OBJDIR)/$*.d -c -o $@ $<
-
-$(OBJDIR)/%.o: %.cpp | $(OBJDIR)
- @ echo ">>" $<
- @ $(CXX) $(CXXFLAGS) -MT $@ -MD -MP -MF $(OBJDIR)/$*.d -c -o $@ $<
-
-.PHONY: clean
-clean:
- rm -rf $(OBJDIR)/* $(LIB_TARGET) .libs ../lib/$(LIB_NAME)* $(LIB_NAME).pc
-
-json_PARAMS =
-
-ZEEP_LIBS = xml json
-BOOST_LIBS =
-
-define TEST_template =
-
--include $$(OBJDIR)/$(1)-test.d
-
-$(1)_OBJECTS = $$(OBJDIR)/$(1)-test.o
-
-test/$(1)-test: lib $$($(1)_OBJECTS)
- @ echo ">>> building $(1)-test"
- @ $(CXX) -o $$@ $$($(1)_OBJECTS) $$(CFLAGS) $$(CXXFLAGS) $(LDFLAGS) -L../lib $(ZEEP_LIBS:%=-lzeep-%) $(BOOST_LIBS:%=-lboost_%) $(LIBS)
-
-.PHONY: $(1)-test
-$(1)-test: test/$(1)-test
- cd test; LD_LIBRARY_PATH=$(STAGE_DIR) ./$(1)-test $$($(1)_PARAMS)
-
-endef
-
-TESTS = json
-$(foreach part,$(TESTS),$(eval $(call TEST_template,$(part))))
-
-.PHONY: test
-test: $(TESTS:%=%-test)
-
-FORCE:
-
=====================================
lib-json/libzeep-json.pc.in deleted
=====================================
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libzeep-xml
-Description: C++ json library
-Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lzeep-json
-Cflags: -I${includedir}
=====================================
lib-json/src/parser.cpp → lib-json/src/json-parser.cpp
=====================================
=====================================
lib-xml/GNUmakefile.in deleted
=====================================
@@ -1,156 +0,0 @@
-# Makefile for the libzeep-xml library
-#
-# Copyright Maarten L. Hekkelman, UMC St. Radboud 2008-2013.
-# Copyright Maarten L. Hekkelman, 2014-2019
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-.PHONY: firstTarget
-firstTarget: lib
-
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@ @BOOST_CPPFLAGS@
-LDFLAGS = @LDFLAGS@ @LIBS@ @BOOST_LDFLAGS@
-LIBS = @LIBS@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-libdir = @libdir@
-includedir = @includedir@
-pkgconfigdir = $(libdir)/pkgconfig
-
-LIB_NAME = @PACKAGE_NAME at -xml
-LIB_VERSION = @LZ_LT_VERSION@
-LIB_TARGET = $(LIB_NAME).la
-STAGE_DIR = @abs_top_builddir@/lib
-
-ifneq "$(CHECK_CONFIG)" ""
-
-GNUmakefile: ../config.status GNUmakefile.in
- cd ..; $(SHELL) ./config.status
-
-../config.status: ../configure
- cd ..; $(SHELL) ./config.status --recheck
-
-../configure: ../configure.ac
- cd ..; autoconf
-
-endif
-
-
-$(LIB_NAME).pc: $(LIB_NAME).pc.in GNUmakefile
- cd ..; $(SHELL) ./config.status lib-xml/$(LIB_NAME).pc
-
-# libtool stuff
-
-LIBTOOL = $(SHELL) @abs_top_builddir@/libtool
-CXXCOMPILE = $(LIBTOOL) --silent --tag=CXX --mode=compile $(CXX) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --silent --tag=CXX --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -version-info $(LIB_VERSION) -o $@
-LT_EXEC = $(LIBTOOL) --silent --mode=execute
-
-# main build variables
-CXXFLAGS += -I. -I ../include/
-WARNINGS += all no-multichar
-
-# Use the DEBUG flag to build debug versions of the code
-DEBUG = @DEBUG@
-
-ifeq "$(DEBUG)" "1"
-DEFINES += DEBUG
-CXXFLAGS += -g -O0
-LDFLAGS += -g
-else
-CXXFLAGS += -O3
-DEFINES += NDEBUG
-endif
-
-# targets
-
-VPATH += src:test
-
-CXXFLAGS += $(DEFINES:%=-D%)
-CXXFLAGS += $(WARNINGS:%=-W%)
-
-OBJDIR = obj
-ifeq "$(DEBUG)" "1"
- OBJDIR := $(OBJDIR).dbg
-endif
-
-$(OBJDIR):
- mkdir -p $(OBJDIR)
-
-OBJECTS = \
- $(OBJDIR)/character-classification.lo \
- $(OBJDIR)/doctype.lo \
- $(OBJDIR)/document.lo \
- $(OBJDIR)/node.lo \
- $(OBJDIR)/parser.lo \
- $(OBJDIR)/xpath.lo
-
-$(LIB_TARGET): $(OBJECTS)
- $(CXXLINK) -rpath $(libdir) $(OBJECTS) $(LIBS)
- $(LIBTOOL) --mode=install cp $@ $(STAGE_DIR)
-
-.PHONY: lib
-lib: $(LIB_TARGET) $(LIB_NAME).pc
-
--include $(OBJECTS:%.lo=%.d)
-
-$(OBJDIR)/%.lo: %.cpp | $(OBJDIR)
- @ echo ">>" $<
- @ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(OBJDIR)/$*.d -c -o $@ $<
-
-$(OBJDIR)/%.o: %.cpp | $(OBJDIR)
- @ echo ">>" $<
- @ $(CXX) $(CXXFLAGS) -MT $@ -MD -MP -MF $(OBJDIR)/$*.d -c -o $@ $<
-
-.PHONY: clean
-clean:
- rm -rf $(OBJDIR)/* $(LIB_TARGET) .libs ../lib/$(LIB_NAME)* $(LIB_NAME).pc
-
-QUESTIONABLE_XML_TEST_IDS = \
- ibm-valid-P28-ibm28v02.xml \
- ibm-valid-P29-ibm29v01.xml \
- ibm-valid-P29-ibm29v02.xml \
- ibm-1-1-valid-P03-ibm03v09.xml \
- rmt-e2e-34 \
- rmt-e2e-55 \
- rmt-054 \
- rmt-ns10-006 \
- rmt-e3e-13
-
-parser_PARAMS = XML-Test-Suite/xmlconf/xmlconf.xml $(QUESTIONABLE_XML_TEST_IDS:%=--questionable=%) --print-ids
-xpath_PARAMS = XPath-Test-Suite/xpath-tests.xml
-
-ZEEP_LIBS = xml
-BOOST_LIBS = program_options
-
-define TEST_template =
-
--include $$(OBJDIR)/$(1)-test.d
-
-$(1)_OBJECTS = $$(OBJDIR)/$(1)-test.o
-
-test/$(1)-test: lib $$($(1)_OBJECTS)
- @ echo ">>> building $(1)-test"
- @ $(CXX) -o $$@ $$($(1)_OBJECTS) $$(CFLAGS) $$(CXXFLAGS) $(LDFLAGS) -L../lib $(ZEEP_LIBS:%=-lzeep-%) $(BOOST_LIBS:%=-lboost_%) $(LIBS)
-
-.PHONY: $(1)-test
-$(1)-test: test/$(1)-test
- cd test; LD_LIBRARY_PATH=../.libs ./$(1)-test $$($(1)_PARAMS)
-
-endef
-
-test/XML-Test-Suite/xmlconf/xmlconf.xml: test/XML-Test-Suite.tbz
- cd test; tar xf XML-Test-Suite.tbz
-
-parser-test: test/XML-Test-Suite/xmlconf/xmlconf.xml
-
-TESTS = unit parser serializer xpath
-$(foreach part,$(TESTS),$(eval $(call TEST_template,$(part))))
-
-.PHONY: test
-test: $(TESTS:%=%-test)
-
-FORCE:
=====================================
lib-xml/libzeep-xml.pc.in deleted
=====================================
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libzeep-xml
-Description: C++ xml library
-Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lzeep-xml
-Cflags: -I${includedir}
=====================================
lib-xml/src/parser.cpp → lib-xml/src/xml-parser.cpp
=====================================
=====================================
lib-xml/test/parser-test.cpp
=====================================
@@ -367,6 +367,7 @@ int main(int argc, char* argv[])
("single", po::value<string>(), "Test a single XML file")
("dump", po::value<string>(), "Dump the structure of a single XML file")
("print-ids", "Print the ID's of failed tests")
+ ("conf", po::value<string>(), "Configuration file")
;
po::positional_options_description p;
@@ -420,7 +421,6 @@ int main(int argc, char* argv[])
}
else
{
-
fs::path xmlconfFile("XML-Test-Suite/xmlconf/xmlconf.xml");
if (vm.count("test"))
xmlconfFile = vm["test"].as<string>();
=====================================
libzeep.pc
=====================================
@@ -0,0 +1,10 @@
+prefix=/usr/local
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: libzeep
+Description: C++ library for building web applications
+Version: 5.0
+Libs: -L${libdir} -lzeep
+Cflags: -I${includedir}
=====================================
lib-http/libzeep-http.pc.in → libzeep.pc.in
=====================================
@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
-Name: libzeep-xml
+Name: libzeep
Description: C++ library for building web applications
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lzeep-http -lzeep-json -lzeep-xml
+Libs: -L${libdir} -lzeep
Cflags: -I${includedir}
View it on GitLab: https://salsa.debian.org/med-team/libzeep/-/compare/2ba743fcb2757eaeb8d7229d3ed8010e238aa43e...d5ace6a2ed056781eeef7842d2c9588244c4f404
--
View it on GitLab: https://salsa.debian.org/med-team/libzeep/-/compare/2ba743fcb2757eaeb8d7229d3ed8010e238aa43e...d5ace6a2ed056781eeef7842d2c9588244c4f404
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20201114/5e80e932/attachment-0001.html>
More information about the debian-med-commit
mailing list