e1c7747253
Sort include directives within each block (separated by a blank line) in lexicographic order (except to prioritize `sys/types.h` first). First run `clang-format` with the config file: --- SortIncludes: false ... Commit the result temporarily. Then run `clang-format` again with: --- SortIncludes: true IncludeCategories: - Regex: 'sys/types.h' Priority: -1 ... Commit the result temporarily. Start a new branch and cherry-pick the second commit. Manually resolve conflicts to preserve indentation of re-ordered includes. This cleans up the include ordering without changing any other style. Use the following command to run `clang-format`: $ git ls-files -z -- \ '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' | egrep -z -v '(Lexer|Parser|ParserHelper)\.' | egrep -z -v '^Source/cm_sha2' | egrep -z -v '^Source/(kwsys|CursesDialog/form)/' | egrep -z -v '^Utilities/(KW|cm).*/' | egrep -z -v '^Tests/Module/GenerateExportHeader' | egrep -z -v '^Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h' | xargs -0 clang-format -i This selects source files that do not come from a third-party. Inspired-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
49 lines
1.2 KiB
C++
49 lines
1.2 KiB
C++
/*============================================================================
|
|
CMake - Cross Platform Makefile Generator
|
|
Copyright 2014 Kitware, Inc.
|
|
|
|
Distributed under the OSI-approved BSD License (the "License");
|
|
see accompanying file Copyright.txt for details.
|
|
|
|
This software is distributed WITHOUT ANY WARRANTY; without even the
|
|
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
See the License for more information.
|
|
============================================================================*/
|
|
|
|
#ifndef cmWIXPatch_h
|
|
#define cmWIXPatch_h
|
|
|
|
#include "cmWIXPatchParser.h"
|
|
#include "cmWIXSourceWriter.h"
|
|
|
|
#include <string>
|
|
|
|
/** \class cmWIXPatch
|
|
* \brief Class that maintains and applies patch fragments
|
|
*/
|
|
class cmWIXPatch
|
|
{
|
|
public:
|
|
cmWIXPatch(cmCPackLog* logger);
|
|
|
|
bool LoadFragments(std::string const& patchFilePath);
|
|
|
|
void ApplyFragment(std::string const& id, cmWIXSourceWriter& writer);
|
|
|
|
bool CheckForUnappliedFragments();
|
|
|
|
private:
|
|
void ApplyElementChildren(const cmWIXPatchElement& element,
|
|
cmWIXSourceWriter& writer);
|
|
|
|
void ApplyElement(const cmWIXPatchElement& element,
|
|
cmWIXSourceWriter& writer);
|
|
|
|
cmCPackLog* Logger;
|
|
|
|
cmWIXPatchParser::fragment_map_t Fragments;
|
|
};
|
|
|
|
|
|
#endif
|