Compare commits
25 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
a88025b3d5 | ||
|
|
1123d4df46 | ||
|
|
2da2e59c20 | ||
|
|
c75752635c | ||
| 77e736049c | |||
|
23e442c471 | ||
|
|
9205086268 | ||
|
|
207e4e7264 | ||
|
|
2fcbf08fff | ||
|
|
713b3cd8dd | ||
|
|
3988030007 | ||
|
|
cff905e207 | ||
| 6635cb669b | |||
|
|
a24e356658 | ||
|
|
9cf2ce70c6 | ||
|
ebfb97eab8 | ||
|
5f201fafd6 | ||
|
|
e1b10a0eb3 | ||
|
|
ad5162f1c4 | ||
|
|
25d3267276 | ||
| 096a19a102 | |||
| 107a78250f | |||
| 5f7c286eec | |||
|
|
214dc792ff | ||
|
b0d34a73cd |
5 changed files with 128 additions and 122 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -2,3 +2,4 @@
|
|||
/xsd-3.3.0-1+dep.tar.bz2
|
||||
/xsd-3.3.0-2+dep.tar.bz2
|
||||
/xsd-4.0.0+dep.tar.bz2
|
||||
/xsd-4.1.0.a11+dep.tar.bz2
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (xsd-4.0.0+dep.tar.bz2) = 1b7f5f7a50007e0c739e23c46cf34657845038c3c58f2da4f9978a9486a30674d829e4dfe428af32669207af79375eb8d413ac471c4ffd1c2bc842411f454ae9
|
||||
SHA512 (xsd-4.1.0.a11+dep.tar.bz2) = aee71228511f4eb33132389e91cd15f974ce2384bb1658e61ff502320d5a0c26ce092d2a296facb817906be712c9f661df6baccc4a4f1c25b9b36238c7290f59
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ Index: xsd/doc/xsd.1
|
|||
.\" Process this file with
|
||||
.\" groff -man -Tascii xsd.1
|
||||
.\"
|
||||
-.TH XSD 1 "July 2014" "XSD 4.0.0"
|
||||
+.TH XSDCXX 1 "July 2014" "XSDCXX 4.0.0"
|
||||
-.TH XSD 1 "July 2014" "XSD 4.1.0"
|
||||
+.TH XSDCXX 1 "July 2014" "XSDCXX 4.1.0"
|
||||
.SH NAME
|
||||
-xsd \- W3C XML Schema to C++ Compiler
|
||||
+xsdcxx \- W3C XML Schema to C++ Compiler
|
||||
|
|
@ -60,20 +60,21 @@ Index: xsd/doc/xsd.1
|
|||
.I command
|
||||
.RE
|
||||
.PP
|
||||
@@ -133,9 +133,9 @@
|
||||
@@ -127,10 +127,10 @@
|
||||
uses \fBstd::unique_ptr\fR instead of deprecated \fBstd::auto_ptr\fR\.
|
||||
|
||||
When the C++11 mode is selected, you normally don't need to perform any
|
||||
extra steps other than enable C++11 in your C++ compiler, if required\. The
|
||||
-XSD compiler will automatically add the necessary macro defines to the
|
||||
-generated header files that will switch the header-only XSD runtime library
|
||||
-(\fBlibxsd\fP) to the C++11 mode\. However, if you include any of the XSD
|
||||
+XSDCXX compiler will automatically add the necessary macro defines to the
|
||||
+generated header files that will switch the header-only XSDCXX runtime library
|
||||
+(\fBlibxsd\fP) to the C++11 mode\. However, if you include any of the XSDCXX
|
||||
When the C++11 mode is selected, you normally don't need to perform any extra
|
||||
-steps other than enable C++11 in your C++ compiler, if required\. The XSD
|
||||
+steps other than enable C++11 in your C++ compiler, if required\. The XSDCXX
|
||||
compiler will automatically add the necessary macro defines to the generated
|
||||
-header files that will switch the header-only XSD runtime library
|
||||
-(\fBlibxsd\fR) to the C++11 mode\. However, if you include any of the XSD
|
||||
+header files that will switch the header-only XSDCXX runtime library
|
||||
+(\fBlibxsd\fR) to the C++11 mode\. However, if you include any of the XSDCXX
|
||||
runtime headers directly in your application (normally you just include the
|
||||
generated headers), then you will need to define the \fBXSD_CXX11\fP macro
|
||||
for your entire project\.
|
||||
@@ -1632,7 +1632,7 @@
|
||||
generated headers), then you will need to define the \fBXSD_CXX11\fR macro for
|
||||
your entire project\.
|
||||
@@ -1461,7 +1461,7 @@
|
||||
.\"
|
||||
.SH DIAGNOSTICS
|
||||
If the input file is not a valid W3C XML Schema definition,
|
||||
|
|
@ -90,17 +91,17 @@ Index: xsd/doc/xsd.xhtml
|
|||
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
|
||||
|
||||
<head>
|
||||
- <title>XSD 4.0.0 Compiler Command Line Manual</title>
|
||||
+ <title>XSDCXX 4.0.0 Compiler Command Line Manual</title>
|
||||
- <title>XSD 4.1.0 Compiler Command Line Manual</title>
|
||||
+ <title>XSDCXX 4.1.0 Compiler Command Line Manual</title>
|
||||
|
||||
<meta name="copyright" content="© 2005-2014 Code Synthesis Tools CC"/>
|
||||
<meta name="copyright" content="© 2005-2017 Code Synthesis Tools CC"/>
|
||||
<meta name="keywords" content="xsd,xml,schema,c++,mapping,data,binding,code,generator,manual,man,page"/>
|
||||
- <meta name="description" content="XSD Compiler Command Line Manual"/>
|
||||
+ <meta name="description" content="XSDCXX Compiler Command Line Manual"/>
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="default.css" />
|
||||
|
||||
@@ -50,19 +50,19 @@
|
||||
@@ -52,19 +52,19 @@
|
||||
|
||||
<h1>NAME</h1>
|
||||
|
||||
|
|
@ -125,30 +126,30 @@ Index: xsd/doc/xsd.xhtml
|
|||
C++ mapping from W3C XML Schema definitions. Particular mapping to
|
||||
produce is selected by a <code><i>command</i></code>. Each mapping has
|
||||
a number of mapping-specific <code><i>options</i></code> that should
|
||||
@@ -138,10 +138,10 @@
|
||||
@@ -134,10 +134,10 @@
|
||||
|
||||
<p>When the C++11 mode is selected, you normally don't need to perform any
|
||||
extra steps other than enable C++11 in your C++ compiler, if required. The
|
||||
- XSD compiler will automatically add the necessary macro defines to the
|
||||
- generated header files that will switch the header-only XSD runtime library
|
||||
+ XSDCXX compiler will automatically add the necessary macro defines to the
|
||||
+ generated header files that will switch the header-only XSDCXX runtime library
|
||||
(<code><b>libxsd</b></code>) to the C++11 mode. However, if you include any
|
||||
- of the XSD runtime headers directly in your application (normally you just
|
||||
+ of the XSDCXX runtime headers directly in your application (normally you just
|
||||
include the generated headers), then you will need to define the
|
||||
<code><b>XSD_CXX11</b></code> macro for your entire project.</p></dd>
|
||||
<p>When the C++11 mode is selected, you normally don't need to perform any
|
||||
extra steps other than enable C++11 in your C++ compiler, if required. The
|
||||
- XSD compiler will automatically add the necessary macro defines to the
|
||||
- generated header files that will switch the header-only XSD runtime
|
||||
+ XSDCXX compiler will automatically add the necessary macro defines to the
|
||||
+ generated header files that will switch the header-only XSDCXX runtime
|
||||
library (<code><b>libxsd</b></code>) to the C++11 mode. However, if you
|
||||
- include any of the XSD runtime headers directly in your application
|
||||
+ include any of the XSDCXX runtime headers directly in your application
|
||||
(normally you just include the generated headers), then you will need to
|
||||
define the <code><b>XSD_CXX11</b></code> macro for your entire
|
||||
project.</p></dd>
|
||||
@@ -218,7 +218,7 @@
|
||||
|
||||
@@ -219,7 +219,7 @@
|
||||
<p>For example, if you have file <code><b>hello.xsd</b></code> with
|
||||
namespace <code><b>http://example.com/hello</b></code> and you run
|
||||
- <code><b>xsd</b></code> on this file, then the string in question will
|
||||
+ <code><b>xsdcxx</b></code> on this file, then the string in question will
|
||||
be:</p>
|
||||
|
||||
<p>For example, if you have file <code><b>hello.xsd</b></code> with
|
||||
namespace <code><b>http://example.com/hello</b></code> and you run
|
||||
- <code><b>xsd</b></code> on this file, then the string in question will
|
||||
+ <code><b>xsdcxx</b></code> on this file, then the string in question will
|
||||
be:</p>
|
||||
|
||||
<p><code><b>hello.xsd. http://example.com/hello</b></code></p>
|
||||
@@ -1530,7 +1530,7 @@
|
||||
<p><code><b>hello.xsd. http://example.com/hello</b></code></p>
|
||||
@@ -1564,7 +1564,7 @@
|
||||
<h1>DIAGNOSTICS</h1>
|
||||
|
||||
<p>If the input file is not a valid W3C XML Schema definition,
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
## Fix bug in C++/Parser Expat Support http://scm.codesynthesis.com/?p=xsd/xsd.git;a=commitdiff;h=94cba986108a0e0f42295572ca42c356d59328d7
|
||||
### Author Boris Kolpackov <boris@codesynthesis.com>
|
||||
## Thu, 24 Jul 2014 11:40:01 +0100 (12:40 +0200)
|
||||
### Committer Boris Kolpackov <boris@codesynthesis.com>
|
||||
## Thu, 24 Jul 2014 11:40:01 +0100 (12:40 +0200)
|
||||
--- xsd/libxsd/xsd/cxx/parser/expat/elements.hxx
|
||||
+++ xsd/libxsd/xsd/cxx/parser/expat/elements.hxx
|
||||
@@ -51,7 +51,9 @@ namespace xsd
|
||||
}
|
||||
};
|
||||
|
||||
- typedef std::unique_ptr<XML_ParserStruct> parser_auto_ptr;
|
||||
+ typedef
|
||||
+ std::unique_ptr<XML_ParserStruct, parser_deleter>
|
||||
+ parser_auto_ptr;
|
||||
#else
|
||||
// Simple auto pointer for Expat's XML_Parser object.
|
||||
//
|
||||
--- xsd/libxsd/xsd/cxx/parser/expat/elements.txx
|
||||
+++ xsd/libxsd/xsd/cxx/parser/expat/elements.txx
|
||||
@@ -283,9 +283,10 @@ namespace xsd
|
||||
throw std::bad_alloc ();
|
||||
|
||||
if (system_id || public_id)
|
||||
- parse_begin (parser, system_id ? *system_id : *public_id, eh);
|
||||
+ parse_begin (
|
||||
+ parser.get (), system_id ? *system_id : *public_id, eh);
|
||||
else
|
||||
- parse_begin (parser, eh);
|
||||
+ parse_begin (parser.get (), eh);
|
||||
|
||||
// Temporarily unset the exception failbit. Also clear the
|
||||
// fail bit when we reset the old state if it was caused
|
||||
@@ -310,8 +311,10 @@ namespace xsd
|
||||
break;
|
||||
}
|
||||
|
||||
- if (XML_Parse (
|
||||
- parser, buf, is.gcount (), is.eof ()) == XML_STATUS_ERROR)
|
||||
+ if (XML_Parse (parser.get (),
|
||||
+ buf,
|
||||
+ is.gcount (),
|
||||
+ is.eof ()) == XML_STATUS_ERROR)
|
||||
{
|
||||
r = false;
|
||||
break;
|
||||
##http://scm.codesynthesis.com/?p=xsd/xsd.git;a=commitdiff;h=0e5fab0664fb36c6253dfd7bb86d8985d1b349ef
|
||||
--- xsd/libxsd/xsd/cxx/parser/expat/elements.txx
|
||||
+++ xsd/libxsd/xsd/cxx/parser/expat/elements.txx
|
||||
@@ -279,7 +279,7 @@ namespace xsd
|
||||
{
|
||||
parser_auto_ptr parser (XML_ParserCreateNS (0, XML_Char (' ')));
|
||||
|
||||
- if (parser == 0)
|
||||
+ if (parser.get () == 0)
|
||||
throw std::bad_alloc ();
|
||||
|
||||
if (system_id || public_id)
|
||||
|
||||
101
xsd.spec
101
xsd.spec
|
|
@ -1,30 +1,29 @@
|
|||
Name: xsd
|
||||
Version: 4.0.0
|
||||
Release: 25%{?dist}
|
||||
Version: 4.1.0
|
||||
Release: 0.20.a11%{?dist}
|
||||
Summary: W3C XML schema to C++ data binding compiler
|
||||
# Exceptions permit otherwise GPLv2 incompatible combination with ASL 2.0
|
||||
License: GPLv2 with exceptions and ASL 2.0
|
||||
URL: http://www.codesynthesis.com/products/xsd/
|
||||
Source0: http://www.codesynthesis.com/download/xsd/4.0/xsd-%{version}+dep.tar.bz2
|
||||
# Automatically converted from old format: GPLv2 with exceptions and ASL 2.0 - review is highly recommended.
|
||||
License: LicenseRef-Callaway-GPLv2-with-exceptions AND Apache-2.0
|
||||
URL: https://www.codesynthesis.com/products/xsd/
|
||||
Source0: https://codesynthesis.com/~boris/tmp/xsd/%{version}.a11/xsd-%{version}.a11+dep.tar.bz2
|
||||
|
||||
# Sent suggestion to upstream via e-mail 20090707
|
||||
# http://anonscm.debian.org/cgit/collab-maint/xsd.git/tree/debian/patches/0001-xsd_xsdcxx-rename.patch
|
||||
Patch0: %{name}-3.3.0-xsdcxx-rename.patch
|
||||
|
||||
# Fix bug in C++/Parser Expat Support
|
||||
# http://codesynthesis.com/pipermail/xsd-users/2015-October/004705.html
|
||||
Patch1: %{name}-Fix_bug_C++_Parser_Expat_Support.patch
|
||||
Patch0: %{name}-%{version}-xsdcxx-rename.patch
|
||||
|
||||
# Remove tests for character reference values unsupported by Xerces-C++ 3.2
|
||||
# https://anonscm.debian.org/cgit/collab-maint/xsd.git/diff/debian/patches/0110-xerces-c3.2.patch?id=442e98604d4158dae11056c4f94aaa655cb480fa
|
||||
Patch2: %{name}-xerces_3-2.patch
|
||||
Patch1: %{name}-xerces_3-2.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: m4, xerces-c-devel, libcutl-devel, gcc-c++
|
||||
%if 0%{?rhel}
|
||||
|
||||
%if 0%{?rhel} >= 8 || 0%{?fedora}
|
||||
BuildRequires: boost-devel
|
||||
%else
|
||||
BuildRequires: boost148-devel
|
||||
Requires: boost148%{?_isa}
|
||||
%else
|
||||
BuildRequires: boost-devel
|
||||
%endif
|
||||
|
||||
%description
|
||||
|
|
@ -38,22 +37,20 @@ dealing with intricacies of reading and writing XML.
|
|||
|
||||
%package doc
|
||||
BuildArch: noarch
|
||||
BuildRequires: ghostscript
|
||||
Summary: API documentation files for %{name}
|
||||
|
||||
%description doc
|
||||
This package contains API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%autosetup -p0 -n xsd-%{version}+dep
|
||||
%autosetup -p0 -n xsd-%{version}.a11+dep
|
||||
|
||||
##Unbundle libcutl
|
||||
rm -rf libcutl
|
||||
|
||||
%build
|
||||
%if 0%{?rhel} < 7
|
||||
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
|
||||
%endif
|
||||
%make_build verbose=1 CXX=g++ CC=gcc CXXFLAGS="$RPM_OPT_FLAGS -fPIC -pie -Wl,-z,now" LDFLAGS="%{__global_ldflags} -fPIC -pie -Wl,-z,now" BOOST_LINK_SYSTEM=y EXTERNAL_LIBCUTL=y
|
||||
%make_build verbose=1 CXX=g++ CC=gcc CXXFLAGS="$RPM_OPT_FLAGS -std=c++14 -fPIC -pie -Wl,-z,now" LDFLAGS="%{__global_ldflags} -fPIC -pie -Wl,-z,now" BOOST_LINK_SYSTEM=y EXTERNAL_LIBCUTL=y
|
||||
|
||||
%install
|
||||
rm -rf apidocdir
|
||||
|
|
@ -116,6 +113,72 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
|
|||
%doc apidocdir/*
|
||||
|
||||
%changelog
|
||||
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.20.a11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.19.a11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.18.a11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.17.a11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Fri Oct 18 2024 Pete Walter <pwalter@fedoraproject.org> - 4.1.0-0.16.a11
|
||||
- Rebuild for xerces-c 3.3
|
||||
|
||||
* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 4.1.0-0.15.a11
|
||||
- convert license to SPDX
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.14.a11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.13.a11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.12.a11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.11.a11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.10.a11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.9.a11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Fri Jan 07 2022 Antonio Trande <sagitter@fedoraproject.org> - 4.1.0-0.8.a11
|
||||
- Rebuild for EPEL9
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.7.a11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.6.a11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Jeff Law <law@redhat.com> - 4.1.0-0.5.a11
|
||||
- Force C++14 as this code is not C++17 ready
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.4.a11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.3.a11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.2.a11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri Feb 15 2019 Antonio Trande <sagitter@fedoraproject.org> - 4.1.0-0.1.a11
|
||||
- Pre-release 4.1.0.a11
|
||||
|
||||
* Thu Feb 07 2019 Antonio Trande <sagitter@fedoraproject.org> - 4.0.0-27
|
||||
- Fix BR required for rhel8
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-26
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Sat Nov 03 2018 Antonio Trande <sagitter@fedoraproject.org> - 4.0.0-25
|
||||
- Some minor changes
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue