mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-16 16:18:22 +00:00
e30f3d76d2
This commit does a bulk fix of incorrect annotations (comments) at the
end of namespaces.
The commit was generated by initially running clang-format, and then
from the diff of the result extracting the hunks corresponding to
fixes of namespace comments. The changes being applied and all the
results have been manually reviewed. The source code successfully
builds on macOS.
Further details on the steps below, in case they're of interest to
someone else in the future.
1. Checkout a fresh and up to date version of src/
git pull && git checkout -- src && git status src
2. Ensure there's a suitable .clang-format in place, i.e. with options
to fix the comment at the end of namespaces, including:
FixNamespaceComments: true
SpacesBeforeTrailingComments: 1
and that clang-format is >= 5.0.0, by doing e.g.:
clang-format -dump-config | grep Comments:
clang-format --version
3. Apply clang-format to the source:
clang-format -i $(find src -name "*.cpp" -or -name "*.h")
4. Create and filter out hunks related to fixing the namespace
git diff -U0 src > tmp.patch
grepdiff '^} // namespace' --output-matching=hunk tmp.patch > fix_namespace.patch
5. Filter out hunks corresponding to simple fixes into to a separate patch:
pcregrep -M -e '^diff[^\n]+\nindex[^\n]+\n--- [^\n]+\n\+\+\+ [^\n]+\n' \
-e '^@@ -[0-9]+ \+[0-9]+ @@[^\n]*\n-\}[^\n]*\n\+\}[^\n]*\n' \
fix_namespace.patch > fix_namespace_simple.patch
6. Manually review the simple patch and then apply it, after first
restoring the source.
git checkout -- src
patch -p1 < fix_namespace_simple.path
7. Manually review the (simple) changes and then stage the changes
git diff src
git add src
8. Again apply clang-format and filter out hunks related to any
remaining fixes to the namespace, this time filter with more
context. There will be fewer hunks as all the simple cases have
already been handled:
clang-format -i $(find src -name "*.cpp" -or -name "*.h")
git diff src > tmp.patch
grepdiff '^} // namespace' --output-matching=hunk tmp.patch > fix_namespace2.patch
9. Manually review/edit the resulting patch file to remove hunks for files
which need to be dealt with manually, noting the file names and
line numbers. Then restore files to as before applying clang-format
and apply the patch:
git checkout src
patch -p1 < fix_namespace2.patch
10. Manually fix the files noted in the previous step. Stage files,
review changes and commit.
110 lines
2.7 KiB
C++
110 lines
2.7 KiB
C++
/**
|
|
* \file os.cpp
|
|
* This file is part of LyX, the document processor.
|
|
* Licence details can be found in the file COPYING.
|
|
*
|
|
* \author Ruurd A. Reitsma
|
|
* \author Enrico Forestieri
|
|
*
|
|
* Full author contact details are available in file CREDITS.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include "debug.h"
|
|
#include "filetools.h"
|
|
#include "qstring_helpers.h"
|
|
|
|
#include <QDir>
|
|
|
|
#if defined(__CYGWIN__)
|
|
#include "support/os_cygwin.cpp"
|
|
#elif defined(_WIN32)
|
|
#include "support/os_win32.cpp"
|
|
#else
|
|
#include "support/os_unix.cpp"
|
|
#endif
|
|
|
|
// Static assert to break compilation on platforms where
|
|
// int/unsigned int is not 4 bytes. Added to make sure that
|
|
// e.g., the author hash is always 32-bit.
|
|
template<bool Condition> struct static_assert_helper;
|
|
template <> struct static_assert_helper<true> {};
|
|
enum {
|
|
dummy = sizeof(static_assert_helper<sizeof(int) == 4>)
|
|
};
|
|
|
|
namespace lyx {
|
|
namespace support {
|
|
namespace os {
|
|
|
|
static string const python23(string const & binary, bool verbose = false)
|
|
{
|
|
if (verbose)
|
|
lyxerr << "Examining " << binary << "\n";
|
|
|
|
// Check whether this is a python 2 or 3 binary.
|
|
cmd_ret const out = runCommand(binary + " -V 2>&1");
|
|
if (out.first < 0 ||
|
|
(!prefixIs(out.second, "Python 2") &&
|
|
!prefixIs(out.second, "Python 3")))
|
|
return string();
|
|
|
|
if (verbose)
|
|
lyxerr << "Found " << out.second << "\n";
|
|
return binary;
|
|
}
|
|
|
|
|
|
int timeout_min()
|
|
{
|
|
return 3;
|
|
}
|
|
|
|
|
|
string const python(bool reset)
|
|
{
|
|
// Check whether the first python in PATH is the right one.
|
|
static string command = python23("python -tt");
|
|
// FIXME THREAD
|
|
if (reset) {
|
|
command = python23("python -tt");
|
|
}
|
|
|
|
if (command.empty()) {
|
|
// It was not, so check whether we can find it elsewhere in
|
|
// PATH, maybe with some suffix appended.
|
|
vector<string> const path = getEnvPath("PATH");
|
|
vector<string>::const_iterator it = path.begin();
|
|
vector<string>::const_iterator const end = path.end();
|
|
lyxerr << "Looking for python v2.x or 3.x ...\n";
|
|
for (; it != end; ++it) {
|
|
QString const dir = toqstr(*it);
|
|
string const localdir = dir.toLocal8Bit().constData();
|
|
QDir qdir(dir);
|
|
qdir.setFilter(QDir::Files | QDir::Executable);
|
|
QStringList list = qdir.entryList(QStringList("python*"));
|
|
for (int i = 0; i < list.size() && command.empty(); ++i) {
|
|
string const binary = addName(localdir,
|
|
list.at(i).toLocal8Bit().constData());
|
|
command = python23(binary, true);
|
|
}
|
|
}
|
|
|
|
// Default to "python" if no usable binary was found.
|
|
if (command.empty()) {
|
|
lyxerr << "Warning: No python v2.x or 3.x binary found.\n";
|
|
command = "python";
|
|
}
|
|
|
|
// Add the -tt switch so that mixed tab/whitespace
|
|
// indentation is an error
|
|
command += " -tt";
|
|
}
|
|
return command;
|
|
}
|
|
|
|
} // namespace os
|
|
} // namespace support
|
|
} // namespace lyx
|