[med-svn] [Git][med-team/libzeep][master] 2 commits: latest changes
Maarten L. Hekkelman
gitlab at salsa.debian.org
Thu Sep 10 12:18:47 BST 2020
Maarten L. Hekkelman pushed to branch master at Debian Med / libzeep
Commits:
c022d69e by Maarten L. Hekkelman at 2020-09-10T13:06:10+02:00
latest changes
- - - - -
785f7976 by Maarten L. Hekkelman at 2020-09-10T13:17:51+02:00
Merge branch 'master' of salsa.debian.org:med-team/libzeep
- - - - -
7 changed files:
- GNUmakefile.in
- changelog
- doc/Jamfile.v2
- lib-http/GNUmakefile.in
- lib-json/GNUmakefile.in
- lib-xml/GNUmakefile.in
- lib-xml/src/xpath.cpp
Changes:
=====================================
GNUmakefile.in
=====================================
@@ -16,10 +16,11 @@ CXXFLAGS = @CXXFLAGS@ @BOOST_CPPFLAGS@
LDFLAGS = @LDFLAGS@ @BOOST_LDFLAGS@
LIBS = @LIBS@
-prefix = @prefix@
+prefix = $(DESTDIR)/@prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@
includedir = @includedir@
+docdir = @docdir@
BOOST_LIBS = program_options
ZEEP_LIBS = http json xml
@@ -82,6 +83,14 @@ lib-$(1):
install-$(1):
+$(MAKE) -C lib-$(1) install
+.PHONY: install-$(1)-lib
+install-$(1)-lib:
+ +$(MAKE) -C lib-$(1) install-lib
+
+.PHONY: install-$(1)-dev
+install-$(1)-dev:
+ +$(MAKE) -C lib-$(1) install-dev
+
lib-$(1): $(OUTPUT_DIR)
endef
@@ -108,7 +117,17 @@ doc:
endif
.PHONY: all
-all: libraries test examples
+all: libraries
+
+.PHONY: install-libs
+install-libs: $(ZEEP_LIBS:%=install-%-lib)
+
+.PHONY: install-dev
+install-dev: $(ZEEP_LIBS:%=install-%-dev)
+
+.PHONY: install-doc
+install-doc: doc
+ cd doc; for f in `find html -type f`; do install -D $$f $(docdir)/libzeep-doc/$$f; done
.PHONY: install
install: $(ZEEP_LIBS:%=install-%)
=====================================
changelog
=====================================
@@ -1,10 +1,3 @@
-Version 5.0.1
-
-- Refactored request, it is now a class and credentials are
- always stored if a valid access-token was detected.
-- A bunch of fixes to make web application work behind a
- reverse proxy.
-
Version 5.0.0
- Total rewrite of about everything
@@ -18,6 +11,10 @@ Version 5.0.0
- Lots of test code added
- Added some real world examples
- Tested with boost 1.65.1 up to 1.73
+- Refactored request, it is now a class and credentials are
+ always stored if a valid access-token was detected.
+- A bunch of fixes to make web application work behind a
+ reverse proxy.
Version 4.0.0
=====================================
doc/Jamfile.v2
=====================================
@@ -1,3 +1,16 @@
+using boostbook
+ : /usr/share/xml/docbook/stylesheet/docbook-xsl/
+ : /usr/share/xml/docbook/schema/dtd/4.2/
+ : /usr/share/boostbook
+ ;
+
+using xsltproc : /usr/bin/xsltproc ;
+
+using doxygen : /usr/bin/doxygen ;
+
+using fop : /usr/bin/fop ;
+
+using quickbook : /usr/bin/quickbook ;
doxygen autodoc
:
=====================================
lib-http/GNUmakefile.in
=====================================
@@ -14,7 +14,7 @@ CXXFLAGS = @CXXFLAGS@ @BOOST_CPPFLAGS@
LDFLAGS = @LDFLAGS@ @LIBS@ @BOOST_LDFLAGS@
LIBS = @LIBS@
-prefix = @prefix@
+prefix = $(DESTDIR)@prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@
includedir = @includedir@
@@ -147,11 +147,18 @@ $(LIB_TARGET): $(OBJECTS)
.PHONY: lib
lib: $(LIB_TARGET)
-.PHONY: install
-install: lib
+.PHONY: install-lib
+install-lib: lib
+ install -d $(libdir)
$(LIBTOOL) --mode=install install $(LIB_TARGET) $(libdir)
+
+.PHONY: install-dev
+install-dev:
for f in $(HEADERS); do install -D ../include/$$f $(includedir)/$$f; done
- install -D $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
+ install -m 644 -D $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
+
+.PHONY: install
+install: install-lib install-dev
-include $(OBJECTS:%.lo=%.d)
=====================================
lib-json/GNUmakefile.in
=====================================
@@ -15,7 +15,7 @@ CXXFLAGS = @CXXFLAGS@ @BOOST_CPPFLAGS@
LDFLAGS = @LDFLAGS@ @LIBS@ @BOOST_LDFLAGS@
LIBS = @LIBS@
-prefix = @prefix@
+prefix = $(DESTDIR)@prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@
includedir = @includedir@
@@ -99,11 +99,18 @@ $(LIB_TARGET): $(OBJECTS)
.PHONY: lib
lib: $(LIB_TARGET)
-.PHONY: install
-install: lib
+.PHONY: install-lib
+install-lib: lib
+ install -d $(libdir)
$(LIBTOOL) --mode=install install $(LIB_TARGET) $(libdir)
+
+.PHONY: install-dev
+install-dev:
for f in $(HEADERS); do install -D ../include/$$f $(includedir)/$$f; done
- install -D $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
+ install -m 644 -D $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
+
+.PHONY: install
+install: install-lib install-dev
-include $(OBJECTS:%.lo=%.d)
=====================================
lib-xml/GNUmakefile.in
=====================================
@@ -14,7 +14,7 @@ CXXFLAGS = @CXXFLAGS@ @BOOST_CPPFLAGS@
LDFLAGS = @LDFLAGS@ @LIBS@ @BOOST_LDFLAGS@
LIBS = @LIBS@
-prefix = @prefix@
+prefix = $(DESTDIR)@prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@
includedir = @includedir@
@@ -101,11 +101,18 @@ $(LIB_TARGET): $(OBJECTS)
.PHONY: lib
lib: $(LIB_TARGET)
-.PHONY: install
-install: lib
+.PHONY: install-lib
+install-lib: lib
+ install -d $(libdir)
$(LIBTOOL) --mode=install install $(LIB_TARGET) $(libdir)
+
+.PHONY: install-dev
+install-dev:
for f in $(HEADERS); do install -D ../include/$$f $(includedir)/$$f; done
- install -D $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
+ install -m 644 -D $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
+
+.PHONY: install
+install: install-lib install-dev
-include $(OBJECTS:%.lo=%.d)
=====================================
lib-xml/src/xpath.cpp
=====================================
@@ -1927,7 +1927,7 @@ std::string xpath_imp::describe_token(Token token)
case xp_NodeType: result << "node type specification"; break;
case xp_OperatorUnion: result << "union operator"; break;
case xp_OperatorAdd: result << "addition operator"; break;
- case xp_OperatorSubstract: result << "substraction operator"; break;
+ case xp_OperatorSubstract: result << "subtraction operator"; break;
case xp_OperatorEqual: result << "equals operator"; break;
case xp_OperatorNotEqual: result << "not-equals operator"; break;
case xp_OperatorLess: result << "less operator"; break;
View it on GitLab: https://salsa.debian.org/med-team/libzeep/-/compare/bf37b58b6d5b3d4b52f2d7e79da4a1d65c97dd37...785f7976a4acaebc9166379788521b4c69ddaa74
--
View it on GitLab: https://salsa.debian.org/med-team/libzeep/-/compare/bf37b58b6d5b3d4b52f2d7e79da4a1d65c97dd37...785f7976a4acaebc9166379788521b4c69ddaa74
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/20200910/c1d454fe/attachment-0001.html>
More information about the debian-med-commit
mailing list