Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package CastXML for openSUSE:Factory checked in at 2021-03-05 13:48:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/CastXML (Old) and /work/SRC/openSUSE:Factory/.CastXML.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "CastXML" Fri Mar 5 13:48:50 2021 rev:5 rq:876920 version:0.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/CastXML/CastXML.changes 2021-01-18 11:32:32.768695927 +0100 +++ /work/SRC/openSUSE:Factory/.CastXML.new.2378/CastXML.changes 2021-03-05 13:51:07.959944155 +0100 @@ -1,0 +2,7 @@ +Thu Mar 4 22:36:10 UTC 2021 - Atri Bhattacharya <badshah...@gmail.com> + +- Update to version 0.4.3: + * Output: Account for multiple annotations + [gh#CastXML/CastXML#194]. + +------------------------------------------------------------------- Old: ---- CastXML-0.4.2.tar.gz New: ---- CastXML-0.4.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ CastXML.spec ++++++ --- /var/tmp/diff_new_pack.mS8c3o/_old 2021-03-05 13:51:08.447944625 +0100 +++ /var/tmp/diff_new_pack.mS8c3o/_new 2021-03-05 13:51:08.451944628 +0100 @@ -17,7 +17,7 @@ Name: CastXML -Version: 0.4.2 +Version: 0.4.3 Release: 0 Summary: C-family Abstract Syntax Tree XML Output License: Apache-2.0 ++++++ CastXML-0.4.2.tar.gz -> CastXML-0.4.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.2/src/Output.cxx new/CastXML-0.4.3/src/Output.cxx --- old/CastXML-0.4.2/src/Output.cxx 2021-01-15 17:31:46.000000000 +0100 +++ new/CastXML-0.4.3/src/Output.cxx 2021-03-03 19:15:49.000000000 +0100 @@ -1529,11 +1529,18 @@ void ASTVisitor::GetDeclAttributes(clang::Decl const* d, std::vector<std::string>& attrs) { + std::string annotationXML; for (auto const* a : d->specific_attrs<clang::AnnotateAttr>()) { attrs.push_back("annotate(" + a->getAnnotation().str() + ")"); + if (!annotationXML.empty()) { + // Separate annotations by a newline. + annotationXML += "
"; // LF + } + annotationXML += encodeXML(a->getAnnotation().str()); + } + if (d->hasAttr<clang::AnnotateAttr>()) { if (this->Opts.CastXml) { - this->OS << " annotation=\"" << encodeXML(a->getAnnotation().str()) - << "\""; + this->OS << " annotation=\"" << annotationXML << "\""; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.2/src/Version.cmake new/CastXML-0.4.3/src/Version.cmake --- old/CastXML-0.4.2/src/Version.cmake 2021-01-15 17:31:46.000000000 +0100 +++ new/CastXML-0.4.3/src/Version.cmake 2021-03-03 19:15:49.000000000 +0100 @@ -1,7 +1,7 @@ # CastXML version number components. set(CastXML_VERSION_MAJOR 0) set(CastXML_VERSION_MINOR 4) -set(CastXML_VERSION_PATCH 2) +set(CastXML_VERSION_PATCH 3) set(CastXML_VERSION_RC 0) set(CastXML_VERSION_IS_DIRTY 0) @@ -13,7 +13,7 @@ endif() # If this source was exported by 'git archive', use its commit info. -set(git_info "cf0fd3a CastXML 0.4.2") +set(git_info "333ed18 CastXML 0.4.3") # Otherwise, try to identify the current development source version. if(NOT git_info MATCHES "^([0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]?[0-9a-f]?)[0-9a-f]* " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.2/test/CMakeLists.txt new/CastXML-0.4.3/test/CMakeLists.txt --- old/CastXML-0.4.2/test/CMakeLists.txt 2021-01-15 17:31:46.000000000 +0100 +++ new/CastXML-0.4.3/test/CMakeLists.txt 2021-03-03 19:15:49.000000000 +0100 @@ -478,6 +478,7 @@ castxml_test_output(Elaborated) castxml_test_output(Enumeration) castxml_test_output(Enumeration-annotate) +castxml_test_output(Enumeration-annotate-multi) castxml_test_output(Enumeration-deprecated) castxml_test_output(Enumeration-anonymous) castxml_test_output_11(Enumeration-scoped) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.2/test/expect/castxml1.any.Enumeration-annotate-multi.xml.txt new/CastXML-0.4.3/test/expect/castxml1.any.Enumeration-annotate-multi.xml.txt --- old/CastXML-0.4.2/test/expect/castxml1.any.Enumeration-annotate-multi.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.4.3/test/expect/castxml1.any.Enumeration-annotate-multi.xml.txt 2021-03-03 19:15:49.000000000 +0100 @@ -0,0 +1,9 @@ +^<\?xml version="1.0"\?> +<CastXML[^>]*> + <Enumeration id="_1" name="start" type="_2" context="_3" location="f1:2" file="f1" line="2" size="[0-9]+" align="[0-9]+" annotation="an annotation
second annotation" attributes="annotate\(an annotation\) annotate\(second annotation\)"> + <EnumValue name="ev0" init="0" annotation="an annotation" attributes="annotate\(an annotation\)"/> + </Enumeration> + <FundamentalType id="_2" name="(unsigned )?int" size="[0-9]+" align="[0-9]+"/> + <Namespace id="_3" name="::"/> + <File id="f1" name=".*/test/input/Enumeration-annotate-multi.cxx"/> +</CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.2/test/expect/gccxml.any.Enumeration-annotate-multi.xml.txt new/CastXML-0.4.3/test/expect/gccxml.any.Enumeration-annotate-multi.xml.txt --- old/CastXML-0.4.2/test/expect/gccxml.any.Enumeration-annotate-multi.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.4.3/test/expect/gccxml.any.Enumeration-annotate-multi.xml.txt 2021-03-03 19:15:49.000000000 +0100 @@ -0,0 +1,8 @@ +^<\?xml version="1.0"\?> +<GCC_XML[^>]*> + <Enumeration id="_1" name="start" context="_2" location="f1:2" file="f1" line="2" size="[0-9]+" align="[0-9]+" attributes="annotate\(an annotation\) annotate\(second annotation\)"> + <EnumValue name="ev0" init="0" attributes="annotate\(an annotation\)"/> + </Enumeration> + <Namespace id="_2" name="::"/> + <File id="f1" name=".*/test/input/Enumeration-annotate-multi.cxx"/> +</GCC_XML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.2/test/input/Enumeration-annotate-multi.cxx new/CastXML-0.4.3/test/input/Enumeration-annotate-multi.cxx --- old/CastXML-0.4.2/test/input/Enumeration-annotate-multi.cxx 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.4.3/test/input/Enumeration-annotate-multi.cxx 2021-03-03 19:15:49.000000000 +0100 @@ -0,0 +1,5 @@ +enum __attribute__((annotate("an annotation"))) +__attribute__((annotate("second annotation"))) start +{ + ev0 __attribute__((annotate("an annotation"))) +};