Skip to content

Commit

Permalink
Support ClangFormat v7.0.0
Browse files Browse the repository at this point in the history
Add an indenter configuration file for [ClangFormat](http://clang.llvm.org/docs/ClangFormat.html) v7.0.0. It can generate all the documented `.clang-format` options, except the following:

 - `ExperimentalAutoDetectBinPacking`, because it is discouraged from use in config files.

 - `IncludeCategories` and `RawStringFormats`, because their option values are highly structured YAML and beyond the capabilities of UniversalIndentGUI.

Also enlist ClangFormat in the list of supported indenters in the text, HTML and Markdown README files (but not in the binary PDF file) and in the release packaging scripts.
  • Loading branch information
tanzislam committed May 24, 2018
1 parent 2712224 commit 7ae5d5e
Show file tree
Hide file tree
Showing 6 changed files with 897 additions and 4 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Thus UniversalIndentGUI is open for nearly any new indenter and programming lang

* [Artistic Styler](http://astyle.sourceforge.net/)
* [BCPP](http://invisible-island.net/bcpp/)
* [ClangFormat](https://clang.llvm.org/docs/ClangFormat.html)
* [Cobol Beautify](http://www.siber.com/sct/tools/cbl-beau.html)
* [CSSTidy](http://csstidy.sourceforge.net/)
* [Fortran 90 PPR](ftp://ftp.ifremer.fr/ifremer/ditigo/fortran90/)
Expand Down Expand Up @@ -140,7 +141,7 @@ But if you'd like to build UiGUI from source, follow these steps:
5. Run "make release".
6. Install it
**Indenter binary packages** can be downloaded from the project at SourceForge
[here](http://sourceforge.net/project/showfiles.php?group_id=167482&package_id=293094).
[here](http://sourceforge.net/project/showfiles.php?group_id=167482&package_id=293094). **ClangFormat** is not part of them (yet), and you can download it separately at [the LLVM Builds page](http://llvm.org/builds/). (Rename it to `clang-format.exe` after downloading if needed.)

Beneath the possibility to build UiGUI using qmake, also project files for Visual Studio 2005
and XCode are included.
Expand Down
1 change: 1 addition & 0 deletions README_older_but_worth_reading.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ One of the main features and the reason why this tool was (better is being) deve
- Supports the following indenters:
* Artistic Styler
* BCPP
* ClangFormat
* Cobol Beautifier
* CSS Tidy
* GNU Indent
Expand Down
2 changes: 1 addition & 1 deletion buildRelease.sh
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ echo ""
echo "Copying the indenter executable files to the target indenters dir"
echo "-----------------------------------------------------------------"
# This list does not include script based indenters. These are copied somewhere below.
indenters="astyle$ext astyle.html uncrustify$ext uncrustify.txt xmlindent$ext xmlindent.txt"
indenters="astyle$ext astyle.html clang-format$ext uncrustify$ext uncrustify.txt xmlindent$ext xmlindent.txt"
# For win32 and Linux add some indenters that do not run or exist under MaxOSX
if [ "$targetSystem" = "win32" ] || [ "$targetSystem" = "linux" ]; then
indenters="$indenters bcpp$ext bcpp.txt csstidy$ext f90ppr.exe f90ppr.txt greatcode.exe greatcode.txt htb.exe htb.html indent$ext indent.html phpCB.html phpCB.exe psti_license.txt psti_manual.html psti.exe tidy$ext tidy.html vbsbeaut_keywords_indent.txt vbsbeaut_keywords.txt vbsbeaut.bat vbsbeaut.exe"
Expand Down
2 changes: 1 addition & 1 deletion buildwin32release_gcc.bat
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ echo.

echo Copying the indenter executables and example file to the release indenters dir
echo ------------------------------------------------------------------------------
FOR %%A IN ( astyle.exe, astyle.html, bcpp.exe, bcpp.txt, csstidy.exe, gc.exe, gc.txt, indent.exe, libiconv-2.dll, libintl-2.dll, indent.html, JsDecoder.js, perltidy, PerlTidyLib.pm, phpStylist.php, phpStylist.txt, rbeautify.rb, ruby_formatter.rb, shellindent.awk, tidy.exe, tidy.html, uncrustify.exe, uncrustify.txt, xmlindent.exe, xmlindent.txt ) DO (
FOR %%A IN ( astyle.exe, astyle.html, bcpp.exe, bcpp.txt, clang-format.exe csstidy.exe, gc.exe, gc.txt, indent.exe, libiconv-2.dll, libintl-2.dll, indent.html, JsDecoder.js, perltidy, PerlTidyLib.pm, phpStylist.php, phpStylist.txt, rbeautify.rb, ruby_formatter.rb, shellindent.awk, tidy.exe, tidy.html, uncrustify.exe, uncrustify.txt, xmlindent.exe, xmlindent.txt ) DO (
if not exist .\indenters\%%A (
echo WARNING!! File .\indenters\%%A not found!
set warningsoccurred=true
Expand Down
Loading

0 comments on commit 7ae5d5e

Please sign in to comment.