debian/0000755000000000000000000000000012246632714007175 5ustar debian/README.Debian0000644000000000000000000000040511471304574011234 0ustar XSD for Debian ------------------ Due to name conflicts with mono-1.0-devel the `xsd` application was renamed to `xsdcxx`. The output of `xsdcxx` is the same, including the directories. -- Raphael Bossek Sat, 16 Feb 2008 19:26:38 +0100 debian/copyright0000644000000000000000000001642311471510746011135 0ustar This package was debianized by Raphael Bossek on Sat, 16 Feb 2008 19:26:38 +0100. It was downloaded from http://www.codesynthesis.com/download/xsd/3.2/xsd-3.2.0+dep.tar.bz2 Upstream author(s): CODE SYNTHESIS TOOLS CC B313 Sandown Crescent, Grand National Blvd, Milnerton, 7441 Cape Town South Africa Tel: +27 76 1672134 (9:00 - 18:00 GMT+2) Fax: +27 21 5526869 Email: info@codesynthesis.com Copyright: Copyright (C) 2005-2008 CODE SYNTHESIS TOOLS CC License: This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA In addition, as a special exception, Code Synthesis Tools CC gives permission to link this program with the Xerces-C++ library (or with modified versions of Xerces-C++ that use the same license as Xerces-C++), and distribute linked combinations including the two. You must obey the GNU General Public License version 2 in all respects for all of the code used other than Xerces-C++. If you modify this copy of the program, you may extend this exception to your version of the program, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. In addition, Code Synthesis Tools CC makes a special exception for the Free/Libre and Open Source Software (FLOSS) which is described in the accompanying FLOSSE file. Free/Libre and Open Source Software ("FLOSS") °°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°° 1. Intent We want specified Free/Libre and Open Source Software ("FLOSS") to be able to use the specified GPL-licensed xsd runtime library and xsd generated code (collectively called the "Program") despite the fact that not all FLOSS licenses are compatible with version 2 of the GNU General Public License (the "GPL"). It is our intent to allow distribution of the entire Derivative Work (including the Program) under one or more of the FLOSS licenses listed in section 3 (section 2.a). It is also our intent to disallow simple relicensing of the Program for the sole purpose of using it in proprietary applications (section 2.b and 2.c). As an example, consider two hypothetical scenarios: a) You created a program that uses the xsd generated code and the xsd runtime library to access information in XML instance documents. Your program performs useful computations based on this information (sections 2.b and 2.c are satisfied). You distribute your program, including the xsd generated code and the xsd runtime library under the BSD license and make it available at no charge to all third parties (section 2.a is satisfied). Later you (or someone else) may choose to base their proprietary application on your code since the BSD license does not prohibit it. This scenario falls under this FLOSS Exception. b) You created a library that uses the xsd generated code and the xsd runtime library to access information in XML instance documents. You did not add to the library any other useful code that uses the xsd generated code or the xsd runtime library (neither section 2.b nor 2.c is satisfied). You distribute your library, including the xsd generated code and the xsd runtime library under the BSD license and make it available at no charge to all third parties (section 2.a is satisfied). Later you base your proprietary application on this library since the BSD license does not prohibit it. This scenario does not fall under this FLOSS Exception (neither section 2.b nor 2.c is satisfied). You created the library for the sole purpose of making the xsd generated code and the xsd runtime library available to your proprietary application. 2. Legal Terms and Conditions As a special exception to the terms and conditions of version 2 of the GPL you are free to distribute a verbatim copy of the Program as part of the Derivative Work that is formed from the Program or any part thereof and one or more works (each, a "FLOSS Work") as long as you also meet all of these conditions: a) You must cause the Derivative Work that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of one or more of the licenses listed in section 3. b) The Derivative Work should contain one or more FLOSS Work that can be reasonably considered as derived from the Program or some part thereof. c) The Derivative Work should not contain any part of the Program that cannot be reasonably considered as a base of one or more FLOSS Work. 3. FLOSS License List a) Any license listed in the "GPL-Compatible Free Software Licenses" and the "GPL-Incompatible Free Software Licenses" sections of the License List as published by the Free Software Foundation (FSF): http://www.gnu.org/licenses/license-list.html 4. Definitions Terms used, but not defined, herein shall have the meaning provided in the GPL. Derivative Work means a derivative work under copyright law. 5. Applicability You may choose to redistribute a copy of the Program exclusively under the terms of the GPL by removing the FLOSS Exception notice from that copy of the Program. GNU General Public License version 2 °°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°° This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA The Debian packaging is (C) 2008, Raphael Bossek and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. debian/control0000644000000000000000000000160511472036610010573 0ustar Source: xsd Section: devel Priority: optional Maintainer: Raphael Bossek Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7~), libxerces-c-dev (>= 3.0.0), libboost-date-time-dev, libboost-filesystem-dev, libboost-regex-dev, m4, autotools-dev Standards-Version: 3.9.1 Package: xsdcxx Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Homepage: http://codesynthesis.com Description: XML Data Binding for C++ CodeSynthesis XSD is an open-source, cross-platform W3C XML Schema to C++ data binding compiler. Provided with an XML instance specification (XML Schema), it generates C++ classes that represent the given vocabulary as well as parsing and serialization code. You can then access the data stored in XML using types and functions that semantically correspond to your application domain rather than dealing with intricacies of reading and writing XML. debian/xsdcxx.watch0000644000000000000000000000137111471426266011552 0ustar # Example watch control file for uscan # Rename this file to "watch" and then you can run the "uscan" command # to check for upstream updates and more. # See uscan(1) for format # Compulsory line, this is a version 3 file version=3 # Uncomment to examine a Webpage # #http://www.example.com/downloads.php bkbuild-(.*)\.tar\.gz # Uncomment to examine a Webserver directory #http://www.example.com/pub/bkbuild-(.*)\.tar\.gz # Uncommment to examine a FTP server #ftp://ftp.example.com/pub/bkbuild-(.*)\.tar\.gz debian uupdate # Uncomment to find new files on sourceforge, for debscripts >= 2.9 # http://sf.net/bkbuild/bkbuild-(.*)\.tar\.gz http://codesynthesis.com/download/xsd/(\d+)\.(\d+)/xsd-(\d+)\.(\d+)\.(\d+)+dep.tar.bz2 debian/changelog0000644000000000000000000000660012246632372011051 0ustar xsd (3.3.0.1-1.4) unstable; urgency=medium * Non-maintainer upload. * Stop trying to apply binary git diffs with quilt (closes: #711950). -- Julien Cristau Sun, 01 Dec 2013 14:09:10 +0100 xsd (3.3.0.1-1.3) unstable; urgency=low * Non maintainer upload * Fix build failure with GCC 4.7. -- Matthias Klose Tue, 22 May 2012 16:38:15 +0000 xsd (3.3.0.1-1.2) unstable; urgency=medium * Non-maintainer upload. [ Konstantinos Margaritis ] * debian/patches/boost1.46.patch: - Fix FTBFS against boost1.46 (Closes: #624942). -- Luca Falavigna Tue, 23 Aug 2011 22:06:28 +0200 xsd (3.3.0.1-1.1) unstable; urgency=low * Non-maintainer upload. * Fix build fail on Renesas sh4 (Closes: #606057). Update debian/rules. When architecture of host is sh4, CXXFLAGS was added -mieee option. -- Nobuhiro Iwamatsu Fri, 11 Mar 2011 09:45:12 +0900 xsd (3.3.0.1-1) unstable; urgency=low * Use ASCII encoding instead of UCS-4LE to work around Xerces-C++ bug. Closes: #604256 -- Raphael Bossek Mon, 22 Nov 2010 21:57:58 +0100 xsd (3.3.0-2) unstable; urgency=low * Added autotools-dev build dependency. Closes: #604086 -- Raphael Bossek Sat, 20 Nov 2010 22:28:47 +0100 xsd (3.3.0-1) unstable; urgency=low * New upstream release. Closes: #556724 * Update Automake files at build time. Closes: #536423 -- Raphael Bossek Thu, 18 Nov 2010 21:27:00 +0100 xsd (3.2.0.1-1.1) unstable; urgency=medium * Non-maintainer upload. * Fix FTBFS with new boost (>= 1.37.0) by using the “-mt” suffix for boost libraries since starting with this version, only this variant is available (Closes: #530484): + debian/patches: Add xsd_fix-boost-ftbfs.patch + debian/rules: Apply that patch. * Set urgency to “medium” since this bug affects testing too. -- Cyril Brulebois Sat, 18 Jul 2009 10:51:36 +0200 xsd (3.2.0.1-1) unstable; urgency=low * New upstream version. This version depends on Xerces-C 3.0.0 which is in experimental right now. (Closes: #505837) -- Raphael Bossek Sat, 06 Dec 2008 13:44:38 +0100 xsd (3.1.0.1-2) unstable; urgency=low * Added build dependency on libboost-date-time-dev. -- Raphael Bossek Wed, 18 Jun 2008 06:57:20 +0200 xsd (3.1.0.1-1) unstable; urgency=low * Update libcult to 1.4.1 to support GCC 4.3 (build errors). * Added m4 as build dependency. * Added README.source to confirm with standards version 3.8.0. -- Raphael Bossek Tue, 17 Jun 2008 07:04:15 +0200 xsd (3.1.0-4) unstable; urgency=low * Try to suppress compilation errors by disable not obsolate implementation (as mentioned in error report #482569) (Closes: #485843) -- Raphael Bossek Sun, 15 Jun 2008 21:46:20 +0200 xsd (3.1.0-3) unstable; urgency=low * Removed old build dependency on libxerces25-dev. (Closes: #483965) -- Raphael Bossek Mon, 02 Jun 2008 21:00:43 +0200 xsd (3.1.0-2) unstable; urgency=low * Fixed bulid problem. (Closes: #482569) -- Raphael Bossek Mon, 26 May 2008 12:14:37 +0200 xsd (3.1.0-1) unstable; urgency=low * Initial release (Closes: #479523) -- Raphael Bossek Sat, 16 Feb 2008 19:26:38 +0100 debian/rules0000755000000000000000000000602411536275354010263 0ustar #!/usr/bin/make -f # -*- makefile -*- # Sample debian/rules that uses debhelper. # # This file was originally written by Joey Hess and Craig Small. # As a special exception, when this file is copied by dh-make into a # dh-make output file, you may use that output file without restriction. # This special exception was added by Craig Small in version 0.37 of dh-make. # # Modified to make a template file for a multi-binary package with separated # build-arch and build-indep targets by Bill Allombert 2001 # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 # This has to be exported to make some magic below work. export DH_OPTIONS CWD=$(shell pwd) SRCPKGNAME=$(shell dpkg-parsechangelog | grep-dctrl -s "Source" -n -) SRCPKGVERS=$(shell dpkg-parsechangelog | grep-dctrl -s "Version" -n - | sed -e 's,-.*,,g') ORIGTARGZ=../$(SRCPKGNAME)_$(SRCPKGVERS).orig.tar.gz XSD_ARCHIVE:=$(shell ls -1 xsd-*+dep.tar.bz2) XSD_SRCDIR:=$(CWD)/$(shell ls -1 xsd-*+dep.tar.bz2 | sed -e 's,\.tar.*,,g') # Renesas SH4 needs -mieee option. ifeq ($(DEB_HOST_ARCH_CPU),sh4) export CXXFLAGS += -mieee endif maintainer_origtargz: $(XSD_ARCHIVE) tar -czf $(ORIGTARGZ) *.tar* maintainer_quilt: $(CWD)/xsd-srcdir $(CWD)/xsd-srcdir: $(XSD_ARCHIVE) $(CWD)/debian/patches/_series tar -xjf $(XSD_ARCHIVE) test -d $(XSD_SRCDIR) mv $(XSD_SRCDIR) $(CWD)/xsd-srcdir mv $(CWD)/debian/patches/_series $(CWD)/debian/patches/series test -s $(CWD)/xsd-srcdir/build-0.3/system/config.sub -a -s /usr/share/misc/config.sub && \ cp -vf /usr/share/misc/config.sub $(CWD)/xsd-srcdir/build-0.3/system/config.sub test -s $(CWD)/xsd-srcdir/build-0.3/system/config.guess -a -s /usr/share/misc/config.guess && \ cp -vf /usr/share/misc/config.guess $(CWD)/xsd-srcdir/build-0.3/system/config.guess dh_quilt_patch grep -q "^xsd.git-0ca328cb9026aa53064a147226ef5b296426ea5f.patch" $(CWD)/debian/patches/series && tar -C $(CWD)/xsd-srcdir -xzvf $(CWD)/bug604256.tar.gz %: dh --with quilt --skip-patches --parallel --sourcedirectory=$(CWD)/xsd-srcdir $@ override_dh_auto_configure: maintainer_quilt mv $(CWD)/debian/patches/series $(CWD)/debian/patches/_series override_dh_quilt_patch: $(CWD)/debian/patches/_series override_dh_auto_install: MAKEFLAGS="$$MAKEFLAGS install_prefix=$(CWD)/debian/xsdcxx/usr" $(MAKE) -C $(CWD)/xsd-srcdir -f makefile install mv $(CWD)/debian/xsdcxx/usr/share/doc/xsd $(CWD)/debian/xsdcxx/usr/share/doc/xsdcxx mv $(CWD)/debian/xsdcxx/usr/bin/xsd $(CWD)/debian/xsdcxx/usr/bin/xsdcxx mv $(CWD)/debian/xsdcxx/usr/share/man/man1/xsd.1 $(CWD)/debian/xsdcxx/usr/share/man/man1/xsdcxx.1 rm -rf $(CWD)/debian/xsdcxx/usr/share/doc/libxsd find $(CWD)/debian/xsdcxx \( -name "COPYRIGHT*" -o -name "FLOSSE*" -o -name "LICENSE*" -o -name "GPL*" \) -exec rm -v {} \; override_dh_quilt_unpatch: override_dh_auto_clean override_dh_auto_clean: rm -rf $(CWD)/xsd-srcdir $(CWD)/.pc -mv $(CWD)/debian/patches/series $(CWD)/debian/patches/_series test -f $(CWD)/debian/patches/_series .PHONY: maintainer_origtargz maintainer_quilt override_dh_auto_configure override_dh_auto_clean debian/source/0000755000000000000000000000000011471442234010470 5ustar debian/source/format0000644000000000000000000000001411471442234011676 0ustar 3.0 (quilt) debian/README.source0000644000000000000000000000130111471451511011340 0ustar How to maintain maintainer's changes ------------------------------------ Patches are in debian/patches. You have to edit the debian/rules Makefile to place them in the right context. In order to surrpress patching the (non existing code) by dpkg-source in "3.0 (quilt)" mode, the debian/patches/series file is renamed to _series and back. To create new patches with quilt please start "./debian/rules maintainer_quilt" to prepare the sources. Start editing in "xsd-srcdir" and do not forget that this directory will be removed! The sources are extracted at build time and modified with patches from debian/rules. -- Raphael Bossek Fri, 19 Nov 2010 11:36:47 +0100 debian/patches/0000755000000000000000000000000012246632310010614 5ustar debian/patches/xsd.git-0ca328cb9026aa53064a147226ef5b296426ea5f.patch0000644000000000000000000000320212246632236020500 0ustar From 0ca328cb9026aa53064a147226ef5b296426ea5f Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 22 Nov 2010 19:01:27 +0200 Subject: [PATCH] Use ASCII encoding instead of UCS-4LE to work around Xerces-C++ bug [jcristau: exclude binary diffs, handled by bug604256.tar.gz] --- tests/cxx/tree/encoding/char/utf-8/driver.cxx | 2 +- tests/cxx/tree/encoding/char/utf-8/test.std | Bin 796 -> 239 bytes tests/cxx/tree/encoding/wchar/driver.cxx | 2 +- tests/cxx/tree/encoding/wchar/test.std | Bin 768 -> 269 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cxx/tree/encoding/char/utf-8/driver.cxx b/tests/cxx/tree/encoding/char/utf-8/driver.cxx index 0842203..87e63c7 100644 --- a/xsd-srcdir/xsd/tests/cxx/tree/encoding/char/utf-8/driver.cxx +++ b/xsd-srcdir/xsd/tests/cxx/tree/encoding/char/utf-8/driver.cxx @@ -57,7 +57,7 @@ main (int argc, char* argv[]) xml_schema::namespace_infomap map; map["t"].name = "test"; - root (std::cout, *r, map, "UCS-4LE"); + root (std::cout, *r, map, "ASCII"); } catch (xml_schema::exception const& e) { diff --git a/tests/cxx/tree/encoding/wchar/driver.cxx b/tests/cxx/tree/encoding/wchar/driver.cxx index 22cbfb4..06d0e81 100644 --- a/xsd-srcdir/xsd/tests/cxx/tree/encoding/wchar/driver.cxx +++ b/xsd-srcdir/xsd/tests/cxx/tree/encoding/wchar/driver.cxx @@ -47,7 +47,7 @@ main (int argc, char* argv[]) xml_schema::namespace_infomap map; map[L"t"].name = L"test"; - root (std::cout, *r, map, L"UCS-4LE"); + root (std::cout, *r, map, L"ASCII"); } catch (xml_schema::exception const& e) { -- 1.6.3.3 debian/patches/ftbfs-gcc-4.7.diff0000644000000000000000000004272511757011673013635 0ustar diff -ru xsd-3.3.0+dep/libcult/cult/mm/evptr.hxx xsd-3.3.0-1+dep/libcult/cult/mm/evptr.hxx --- xsd-3.3.0+dep/xsd-srcdir/libcult/cult/mm/evptr.hxx 2010-01-01 13:12:06.000000000 +0200 +++ xsd-3.3.0-1+dep/xsd-srcdir/libcult/cult/mm/evptr.hxx 2012-04-06 13:49:35.000000000 +0200 @@ -70,7 +70,7 @@ Evptr& operator= (Evptr const& ep) { - assign (ep.cp_ ? ep.cp_ : ep.p_, ep.c_); + this->assign (ep.cp_ ? ep.cp_ : ep.p_, ep.c_); return *this; } @@ -79,7 +79,7 @@ Evptr& operator= (Evptr const& ep) { - assign (ep.cp_ ? ep.cp_ : ep.p_, ep.c_); + this->assign (ep.cp_ ? ep.cp_ : ep.p_, ep.c_); return *this; } diff -ru xsd-3.3.0+dep/libcult/cult/mm/shptr.hxx xsd-3.3.0-1+dep/libcult/cult/mm/shptr.hxx --- xsd-3.3.0+dep/xsd-srcdir/libcult/cult/mm/shptr.hxx 2010-01-01 13:12:06.000000000 +0200 +++ xsd-3.3.0-1+dep/xsd-srcdir/libcult/cult/mm/shptr.hxx 2012-04-06 13:49:55.000000000 +0200 @@ -45,7 +45,7 @@ Shptr& operator= (Shptr const& ap) { - assign (ap); + this->assign (ap); return *this; } @@ -53,7 +53,7 @@ Shptr& operator= (Shptr const& ap) { - assign (ap); + this->assign (ap); return *this; } diff -ru xsd-3.3.0+dep/xsd/dist/examples/build/cxx/compilers.make xsd-3.3.0-1+dep/xsd/dist/examples/build/cxx/compilers.make --- xsd-3.3.0+dep/xsd-srcdir/xsd/dist/examples/build/cxx/compilers.make 2010-04-28 08:58:09.000000000 +0200 +++ xsd-3.3.0-1+dep/xsd-srcdir/xsd/dist/examples/build/cxx/compilers.make 2012-04-06 15:25:06.000000000 +0200 @@ -40,6 +40,20 @@ endif endif +# Clang +# +ifeq ($(cxx_id),) +ifeq ($(shell echo '$(cxx_sign)' | sed -e 's/^.* clang .*$$//'),) +cxx_id := clang +endif +endif + +ifeq ($(cxx_id),) +ifeq ($(shell echo '$(cxx_sign)' | sed -e 's/^.* Clang .*$$//'),) +cxx_id := clang +endif +endif + # Sun C++ (CC) # ifeq ($(cxx_id),) diff -ru xsd-3.3.0+dep/xsd/dist/examples/build/cxx/rules.make xsd-3.3.0-1+dep/xsd/dist/examples/build/cxx/rules.make --- xsd-3.3.0+dep/xsd-srcdir/xsd/dist/examples/build/cxx/rules.make 2010-04-28 08:58:09.000000000 +0200 +++ xsd-3.3.0-1+dep/xsd-srcdir/xsd/dist/examples/build/cxx/rules.make 2012-04-06 15:25:06.000000000 +0200 @@ -12,6 +12,11 @@ CXXFLAGS := -W -Wall -O3 endif +# Clang +# +ifeq ($(cxx_id),clang) + CXXFLAGS := -W -O3 +endif # Intel C++ # diff -ru xsd-3.3.0+dep/xsd/libxsd/xsd/cxx/parser/expat/elements.txx xsd-3.3.0-1+dep/xsd/libxsd/xsd/cxx/parser/expat/elements.txx --- xsd-3.3.0+dep/xsd-srcdir/xsd/libxsd/xsd/cxx/parser/expat/elements.txx 2010-04-28 08:58:09.000000000 +0200 +++ xsd-3.3.0-1+dep/xsd-srcdir/xsd/libxsd/xsd/cxx/parser/expat/elements.txx 2012-04-06 15:25:23.000000000 +0200 @@ -594,7 +594,7 @@ { try { - start_element (ns, name, 0); + this->start_element (ns, name, 0); } catch (const schema_exception& e) { @@ -621,7 +621,7 @@ { try { - start_element (ns, name, 0); + this->start_element (ns, name, 0); } catch (const schema_exception& e) { @@ -693,7 +693,7 @@ } ro_string ro_id (id); - start_element (ns, name, &ro_id); + this->start_element (ns, name, &ro_id); } catch (const schema_exception& e) { @@ -713,7 +713,7 @@ try { - attribute (ns, name, value); + this->attribute (ns, name, value); } catch (const schema_exception& e) { @@ -748,7 +748,7 @@ try { - end_element (ns, name); + this->end_element (ns, name); } catch (const schema_exception& e) { @@ -777,7 +777,7 @@ try { - characters (str); + this->characters (str); } catch (const schema_exception& e) { diff -ru xsd-3.3.0+dep/xsd/libxsd/xsd/cxx/parser/non-validating/parser.txx xsd-3.3.0-1+dep/xsd/libxsd/xsd/cxx/parser/non-validating/parser.txx --- xsd-3.3.0+dep/xsd-srcdir/xsd/libxsd/xsd/cxx/parser/non-validating/parser.txx 2010-04-28 08:58:09.000000000 +0200 +++ xsd-3.3.0-1+dep/xsd-srcdir/xsd/libxsd/xsd/cxx/parser/non-validating/parser.txx 2012-04-06 15:25:23.000000000 +0200 @@ -164,15 +164,15 @@ if (ns == xml::bits::xmlns_namespace ()) return; - if (!_attribute_impl (ns, name, value)) - _any_attribute (ns, name, value); + if (!this->_attribute_impl (ns, name, value)) + this->_any_attribute (ns, name, value); } template void simple_content:: _characters (const ro_string& str) { - _characters_impl (str); + this->_characters_impl (str); } @@ -190,15 +190,15 @@ if (s.depth_++ > 0) { if (s.any_) - _start_any_element (ns, name, type); + this->_start_any_element (ns, name, type); else if (s.parser_) s.parser_->_start_element (ns, name, type); } else { - if (!_start_element_impl (ns, name, type)) + if (!this->_start_element_impl (ns, name, type)) { - _start_any_element (ns, name, type); + this->_start_any_element (ns, name, type); s.any_ = true; } else if (s.parser_ != 0) @@ -235,7 +235,7 @@ this->_post_impl (); - if (!_end_element_impl (ns, name)) + if (!this->_end_element_impl (ns, name)) assert (false); } } @@ -246,7 +246,7 @@ if (--s.depth_ > 0) { if (s.any_) - _end_any_element (ns, name); + this->_end_any_element (ns, name); else if (s.parser_) s.parser_->_end_element (ns, name); } @@ -255,10 +255,10 @@ if (s.parser_ != 0 && !s.any_) s.parser_->_post_impl (); - if (!_end_element_impl (ns, name)) + if (!this->_end_element_impl (ns, name)) { s.any_ = false; - _end_any_element (ns, name); + this->_end_any_element (ns, name); } } } @@ -292,14 +292,14 @@ if (s.depth_ > 0) { if (s.any_) - _any_attribute (ns, name, value); + this->_any_attribute (ns, name, value); else if (s.parser_) s.parser_->_attribute (ns, name, value); } else { - if (!_attribute_impl (ns, name, value)) - _any_attribute (ns, name, value); + if (!this->_attribute_impl (ns, name, value)) + this->_any_attribute (ns, name, value); } } @@ -312,14 +312,14 @@ if (s.depth_ > 0) { if (s.any_) - _any_characters (str); + this->_any_characters (str); else if (s.parser_) s.parser_->_characters (str); } else { - if (!_characters_impl (str)) - _any_characters (str); + if (!this->_characters_impl (str)) + this->_any_characters (str); } } diff -ru xsd-3.3.0+dep/xsd/libxsd/xsd/cxx/parser/validating/parser.txx xsd-3.3.0-1+dep/xsd/libxsd/xsd/cxx/parser/validating/parser.txx --- xsd-3.3.0+dep/xsd-srcdir/xsd/libxsd/xsd/cxx/parser/validating/parser.txx 2010-04-28 08:58:09.000000000 +0200 +++ xsd-3.3.0-1+dep/xsd-srcdir/xsd/libxsd/xsd/cxx/parser/validating/parser.txx 2012-04-06 15:25:23.000000000 +0200 @@ -93,8 +93,8 @@ const ro_string& name, const ro_string* type) { - if (!_start_element_impl (ns, name, type)) - _unexpected_element (ns, name); + if (!this->_start_element_impl (ns, name, type)) + this->_unexpected_element (ns, name); } template @@ -102,8 +102,8 @@ _end_element (const ro_string& ns, const ro_string& name) { - if (!_end_element_impl (ns, name)) - _unexpected_element (ns, name); + if (!this->_end_element_impl (ns, name)) + this->_unexpected_element (ns, name); } template @@ -129,16 +129,16 @@ if (ns == xml::bits::xmlns_namespace ()) return; - if (!_attribute_impl (ns, name, value)) - _unexpected_attribute (ns, name, value); + if (!this->_attribute_impl (ns, name, value)) + this->_unexpected_attribute (ns, name, value); } template void empty_content:: _characters (const ro_string& s) { - if (!_characters_impl (s)) - _unexpected_characters (s); + if (!this->_characters_impl (s)) + this->_unexpected_characters (s); } // @@ -218,15 +218,15 @@ if (ns == xml::bits::xmlns_namespace ()) return; - if (!_attribute_impl (ns, name, value)) - _unexpected_attribute (ns, name, value); + if (!this->_attribute_impl (ns, name, value)) + this->_unexpected_attribute (ns, name, value); } template void simple_content:: _characters (const ro_string& str) { - if (!_characters_impl (str)) + if (!this->_characters_impl (str)) { // Mixed content is implemented in the generated code // by overriding _characters_impl and forwarding to @@ -245,7 +245,7 @@ c != C (0x0D) && // carriage return c != C (0x09) && // tab c != C (0x0A)) - _unexpected_characters (str); + this->_unexpected_characters (str); } } } @@ -322,14 +322,14 @@ if (s.depth_++ > 0) { if (s.any_) - _start_any_element (ns, name, type); + this->_start_any_element (ns, name, type); else if (s.parser_) s.parser_->_start_element (ns, name, type); } else { - if (!_start_element_impl (ns, name, type)) - _unexpected_element (ns, name); + if (!this->_start_element_impl (ns, name, type)) + this->_unexpected_element (ns, name); else if (s.parser_ != 0) s.parser_->_pre_impl (); } @@ -364,7 +364,7 @@ this->_post_impl (); - if (!_end_element_impl (ns, name)) + if (!this->_end_element_impl (ns, name)) assert (false); } } @@ -375,7 +375,7 @@ if (--s.depth_ > 0) { if (s.any_) - _end_any_element (ns, name); + this->_end_any_element (ns, name); else if (s.parser_) s.parser_->_end_element (ns, name); } @@ -384,8 +384,8 @@ if (s.parser_ != 0 && !s.any_) s.parser_->_post_impl (); - if (!_end_element_impl (ns, name)) - _unexpected_element (ns, name); + if (!this->_end_element_impl (ns, name)) + this->_unexpected_element (ns, name); } } } @@ -418,14 +418,14 @@ if (s.depth_ > 0) { if (s.any_) - _any_attribute (ns, name, value); + this->_any_attribute (ns, name, value); else if (s.parser_) s.parser_->_attribute (ns, name, value); } else { - if (!_attribute_impl (ns, name, value)) - _unexpected_attribute (ns, name, value); + if (!this->_attribute_impl (ns, name, value)) + this->_unexpected_attribute (ns, name, value); } } @@ -438,13 +438,13 @@ if (s.depth_ > 0) { if (s.any_) - _any_characters (str); + this->_any_characters (str); else if (s.parser_) s.parser_->_characters (str); } else { - if (!_characters_impl (str)) + if (!this->_characters_impl (str)) { // Mixed content is implemented in the generated code // by overriding _characters_impl and forwarding to @@ -463,7 +463,7 @@ c != C (0x0D) && // carriage return c != C (0x09) && // tab c != C (0x0A)) - _unexpected_characters (str); + this->_unexpected_characters (str); } } } diff -ru xsd-3.3.0+dep/xsd/libxsd/xsd/cxx/zc-istream.txx xsd-3.3.0-1+dep/xsd/libxsd/xsd/cxx/zc-istream.txx --- xsd-3.3.0+dep/xsd-srcdir/xsd/libxsd/xsd/cxx/zc-istream.txx 2010-04-28 08:58:09.000000000 +0200 +++ xsd-3.3.0-1+dep/xsd-srcdir/xsd/libxsd/xsd/cxx/zc-istream.txx 2012-04-06 15:25:23.000000000 +0200 @@ -32,7 +32,7 @@ C* b (const_cast (str_.data ())); C* e (b + str_.size ()); - setg (b, b, e); + this->setg (b, b, e); } template --- ./xsd-srcdir/xsd/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.txx.orig 2010-04-28 06:58:09.000000000 +0000 +++ ./xsd-srcdir/xsd/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.txx 2012-05-22 22:18:33.917842573 +0000 @@ -20,7 +20,7 @@ const ro_string& name, const ro_string* type) { - _start_any_element (ns, name, type); + this->_start_any_element (ns, name, type); this->complex_content::context_.top ().any_ = true; return true; } @@ -30,7 +30,7 @@ _end_element_impl (const ro_string& ns, const ro_string& name) { this->complex_content::context_.top ().any_ = false; - _end_any_element (ns, name); + this->_end_any_element (ns, name); return true; } @@ -41,7 +41,7 @@ const ro_string& name, const ro_string& value) { - _any_attribute (ns, name, value); + this->_any_attribute (ns, name, value); return true; } @@ -49,7 +49,7 @@ bool any_type_pskel:: _characters_impl (const ro_string& s) { - _any_characters (s); + this->_any_characters (s); return true; } @@ -60,7 +60,7 @@ bool any_simple_type_pskel:: _characters_impl (const ro_string& s) { - _any_characters (s); + this->_any_characters (s); return true; } } --- ./xsd-srcdir/xsd/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.txx.orig 2012-05-22 22:21:38.117845513 +0000 +++ ./xsd-srcdir/xsd/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.txx 2012-05-22 22:23:05.257848705 +0000 @@ -20,7 +20,7 @@ const ro_string& name, const ro_string* type) { - _start_any_element (ns, name, type); + this->_start_any_element (ns, name, type); this->complex_content::context_.top ().any_ = true; return true; } @@ -30,7 +30,7 @@ _end_element_impl (const ro_string& ns, const ro_string& name) { this->complex_content::context_.top ().any_ = false; - _end_any_element (ns, name); + this->_end_any_element (ns, name); return true; } @@ -41,7 +41,7 @@ const ro_string& name, const ro_string& value) { - _any_attribute (ns, name, value); + this->_any_attribute (ns, name, value); return true; } @@ -49,7 +49,7 @@ bool any_type_pskel:: _characters_impl (const ro_string& s) { - _any_characters (s); + this->_any_characters (s); return true; } @@ -60,7 +60,7 @@ bool any_simple_type_pskel:: _characters_impl (const ro_string& s) { - _any_characters (s); + this->_any_characters (s); return true; } } --- ./xsd-srcdir/xsd/libxsd/xsd/cxx/tree/parsing.txx.orig 2012-05-22 22:25:24.765850825 +0000 +++ ./xsd-srcdir/xsd/libxsd/xsd/cxx/tree/parsing.txx 2012-05-22 22:25:56.645847547 +0000 @@ -299,7 +299,7 @@ if (j != basic_string::npos) { - push_back ( + this->push_back ( traits::create ( basic_string (data + i, j - i), parent, 0, 0)); @@ -309,7 +309,7 @@ { // Last element. // - push_back ( + this->push_back ( traits::create ( basic_string (data + i, size - i), parent, 0, 0)); debian/patches/_series0000644000000000000000000000016212246632310012167 0ustar xsd_xsdcxx-rename.patch xsd.git-0ca328cb9026aa53064a147226ef5b296426ea5f.patch boost1.46.patch ftbfs-gcc-4.7.diff debian/patches/xsd_xsdcxx-rename.patch0000644000000000000000000000771611471440116015314 0ustar Index: work/xsd-srcdir/xsd/documentation/xsd.1 =================================================================== --- work.orig/xsd-srcdir/xsd/documentation/xsd.1 2010-04-22 13:28:43.000000000 +0200 +++ work/xsd-srcdir/xsd/documentation/xsd.1 2010-11-19 10:15:53.824581814 +0100 @@ -1,16 +1,16 @@ .\" Process this file with .\" groff -man -Tascii xsd.1 .\" -.TH XSD 1 "April 2010" "XSD 3.3.0" +.TH XSDCXX 1 "April 2010" "XSD 3.3.0" .SH NAME -xsd \- W3C XML Schema to C++ Compiler +xsdcxx \- W3C XML Schema to C++ Compiler .\" .\" .\" .\"-------------------------------------------------------------------- .SH SYNOPSIS .\"-------------------------------------------------------------------- -.B xsd +.B xsdcxx .I command .B [ .I options @@ -20,19 +20,19 @@ .I file .B ...] .in -.B xsd help +.B xsdcxx help .B [ .I command .B ] .in -.B xsd version +.B xsdcxx version .\" .\" .\" .\"-------------------------------------------------------------------- .SH DESCRIPTION .\"-------------------------------------------------------------------- -.B xsd +.B xsdcxx generates vocabulary-specific, statically-typed C++ mapping from W3C XML Schema definitions. Particular mapping to produce is selected by a .IR command . @@ -96,7 +96,7 @@ .PP .RS .RS 3 -.B xsd help +.B xsdcxx help .I command .RE .PP @@ -203,7 +203,7 @@ with namespace .B http://example.com/hello and you run -.B xsd +.B xsdcxx on this file, then the string in question will be: .B hello.xsd. http://example.com/hello @@ -1877,7 +1877,7 @@ .\" .SH DIAGNOSTICS If the input file is not a valid W3C XML Schema definition, -.B xsd +.B xsdcxx will issue diagnostic messages to .B STDERR and exit with non-zero exit code. Index: work/xsd-srcdir/xsd/documentation/xsd.xhtml =================================================================== --- work.orig/xsd-srcdir/xsd/documentation/xsd.xhtml 2010-02-22 13:38:06.000000000 +0100 +++ work/xsd-srcdir/xsd/documentation/xsd.xhtml 2010-11-19 10:15:11.900404798 +0100 @@ -50,19 +50,19 @@

NAME

-

xsd - W3C XML Schema to C++ Compiler

+

xsdcxx - W3C XML Schema to C++ Compiler

SYNOPSIS

-
xsd command [options] file [file ...]
-
xsd help [command]
-
xsd version
+
xsdcxx command [options] file [file ...]
+
xsdcxx help [command]
+
xsdcxx version

DESCRIPTION

-

xsd generates vocabulary-specific, statically-typed +

xsdcxx generates vocabulary-specific, statically-typed C++ mapping from W3C XML Schema definitions. Particular mapping to produce is selected by a command. Each mapping has a number of mapping-specific options that should @@ -104,7 +104,7 @@

help
Print usage information and exit. Use -

xsd help command

+

xsdcxx help command

for command-specific help.
@@ -174,7 +174,7 @@

For example, if you have file hello.xsd with namespace http://example.com/hello and you run - xsd on this file, then the string in question + xsdcxx on this file, then the string in question will be:

hello.xsd. http://example.com/hello

@@ -1575,7 +1575,7 @@

DIAGNOSTICS

If the input file is not a valid W3C XML Schema definition, - xsd will issue diagnostic messages to STDERR + xsdcxx will issue diagnostic messages to STDERR and exit with non-zero exit code.

BUGS

debian/patches/boost1.46.patch0000644000000000000000000005407311625004062013302 0ustar diff -ruN xsd-3.3.0.1/xsd-srcdir/libxsd-frontend/xsd-frontend/parser.cxx xsd-3.3.0.1.armhf//xsd-srcdir/libxsd-frontend/xsd-frontend/parser.cxx --- xsd-3.3.0.1/xsd-srcdir/libxsd-frontend/xsd-frontend/parser.cxx 2010-04-27 19:31:24.000000000 +0000 +++ xsd-3.3.0.1.armhf//xsd-srcdir/libxsd-frontend/xsd-frontend/parser.cxx 2011-06-07 22:44:07.419986515 +0000 @@ -1274,7 +1274,11 @@ operator () (SemanticGraph::Path const& x, SemanticGraph::Path const& y) const { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 return x.native_file_string () < y.native_file_string (); +#else + return x.string () < y.string (); +#endif } }; @@ -1627,9 +1631,15 @@ friend Boolean operator< (SchemaId const& x, SchemaId const& y) { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 return x.path_.native_file_string () < y.path_.native_file_string () || (x.path_.native_file_string () == y.path_.native_file_string () && x.ns_ < y.ns_); +#else + return x.path_.string () < y.path_.string () + || (x.path_.string () == y.path_.string () + && x.ns_ < y.ns_); +#endif } private: @@ -2376,6 +2386,7 @@ Path path, rel_path, abs_path; try { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 try { path = Path (loc); @@ -2386,6 +2397,10 @@ // path = Path (loc, boost::filesystem::native); } +#else + // The new ABI does not have a fallback native representation + path = Path (loc.c_str()); +#endif if (path.is_complete ()) { @@ -2479,6 +2494,7 @@ Path path, rel_path, abs_path; try { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 try { path = Path (loc); @@ -2489,6 +2505,10 @@ // path = Path (loc, boost::filesystem::native); } +#else + // The new ABI does not have a fallback native representation + path = Path (loc.c_str()); +#endif if (path.is_complete ()) { @@ -4674,9 +4694,14 @@ return true; +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 XSDFrontend::SemanticGraph::Path abs_path ( XML::transcode_to_narrow (e.getLocation ()->getURI ()), boost::filesystem::native); +#else + XSDFrontend::SemanticGraph::Path abs_path ( + XML::transcode_to_narrow (e.getLocation ()->getURI ()).c_str()); +#endif XSDFrontend::SemanticGraph::Path rel_path (ctx_.file (abs_path)); @@ -4729,8 +4754,12 @@ base_ (base), ctx_ (ctx) { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 setSystemId (XML::XMLChString ( String (abs_.native_file_string ())).c_str ()); +#else + setSystemId (XML::XMLChString (String (abs_.string ())).c_str ()); +#endif } virtual Xerces::BinInputStream* @@ -4803,8 +4832,12 @@ // base_uri should be a valid path by now. // +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 Path base (XML::transcode_to_narrow (base_uri), boost::filesystem::native); +#else + Path base (XML::transcode_to_narrow (base_uri).c_str()); +#endif if (prv_id == 0) { @@ -4830,6 +4863,7 @@ { Path path; +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 try { path = Path (path_str); @@ -4840,6 +4874,10 @@ // path = Path (path_str, boost::filesystem::native); } +#else + // The new ABI does not have a fallback native representation + path = Path (path_str.c_str()); +#endif Path base_dir (base.branch_path ()); diff -ruN xsd-3.3.0.1/xsd-srcdir/libxsd-frontend/xsd-frontend/semantic-graph/elements.cxx xsd-3.3.0.1.armhf//xsd-srcdir/libxsd-frontend/xsd-frontend/semantic-graph/elements.cxx --- xsd-3.3.0.1/xsd-srcdir/libxsd-frontend/xsd-frontend/semantic-graph/elements.cxx 2010-04-27 19:31:24.000000000 +0000 +++ xsd-3.3.0.1.armhf//xsd-srcdir/libxsd-frontend/xsd-frontend/semantic-graph/elements.cxx 2011-06-07 19:42:03.919987860 +0000 @@ -342,5 +342,9 @@ std::wostream& operator<< (std::wostream& os, XSDFrontend::SemanticGraph::Path const& path) { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 return os << path.native_file_string ().c_str (); +#else + return os << path.string ().c_str (); +#endif } diff -ruN xsd-3.3.0.1/xsd-srcdir/libxsd-frontend/xsd-frontend/transformations/anonymous.cxx xsd-3.3.0.1.armhf//xsd-srcdir/libxsd-frontend/xsd-frontend/transformations/anonymous.cxx --- xsd-3.3.0.1/xsd-srcdir/libxsd-frontend/xsd-frontend/transformations/anonymous.cxx 2010-04-27 19:31:24.000000000 +0000 +++ xsd-3.3.0.1.armhf//xsd-srcdir/libxsd-frontend/xsd-frontend/transformations/anonymous.cxx 2011-06-07 21:52:00.489986901 +0000 @@ -275,7 +275,11 @@ } catch (SemanticGraph::InvalidPath const&) { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 file_str = file.native_file_string (); +#else + file_str = file.string (); +#endif } String name ( @@ -358,7 +362,11 @@ } catch (SemanticGraph::InvalidPath const&) { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 file_str = file.native_file_string (); +#else + file_str = file.string (); +#endif } } @@ -441,7 +449,11 @@ } catch (SemanticGraph::InvalidPath const&) { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 file_str = file.native_file_string (); +#else + file_str = file.string (); +#endif } String name ( @@ -639,7 +651,11 @@ } catch (SemanticGraph::InvalidPath const&) { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 file_str = file.native_file_string (); +#else + file_str = file.string (); +#endif } String name ( diff -ruN xsd-3.3.0.1/xsd-srcdir/libxsd-frontend/xsd-frontend/transformations/schema-per-type.cxx xsd-3.3.0.1.armhf//xsd-srcdir/libxsd-frontend/xsd-frontend/transformations/schema-per-type.cxx --- xsd-3.3.0.1/xsd-srcdir/libxsd-frontend/xsd-frontend/transformations/schema-per-type.cxx 2010-04-27 19:31:24.000000000 +0000 +++ xsd-3.3.0.1.armhf//xsd-srcdir/libxsd-frontend/xsd-frontend/transformations/schema-per-type.cxx 2011-06-07 21:59:02.199986850 +0000 @@ -167,7 +167,11 @@ try { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 path = Path (file_name); +#else + path = Path (file_name.c_str()); +#endif } catch (InvalidPath const&) { @@ -349,6 +353,7 @@ // NarrowString abs_path; +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 // Try to use the portable representation of the path. If that // fails, fall back to the native representation. // @@ -360,9 +365,17 @@ { abs_path = path.native_file_string (); } +#else + // The new ABI does not have a fallback native representation + abs_path = path.string (); +#endif NarrowString tf (trans_.translate_schema (abs_path)); +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 NarrowString file (tf ? tf : path.leaf ()); +#else + NarrowString file (tf ? tf : path.filename ().string()); +#endif Size p (file.rfind ('.')); NarrowString ext ( @@ -389,7 +402,11 @@ try { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 (*i)->context ().set ("renamed", SemanticGraph::Path (new_name)); +#else + (*i)->context ().set ("renamed", SemanticGraph::Path (new_name.c_str())); +#endif } catch (SemanticGraph::InvalidPath const&) { diff -ruN xsd-3.3.0.1/xsd-srcdir/xsd/xsd/cxx/elements.cxx xsd-3.3.0.1.armhf//xsd-srcdir/xsd/xsd/cxx/elements.cxx --- xsd-3.3.0.1/xsd-srcdir/xsd/xsd/cxx/elements.cxx 2010-04-28 06:58:09.000000000 +0000 +++ xsd-3.3.0.1.armhf//xsd-srcdir/xsd/xsd/cxx/elements.cxx 2011-06-07 19:59:29.719987732 +0000 @@ -326,7 +326,11 @@ } catch (SemanticGraph::InvalidPath const&) { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 pair = path.native_file_string (); +#else + pair = path.string (); +#endif } } diff -ruN xsd-3.3.0.1/xsd-srcdir/xsd/xsd/cxx/parser/elements.cxx xsd-3.3.0.1.armhf//xsd-srcdir/xsd/xsd/cxx/parser/elements.cxx --- xsd-3.3.0.1/xsd-srcdir/xsd/xsd/cxx/parser/elements.cxx 2010-04-28 06:58:09.000000000 +0000 +++ xsd-3.3.0.1.armhf//xsd-srcdir/xsd/xsd/cxx/parser/elements.cxx 2011-06-07 20:02:15.659987711 +0000 @@ -244,7 +244,11 @@ } catch (SemanticGraph::InvalidPath const&) { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 path_str = path.native_file_string (); +#else + path_str = path.string (); +#endif } String inc_path; diff -ruN xsd-3.3.0.1/xsd-srcdir/xsd/xsd/cxx/parser/generator.cxx xsd-3.3.0.1.armhf//xsd-srcdir/xsd/xsd/cxx/parser/generator.cxx --- xsd-3.3.0.1/xsd-srcdir/xsd/xsd/cxx/parser/generator.cxx 2010-04-28 06:58:09.000000000 +0000 +++ xsd-3.3.0.1.armhf//xsd-srcdir/xsd/xsd/cxx/parser/generator.cxx 2011-06-07 20:38:35.129987442 +0000 @@ -552,7 +552,11 @@ { try { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 Path fs_path (path, boost::filesystem::native); +#else + Path fs_path (path.c_str()); +#endif ifs.open (fs_path, std::ios_base::in | std::ios_base::binary); if (!ifs.is_open ()) @@ -638,7 +642,11 @@ { if (NarrowString name = ops.value ()) { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 if (file_path.native_file_string () != name) +#else + if (file_path.string () != name) +#endif generate_xml_schema = false; } } @@ -815,7 +823,11 @@ // Generate code. // +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 NarrowString name (file_path.leaf ()); +#else + NarrowString name (file_path.filename().string()); +#endif NarrowString skel_suffix (ops.value ()); NarrowString impl_suffix (ops.value ()); @@ -921,9 +933,15 @@ cxx_driver_name = cxx_driver_expr.merge (name); } +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 Path hxx_path (hxx_name, boost::filesystem::native); Path ixx_path (ixx_name, boost::filesystem::native); Path cxx_path (cxx_name, boost::filesystem::native); +#else + Path hxx_path (hxx_name.c_str()); + Path ixx_path (ixx_name.c_str()); + Path cxx_path (cxx_name.c_str()); +#endif Path hxx_impl_path; Path cxx_impl_path; @@ -931,9 +949,15 @@ if (impl || driver) { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 hxx_impl_path = Path (hxx_impl_name, boost::filesystem::native); cxx_impl_path = Path (cxx_impl_name, boost::filesystem::native); cxx_driver_path = Path (cxx_driver_name, boost::filesystem::native); +#else + hxx_impl_path = Path (hxx_impl_name.c_str()); + cxx_impl_path = Path (cxx_impl_name.c_str()); + cxx_driver_path = Path (cxx_driver_name.c_str()); +#endif } Path out_dir; @@ -942,7 +966,11 @@ { try { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 out_dir = Path (dir, boost::filesystem::native); +#else + out_dir = Path (dir.c_str()); +#endif } catch (InvalidPath const&) { @@ -1010,7 +1038,11 @@ } unlinks.add (hxx_impl_path); +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 file_list.push_back (hxx_impl_path.native_file_string ()); +#else + file_list.push_back (hxx_impl_path.string ()); +#endif if (!ops.value ()) { @@ -1036,7 +1068,11 @@ } unlinks.add (cxx_impl_path); +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 file_list.push_back (cxx_impl_path.native_file_string ()); +#else + file_list.push_back (cxx_impl_path.string ()); +#endif } if (driver) @@ -1065,7 +1101,11 @@ } unlinks.add (cxx_driver_path); +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 file_list.push_back (cxx_driver_path.native_file_string ()); +#else + file_list.push_back (cxx_driver_path.string ()); +#endif } // Open the skel files. @@ -1081,7 +1121,11 @@ } unlinks.add (hxx_path); +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 file_list.push_back (hxx_path.native_file_string ()); +#else + file_list.push_back (hxx_path.string ()); +#endif if (inline_) { @@ -1094,7 +1138,11 @@ } unlinks.add (ixx_path); +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 file_list.push_back (ixx_path.native_file_string ()); +#else + file_list.push_back (ixx_path.string ()); +#endif } @@ -1109,7 +1157,11 @@ } unlinks.add (cxx_path); +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 file_list.push_back (cxx_path.native_file_string ()); +#else + file_list.push_back (cxx_path.string ()); +#endif } // Print copyright and license. @@ -1168,7 +1220,11 @@ NarrowString guard_prefix (ops.value ()); if (!guard_prefix) +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 guard_prefix = file_path.branch_path ().native_directory_string (); +#else + guard_prefix = file_path.branch_path ().string (); +#endif if (guard_prefix) guard_prefix += '_'; diff -ruN xsd-3.3.0.1/xsd-srcdir/xsd/xsd/cxx/tree/elements.cxx xsd-3.3.0.1.armhf//xsd-srcdir/xsd/xsd/cxx/tree/elements.cxx --- xsd-3.3.0.1/xsd-srcdir/xsd/xsd/cxx/tree/elements.cxx 2010-04-28 06:58:09.000000000 +0000 +++ xsd-3.3.0.1.armhf//xsd-srcdir/xsd/xsd/cxx/tree/elements.cxx 2011-06-07 20:49:27.539987362 +0000 @@ -1312,7 +1312,11 @@ } catch (SemanticGraph::InvalidPath const&) { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 path_str = path.native_file_string (); +#else + path_str = path.string (); +#endif } String inc_path; diff -ruN xsd-3.3.0.1/xsd-srcdir/xsd/xsd/cxx/tree/generator.cxx xsd-3.3.0.1.armhf//xsd-srcdir/xsd/xsd/cxx/tree/generator.cxx --- xsd-3.3.0.1/xsd-srcdir/xsd/xsd/cxx/tree/generator.cxx 2010-04-28 06:58:09.000000000 +0000 +++ xsd-3.3.0.1.armhf//xsd-srcdir/xsd/xsd/cxx/tree/generator.cxx 2011-06-07 21:22:51.169987117 +0000 @@ -773,7 +773,11 @@ { try { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 Path fs_path (path, boost::filesystem::native); +#else + Path fs_path (path.c_str()); +#endif ifs.open (fs_path, std::ios_base::in | std::ios_base::binary); if (!ifs.is_open ()) @@ -939,7 +943,11 @@ { if (NarrowString name = ops.value ()) { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 if (file_path.native_file_string () != name) +#else + if (file_path.string () != name) +#endif generate_xml_schema = false; } } @@ -954,7 +962,11 @@ // Generate code. // +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 NarrowString name (file_path.leaf ()); +#else + NarrowString name (file_path.filename ().string()); +#endif NarrowString hxx_suffix (ops.value ()); NarrowString ixx_suffix (ops.value ()); @@ -1013,9 +1025,15 @@ NarrowString ixx_name (inline_ ? ixx_expr.merge (name) : NarrowString ()); NarrowString fwd_name (forward ? fwd_expr.merge (name) : NarrowString ()); +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 Path hxx_path (hxx_name, boost::filesystem::native); Path ixx_path (ixx_name, boost::filesystem::native); Path fwd_path (fwd_name, boost::filesystem::native); +#else + Path hxx_path (hxx_name.c_str()); + Path ixx_path (ixx_name.c_str()); + Path fwd_path (fwd_name.c_str()); +#endif Paths cxx_paths; if (source) @@ -1041,12 +1059,20 @@ } cxx_paths.push_back ( +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 Path (cxx_expr.merge (part_name), boost::filesystem::native)); +#else + Path (cxx_expr.merge (part_name).c_str())); +#endif } } else cxx_paths.push_back ( +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 Path (cxx_expr.merge (name), boost::filesystem::native)); +#else + Path (cxx_expr.merge (name).c_str())); +#endif } Path out_dir; @@ -1055,7 +1081,11 @@ { try { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 out_dir = Path (dir, boost::filesystem::native); +#else + out_dir = Path (dir.c_str()); +#endif } catch (InvalidPath const&) { @@ -1108,7 +1138,11 @@ } unlinks.add (fwd_path); +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 file_list.push_back (fwd_path.native_file_string ()); +#else + file_list.push_back (fwd_path.string ()); +#endif } @@ -1121,7 +1155,11 @@ } unlinks.add (hxx_path); +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 file_list.push_back (hxx_path.native_file_string ()); +#else + file_list.push_back (hxx_path.string ()); +#endif // IXX @@ -1137,7 +1175,11 @@ } unlinks.add (ixx_path); +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 file_list.push_back (ixx_path.native_file_string ()); +#else + file_list.push_back (ixx_path.string ()); +#endif } @@ -1158,7 +1200,11 @@ } unlinks.add (*i); +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 file_list.push_back (i->native_file_string ()); +#else + file_list.push_back (i->string ()); +#endif cxx.push_back (s); } } @@ -1230,7 +1276,11 @@ NarrowString guard_prefix (ops.value ()); if (!guard_prefix) +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 guard_prefix = file_path.branch_path ().native_directory_string (); +#else + guard_prefix = file_path.branch_path ().string (); +#endif if (guard_prefix) guard_prefix += '_'; diff -ruN xsd-3.3.0.1/xsd-srcdir/xsd/xsd/xsd.cxx xsd-3.3.0.1.armhf//xsd-srcdir/xsd/xsd/xsd.cxx --- xsd-3.3.0.1/xsd-srcdir/xsd/xsd/xsd.cxx 2010-04-28 06:58:09.000000000 +0000 +++ xsd-3.3.0.1.armhf//xsd-srcdir/xsd/xsd/xsd.cxx 2011-06-07 19:55:38.539987759 +0000 @@ -636,7 +636,11 @@ try { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 tu = SemanticGraph::Path (args[i], boost::filesystem::native); +#else + tu = SemanticGraph::Path (args[i]); +#endif } catch (SemanticGraph::InvalidPath const&) { @@ -675,7 +679,11 @@ if (NarrowString name = tree_ops->value ()) { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 if (tu.native_file_string () != name) +#else + if (tu.string () != name) +#endif gen_xml_schema = false; } } @@ -690,7 +698,11 @@ if (NarrowString name = parser_ops->value ()) { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 if (tu.native_file_string () != name) +#else + if (tu.string () != name) +#endif gen_xml_schema = false; } } @@ -827,8 +839,13 @@ { try { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 paths.push_back ( SemanticGraph::Path (args[i], boost::filesystem::native)); +#else + paths.push_back ( + SemanticGraph::Path (args[i])); +#endif } catch (SemanticGraph::InvalidPath const&) { @@ -991,9 +1008,17 @@ try { OutputFileStream ofs; +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 SemanticGraph::Path path (fl); +#else + SemanticGraph::Path path (fl.c_str()); +#endif +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 ofs.open (fl, std::ios_base::out); +#else + ofs.open (fl.c_str(), std::ios_base::out); +#endif if (!ofs.is_open ()) { diff -ruN xsd-3.3.0.1/xsd-srcdir/xsd/xsd/xsd.hxx xsd-3.3.0.1.armhf//xsd-srcdir/xsd/xsd/xsd.hxx --- xsd-3.3.0.1/xsd-srcdir/xsd/xsd/xsd.hxx 2010-04-28 06:58:09.000000000 +0000 +++ xsd-3.3.0.1.armhf//xsd-srcdir/xsd/xsd/xsd.hxx 2011-06-07 19:43:28.609987850 +0000 @@ -38,7 +38,11 @@ { if (!canceled_) { +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 std::remove (file_.native_file_string ().c_str ()); +#else + std::remove (file_.string ().c_str ()); +#endif } } debian/compat0000644000000000000000000000000211471307207010366 0ustar 5