Revision 156b56480a786db4d967bde5eb6d5edee56a27d0 authored by Brad King on 27 September 2019, 17:06:56 UTC, committed by Brad King on 27 September 2019, 18:15:00 UTC
Revert the main logic change from commit 827da1119e (Makefiles: Make build root targets "all", "clean" and "preinstall" recursive, 2019-05-17, v3.15.0-rc1~96^2~2) for the "all" and "preinstall" targets. The commit cleaned up the Makefile generator to use the same logic for the "all" target in the top-level directory as for subdirectories. It exposed a long-existing bug that caused the "all" target in a subdirectory to include the "all" targets from sub-subdirectories even if they are marked `EXCLUDE_FROM_ALL`. The `Tests/SubDir` test should fail but the problem is currently covered up by another bug introduced by commit dc6888573d (Pass EXCLUDE_FROM_ALL from directory to targets, 2019-01-15, v3.14.0-rc1~83^2) that causes the "all" targets in `EXCLUDE_FROM_ALL` subdirectories to be empty. Revert the top-level "all" and "preinstall" targets to the old approach to prepare to fix the latter bug without exposing the long-existing bug at the top-level. Leave the "clean" target in the new approach because it does not honor `EXCLUDE_FROM_ALL` anyway. Issue: #19753
1 parent 26a0e20
cmXMLSafe.cxx
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmXMLSafe.h"
#include "cm_utf8.h"
#include <sstream>
#include <stdio.h>
#include <string.h>
cmXMLSafe::cmXMLSafe(const char* s)
: Data(s)
, Size(static_cast<unsigned long>(strlen(s)))
, DoQuotes(true)
{
}
cmXMLSafe::cmXMLSafe(std::string const& s)
: Data(s.c_str())
, Size(static_cast<unsigned long>(s.length()))
, DoQuotes(true)
{
}
cmXMLSafe& cmXMLSafe::Quotes(bool b)
{
this->DoQuotes = b;
return *this;
}
std::string cmXMLSafe::str()
{
std::ostringstream ss;
ss << *this;
return ss.str();
}
std::ostream& operator<<(std::ostream& os, cmXMLSafe const& self)
{
char const* first = self.Data;
char const* last = self.Data + self.Size;
while (first != last) {
unsigned int ch;
if (const char* next = cm_utf8_decode_character(first, last, &ch)) {
// http://www.w3.org/TR/REC-xml/#NT-Char
if ((ch >= 0x20 && ch <= 0xD7FF) || (ch >= 0xE000 && ch <= 0xFFFD) ||
(ch >= 0x10000 && ch <= 0x10FFFF) || ch == 0x9 || ch == 0xA ||
ch == 0xD) {
switch (ch) {
// Escape XML control characters.
case '&':
os << "&";
break;
case '<':
os << "<";
break;
case '>':
os << ">";
break;
case '"':
os << (self.DoQuotes ? """ : "\"");
break;
case '\'':
os << (self.DoQuotes ? "'" : "'");
break;
case '\r':
break; // Ignore CR
// Print the UTF-8 character.
default:
os.write(first, next - first);
break;
}
} else {
// Use a human-readable hex value for this invalid character.
char buf[16];
sprintf(buf, "%X", ch);
os << "[NON-XML-CHAR-0x" << buf << "]";
}
first = next;
} else {
ch = static_cast<unsigned char>(*first++);
// Use a human-readable hex value for this invalid byte.
char buf[16];
sprintf(buf, "%X", ch);
os << "[NON-UTF-8-BYTE-0x" << buf << "]";
}
}
return os;
}
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...