Move uncrustify-trinity out of the debian folder

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

debian/uncrustify-trinity/uncrustify-trinity-0.78.1/debian/patches/001_docs-remove-remote-images.patch

@@ -1,33 +0,0 @@
-Description: Remove remote images from docs.
- This images does not held any information, but breaks user's privacy.
-Author: Alexander Gerasiov <gq@debian.org>
-Last-Update: 2018-06-17
-
---- uncrustify-0.67+dfsg1.orig/documentation/htdocs/index.html
-+++ uncrustify-0.67+dfsg1/documentation/htdocs/index.html
-@@ -16,25 +16,6 @@
- <div class="node2" align="left">
- <h1>Uncrustify</h1>
- <h2>Source Code Beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA</h2>
--<table>
-- <tr>
--  <td valign="top">
--   <script type='text/javascript' language='JavaScript' src='http://www.ohloh.net/projects/4765/badge_js'></script>
--  </td>
--  <td valign="top">
--   <a href="https://travis-ci.org/uncrustify/uncrustify/builds">
--    <img alt="Travis CI Build Status"
--         src="https://travis-ci.org/uncrustify/uncrustify.svg?branch=master"/>
--   </a>
--  </td>
--  <td valign="top">
--   <a href="https://scan.coverity.com/projects/uncrustify">
--    <img alt="Coverity Scan Build Status"
--         src="https://scan.coverity.com/projects/8264/badge.svg"/>
--   </a>
--  </td>
-- </tr>
--</table>
- 
- <h2>Introduction</h2>
- <p>The goals of this project are simple:

debian/uncrustify-trinity/uncrustify-trinity-0.78.1/debian/patches/002_trinity_customization.diff

@@ -1,215 +0,0 @@
-Customize and repackage as a TDE package.
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,6 +1,6 @@
- cmake_minimum_required(VERSION 3.5)
- 
--project(uncrustify)
-+project(uncrustify-trinity)
- 
- set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
- 
-@@ -241,7 +241,7 @@
- #
- # Uncrustify
- #
--set(uncrustify_sources
-+set(uncrustify-trinity_sources
-   src/align_add.cpp
-   src/align_asm_colon.cpp
-   src/align_assign.cpp
-@@ -335,7 +335,7 @@
-   ${PROJECT_BINARY_DIR}/src/option_enum.cpp
- )
- 
--set(uncrustify_headers
-+set(uncrustify-trinity_headers
-   src/add_space_table.h
-   src/align_add.h
-   src/align_asm_colon.h
-@@ -438,7 +438,7 @@
-   ${PROJECT_BINARY_DIR}/uncrustify_version.h
- )
- 
--set(uncrustify_docs
-+set(uncrustify-trinity_docs
-   "${PROJECT_SOURCE_DIR}/AUTHORS"
-   "${PROJECT_SOURCE_DIR}/BUGS"
-   "${PROJECT_SOURCE_DIR}/ChangeLog"
-@@ -447,17 +447,17 @@
-   "${PROJECT_SOURCE_DIR}/README.md"
- )
- 
--add_executable(uncrustify ${uncrustify_sources} ${uncrustify_headers})
--add_dependencies(uncrustify generate_version_header)
-+add_executable(uncrustify-trinity ${uncrustify-trinity_sources} ${uncrustify-trinity_headers})
-+add_dependencies(uncrustify-trinity generate_version_header)
- 
--set_property(TARGET uncrustify APPEND PROPERTY
-+set_property(TARGET uncrustify-trinity APPEND PROPERTY
-   COMPILE_DEFINITIONS $<$<OR:$<CONFIG:Debug>,$<CONFIG:>>:DEBUG>
- )
- 
- #
--# Generate uncrustify.1
-+# Generate uncrustify-trinity.1
- #
--configure_file(man/uncrustify.1.in uncrustify.1 @ONLY)
-+configure_file(man/uncrustify.1.in uncrustify-trinity.1 @ONLY)
- 
- #
- # Generate uncrustify.xml (katepart highlighting file)
-@@ -479,7 +479,7 @@
- #
- OPTION(ENABLE_CODECOVERAGE "Enable code coverage testing support")
- if(ENABLE_CODECOVERAGE)
--    set(CODECOVERAGE_DEPENDS uncrustify)
-+    set(CODECOVERAGE_DEPENDS uncrustify-trinity)
-     include(${CMAKE_SOURCE_DIR}/cmake/CodeCoverage.cmake)
- endif(ENABLE_CODECOVERAGE)
- 
-@@ -487,10 +487,10 @@
- # Build command to run uncrustify on its own sources
- #
- add_custom_target(format-sources)
--foreach(source IN LISTS uncrustify_sources uncrustify_headers)
-+foreach(source IN LISTS uncrustify-trinity_sources uncrustify-trinity_headers)
-   get_filename_component(source_name  ${source} NAME)
-   add_custom_target(format-${source_name}
--    COMMAND uncrustify
-+    COMMAND uncrustify-trinity
-       -c forUncrustifySources.cfg
-       -lCPP --no-backup ${source}
-     COMMENT "Formatting ${source}"
-@@ -502,7 +502,7 @@
- #
- # Package
- #
--set(CPACK_PACKAGE_NAME "uncrustify")
-+set(CPACK_PACKAGE_NAME "uncrustify-trinity")
- set(CPACK_PACKAGE_VERSION "${UNCRUSTIFY_VERSION}")
- set(CPACK_PACKAGE_VENDOR "Ben Gardner")
- set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Code beautifier")
-@@ -520,8 +520,8 @@
- # Install
- #
- if(MSVC)
--  install(TARGETS uncrustify DESTINATION ".")
--  install(FILES ${uncrustify_docs}
-+  install(TARGETS uncrustify-trinity DESTINATION ".")
-+  install(FILES ${uncrustify-trinity_docs}
-     DESTINATION "."
-   )
-   install(FILES "${PROJECT_SOURCE_DIR}/documentation/htdocs/index.html"
-@@ -533,17 +533,17 @@
-   )
- else()
-   include(GNUInstallDirs)
--  install(TARGETS uncrustify
-+  install(TARGETS uncrustify-trinity
-     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-   )
--  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/uncrustify.1"
-+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/uncrustify-trinity.1"
-     DESTINATION "${CMAKE_INSTALL_MANDIR}/man1"
-   )
-   install(DIRECTORY "${PROJECT_SOURCE_DIR}/etc/"
-     DESTINATION "${CMAKE_INSTALL_DOCDIR}/examples"
-     FILES_MATCHING PATTERN "*.cfg"
-   )
--  install(FILES ${uncrustify_docs}
-+  install(FILES ${uncrustify-trinity_docs}
-     DESTINATION "${CMAKE_INSTALL_DOCDIR}"
-   )
- endif()
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -32,7 +32,7 @@
-   add_custom_command(
-     OUTPUT ${tests_ctest_file}
-     COMMAND ${PYTHON_EXECUTABLE} run_format_tests.py
--      --executable $<TARGET_FILE:uncrustify>
-+      --executable $<TARGET_FILE:uncrustify-trinity>
-       --git ${GIT_EXECUTABLE}
-       --python ${PYTHON_EXECUTABLE}
-       --write-ctest ${tests_ctest_file}
-@@ -48,7 +48,7 @@
-     string(REPLACE ".test" "" lang "${suite}")
-     add_test(NAME ${lang}
-       COMMAND ${PYTHON_EXECUTABLE} run_format_tests.py ${lang}
--        --executable $<TARGET_FILE:uncrustify>
-+        --executable $<TARGET_FILE:uncrustify-trinity>
-         -d --git ${GIT_EXECUTABLE}
-         --result-dir ${CMAKE_CURRENT_BINARY_DIR}
-       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-@@ -60,7 +60,7 @@
-   add_test(
-     NAME sources_format
-     COMMAND ${PYTHON_EXECUTABLE} run_sources_tests.py
--      --executable $<TARGET_FILE:uncrustify>
-+      --executable $<TARGET_FILE:uncrustify-trinity>
-       -d --git ${GIT_EXECUTABLE}
-       --result-dir ${CMAKE_CURRENT_BINARY_DIR}
-     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-@@ -72,7 +72,7 @@
-   COMMAND ${PYTHON_EXECUTABLE}
-     test_cli_options.py
-     --config $<CONFIG>
--    --build ${uncrustify_BINARY_DIR}
-+    --build ${uncrustify-trinity_BINARY_DIR}
-     --diff
-     --test ${CMAKE_CURRENT_BINARY_DIR}/cli
-   ${_configs}
-@@ -83,11 +83,11 @@
-   COMMAND ${PYTHON_EXECUTABLE}
-     test_cli_options.py
-     --config $<CONFIG>
--    --build ${uncrustify_BINARY_DIR}
-+    --build ${uncrustify-trinity_BINARY_DIR}
-     --apply
-     --test ${CMAKE_CURRENT_BINARY_DIR}/cli
--  DEPENDS uncrustify
-+  DEPENDS uncrustify-trinity
-   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cli
- )
- 
--add_test(NAME sanity COMMAND uncrustify --help)
-+add_test(NAME sanity COMMAND uncrustify-trinity --help)
---- a/tests/cli/output/help.txt
-+++ b/tests/cli/output/help.txt
-@@ -1,5 +1,5 @@
- Usage:
--uncrustify [options] [files ...]
-+uncrustify-trinity [options] [files ...]
- 
- If no input files are specified, the input is read from stdin
- If reading from stdin, you should specify the language using -l
---- a/tests/cli/test_cli_options.py
-+++ b/tests/cli/test_cli_options.py
-@@ -525,16 +525,16 @@
-     bd_dir = parsed_args.build
-     test_dir = parsed_args.test
- 
--    bin_paths = [s_path_join(bd_dir, 'uncrustify'),
--                 s_path_join(bd_dir, 'uncrustify.exe'),
--                 s_path_join(bd_dir, 'Debug/uncrustify'),
--                 s_path_join(bd_dir, 'Debug/uncrustify.exe'),
--                 s_path_join(bd_dir, 'Release/uncrustify'),
--                 s_path_join(bd_dir, 'Release/uncrustify.exe'),
--                 s_path_join(bd_dir, 'RelWithDebInfo/uncrustify'),
--                 s_path_join(bd_dir, 'RelWithDebInfo/uncrustify.exe'),
--                 s_path_join(bd_dir, 'MinSizeRel/uncrustify'),
--                 s_path_join(bd_dir, 'MinSizeRel/uncrustify.exe')]
-+    bin_paths = [s_path_join(bd_dir, 'uncrustify-trinity'),
-+                 s_path_join(bd_dir, 'uncrustify-trinity.exe'),
-+                 s_path_join(bd_dir, 'Debug/uncrustify-trinity'),
-+                 s_path_join(bd_dir, 'Debug/uncrustify-trinity.exe'),
-+                 s_path_join(bd_dir, 'Release/uncrustify-trinity'),
-+                 s_path_join(bd_dir, 'Release/uncrustify-trinity.exe'),
-+                 s_path_join(bd_dir, 'RelWithDebInfo/uncrustify-trinity'),
-+                 s_path_join(bd_dir, 'RelWithDebInfo/uncrustify-trinity.exe'),
-+                 s_path_join(bd_dir, 'MinSizeRel/uncrustify-trinity'),
-+                 s_path_join(bd_dir, 'MinSizeRel/uncrustify-trinity.exe')]
-     for uncr_bin in bin_paths:
-         if not isfile(uncr_bin):
-             eprint("is 3 not a file: %s" % uncr_bin)

debian/uncrustify-trinity/uncrustify-trinity-0.78.1/debian/patches/003_fixed_usage.diff

@@ -1,55 +0,0 @@
-Fixed usage message to match uncrustify-trinity.
---- a/src/uncrustify.cpp
-+++ b/src/uncrustify.cpp
-@@ -303,15 +303,15 @@
-            "                         Cannot be used with the -o option'\n"
-            "\n"
-            "Usage Examples\n"
--           "cat foo.d | uncrustify -q -c my.cfg -l d\n"
--           "uncrustify -c my.cfg -f foo.d\n"
--           "uncrustify -c my.cfg -f foo.d -L0-2,20-23,51\n"
--           "uncrustify -c my.cfg -f foo.d -o foo.d\n"
--           "uncrustify -c my.cfg -f foo.d -o foo.d -ds dump\n"
--           "uncrustify -c my.cfg foo.d\n"
--           "uncrustify -c my.cfg --replace foo.d\n"
--           "uncrustify -c my.cfg --no-backup foo.d\n"
--           "uncrustify -c my.cfg --prefix=out -F files.txt\n"
-+           "cat foo.d | uncrustify-trinity -q -c my.cfg -l d\n"
-+           "uncrustify-trinity -c my.cfg -f foo.d\n"
-+           "uncrustify-trinity -c my.cfg -f foo.d -L0-2,20-23,51\n"
-+           "uncrustify-trinity -c my.cfg -f foo.d -o foo.d\n"
-+           "uncrustify-trinity -c my.cfg -f foo.d -o foo.d -ds dump\n"
-+           "uncrustify-trinity -c my.cfg foo.d\n"
-+           "uncrustify-trinity -c my.cfg --replace foo.d\n"
-+           "uncrustify-trinity -c my.cfg --no-backup foo.d\n"
-+           "uncrustify-trinity -c my.cfg --prefix=out -F files.txt\n"
-            "\n"
-            "Note: Use comments containing ' *INDENT-OFF*' and ' *INDENT-ON*' to disable\n"
-            "      processing of parts of the source file (these can be overridden with\n"
---- a/tests/cli/output/help.txt
-+++ b/tests/cli/output/help.txt
-@@ -67,15 +67,15 @@
-                          Cannot be used with the -o option'
- 
- Usage Examples
--cat foo.d | uncrustify -q -c my.cfg -l d
--uncrustify -c my.cfg -f foo.d
--uncrustify -c my.cfg -f foo.d -L0-2,20-23,51
--uncrustify -c my.cfg -f foo.d -o foo.d
--uncrustify -c my.cfg -f foo.d -o foo.d -ds dump
--uncrustify -c my.cfg foo.d
--uncrustify -c my.cfg --replace foo.d
--uncrustify -c my.cfg --no-backup foo.d
--uncrustify -c my.cfg --prefix=out -F files.txt
-+cat foo.d | uncrustify-trinity -q -c my.cfg -l d
-+uncrustify-trinity -c my.cfg -f foo.d
-+uncrustify-trinity -c my.cfg -f foo.d -L0-2,20-23,51
-+uncrustify-trinity -c my.cfg -f foo.d -o foo.d
-+uncrustify-trinity -c my.cfg -f foo.d -o foo.d -ds dump
-+uncrustify-trinity -c my.cfg foo.d
-+uncrustify-trinity -c my.cfg --replace foo.d
-+uncrustify-trinity -c my.cfg --no-backup foo.d
-+uncrustify-trinity -c my.cfg --prefix=out -F files.txt
- 
- Note: Use comments containing ' *INDENT-OFF*' and ' *INDENT-ON*' to disable
-       processing of parts of the source file (these can be overridden with

debian/uncrustify-trinity/uncrustify-trinity-0.78.1/debian/patches/series

@@ -1,3 +0,0 @@
-001_docs-remove-remote-images.patch
-002_trinity_customization.diff
-003_fixed_usage.diff

uncrustify-trinity/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.5)
 
-project(uncrustify)
+project(uncrustify-trinity)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
@@ -140,7 +140,7 @@ endif()
 # Generate uncrustify_version.h
 #
 
-set(UNCRUSTIFY_VERSION "0.78.1_f")
+set(UNCRUSTIFY_VERSION "0.78.1_f-0")
 
 option(NoGitVersionString "Do not use make_version.py and git to build a version string" OFF)
 if(NoGitVersionString)
@@ -241,7 +241,7 @@ py_gen(../etc/uncrustify.xml
 #
 # Uncrustify
 #
-set(uncrustify_sources
+set(uncrustify-trinity_sources
   src/align_add.cpp
   src/align_asm_colon.cpp
   src/align_assign.cpp
@@ -335,7 +335,7 @@ set(uncrustify_sources
   ${PROJECT_BINARY_DIR}/src/option_enum.cpp
 )
 
-set(uncrustify_headers
+set(uncrustify-trinity_headers
   src/add_space_table.h
   src/align_add.h
   src/align_asm_colon.h
@@ -438,7 +438,7 @@ set(uncrustify_headers
   ${PROJECT_BINARY_DIR}/uncrustify_version.h
 )
 
-set(uncrustify_docs
+set(uncrustify-trinity_docs
   "${PROJECT_SOURCE_DIR}/AUTHORS"
   "${PROJECT_SOURCE_DIR}/BUGS"
   "${PROJECT_SOURCE_DIR}/ChangeLog"
@@ -447,17 +447,17 @@ set(uncrustify_docs
   "${PROJECT_SOURCE_DIR}/README.md"
 )
 
-add_executable(uncrustify ${uncrustify_sources} ${uncrustify_headers})
-add_dependencies(uncrustify generate_version_header)
+add_executable(uncrustify-trinity ${uncrustify-trinity_sources} ${uncrustify-trinity_headers})
+add_dependencies(uncrustify-trinity generate_version_header)
 
-set_property(TARGET uncrustify APPEND PROPERTY
+set_property(TARGET uncrustify-trinity APPEND PROPERTY
   COMPILE_DEFINITIONS $<$<OR:$<CONFIG:Debug>,$<CONFIG:>>:DEBUG>
 )
 
 #
-# Generate uncrustify.1
+# Generate uncrustify-trinity.1
 #
-configure_file(man/uncrustify.1.in uncrustify.1 @ONLY)
+configure_file(man/uncrustify.1.in uncrustify-trinity.1 @ONLY)
 
 #
 # Generate uncrustify.xml (katepart highlighting file)
@@ -479,7 +479,7 @@ endif()
 #
 OPTION(ENABLE_CODECOVERAGE "Enable code coverage testing support")
 if(ENABLE_CODECOVERAGE)
-    set(CODECOVERAGE_DEPENDS uncrustify)
+    set(CODECOVERAGE_DEPENDS uncrustify-trinity)
     include(${CMAKE_SOURCE_DIR}/cmake/CodeCoverage.cmake)
 endif(ENABLE_CODECOVERAGE)
 
@@ -487,10 +487,10 @@ endif(ENABLE_CODECOVERAGE)
 # Build command to run uncrustify on its own sources
 #
 add_custom_target(format-sources)
-foreach(source IN LISTS uncrustify_sources uncrustify_headers)
+foreach(source IN LISTS uncrustify-trinity_sources uncrustify-trinity_headers)
   get_filename_component(source_name  ${source} NAME)
   add_custom_target(format-${source_name}
-    COMMAND uncrustify
+    COMMAND uncrustify-trinity
       -c forUncrustifySources.cfg
       -lCPP --no-backup ${source}
     COMMENT "Formatting ${source}"
@@ -502,7 +502,7 @@ endforeach()
 #
 # Package
 #
-set(CPACK_PACKAGE_NAME "uncrustify")
+set(CPACK_PACKAGE_NAME "uncrustify-trinity")
 set(CPACK_PACKAGE_VERSION "${UNCRUSTIFY_VERSION}")
 set(CPACK_PACKAGE_VENDOR "Ben Gardner")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Code beautifier")
@@ -520,8 +520,8 @@ include(CPack)
 # Install
 #
 if(MSVC)
-  install(TARGETS uncrustify DESTINATION ".")
-  install(FILES ${uncrustify_docs}
+  install(TARGETS uncrustify-trinity DESTINATION ".")
+  install(FILES ${uncrustify-trinity_docs}
     DESTINATION "."
   )
   install(FILES "${PROJECT_SOURCE_DIR}/documentation/htdocs/index.html"
@@ -533,17 +533,17 @@ if(MSVC)
   )
 else()
   include(GNUInstallDirs)
-  install(TARGETS uncrustify
+  install(TARGETS uncrustify-trinity
     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
   )
-  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/uncrustify.1"
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/uncrustify-trinity.1"
     DESTINATION "${CMAKE_INSTALL_MANDIR}/man1"
   )
   install(DIRECTORY "${PROJECT_SOURCE_DIR}/etc/"
     DESTINATION "${CMAKE_INSTALL_DOCDIR}/examples"
     FILES_MATCHING PATTERN "*.cfg"
   )
-  install(FILES ${uncrustify_docs}
+  install(FILES ${uncrustify-trinity_docs}
     DESTINATION "${CMAKE_INSTALL_DOCDIR}"
   )
 endif()

uncrustify-trinity/src/uncrustify.cpp

@@ -303,15 +303,15 @@ void usage(const char *argv0)
            "                         Cannot be used with the -o option'\n"
            "\n"
            "Usage Examples\n"
-           "cat foo.d | uncrustify -q -c my.cfg -l d\n"
-           "uncrustify -c my.cfg -f foo.d\n"
-           "uncrustify -c my.cfg -f foo.d -L0-2,20-23,51\n"
-           "uncrustify -c my.cfg -f foo.d -o foo.d\n"
-           "uncrustify -c my.cfg -f foo.d -o foo.d -ds dump\n"
-           "uncrustify -c my.cfg foo.d\n"
-           "uncrustify -c my.cfg --replace foo.d\n"
-           "uncrustify -c my.cfg --no-backup foo.d\n"
-           "uncrustify -c my.cfg --prefix=out -F files.txt\n"
+           "cat foo.d | uncrustify-trinity -q -c my.cfg -l d\n"
+           "uncrustify-trinity -c my.cfg -f foo.d\n"
+           "uncrustify-trinity -c my.cfg -f foo.d -L0-2,20-23,51\n"
+           "uncrustify-trinity -c my.cfg -f foo.d -o foo.d\n"
+           "uncrustify-trinity -c my.cfg -f foo.d -o foo.d -ds dump\n"
+           "uncrustify-trinity -c my.cfg foo.d\n"
+           "uncrustify-trinity -c my.cfg --replace foo.d\n"
+           "uncrustify-trinity -c my.cfg --no-backup foo.d\n"
+           "uncrustify-trinity -c my.cfg --prefix=out -F files.txt\n"
            "\n"
            "Note: Use comments containing ' *INDENT-OFF*' and ' *INDENT-ON*' to disable\n"
            "      processing of parts of the source file (these can be overridden with\n"

uncrustify-trinity/tests/CMakeLists.txt

@@ -32,7 +32,7 @@ if (UNCRUSTIFY_SEPARATE_TESTS)
   add_custom_command(
     OUTPUT ${tests_ctest_file}
     COMMAND ${PYTHON_EXECUTABLE} run_format_tests.py
-      --executable $<TARGET_FILE:uncrustify>
+      --executable $<TARGET_FILE:uncrustify-trinity>
       --git ${GIT_EXECUTABLE}
       --python ${PYTHON_EXECUTABLE}
       --write-ctest ${tests_ctest_file}
@@ -48,7 +48,7 @@ else()
     string(REPLACE ".test" "" lang "${suite}")
     add_test(NAME ${lang}
       COMMAND ${PYTHON_EXECUTABLE} run_format_tests.py ${lang}
-        --executable $<TARGET_FILE:uncrustify>
+        --executable $<TARGET_FILE:uncrustify-trinity>
         -d --git ${GIT_EXECUTABLE}
         --result-dir ${CMAKE_CURRENT_BINARY_DIR}
       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
@@ -60,7 +60,7 @@ if (NOT ENABLE_CODECOVERAGE)
   add_test(
     NAME sources_format
     COMMAND ${PYTHON_EXECUTABLE} run_sources_tests.py
-      --executable $<TARGET_FILE:uncrustify>
+      --executable $<TARGET_FILE:uncrustify-trinity>
       -d --git ${GIT_EXECUTABLE}
       --result-dir ${CMAKE_CURRENT_BINARY_DIR}
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
@@ -72,7 +72,7 @@ add_test(
   COMMAND ${PYTHON_EXECUTABLE}
     test_cli_options.py
     --config $<CONFIG>
-    --build ${uncrustify_BINARY_DIR}
+    --build ${uncrustify-trinity_BINARY_DIR}
     --diff
     --test ${CMAKE_CURRENT_BINARY_DIR}/cli
   ${_configs}
@@ -83,11 +83,11 @@ add_custom_target(update-cli-options
   COMMAND ${PYTHON_EXECUTABLE}
     test_cli_options.py
     --config $<CONFIG>
-    --build ${uncrustify_BINARY_DIR}
+    --build ${uncrustify-trinity_BINARY_DIR}
     --apply
     --test ${CMAKE_CURRENT_BINARY_DIR}/cli
-  DEPENDS uncrustify
+  DEPENDS uncrustify-trinity
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cli
 )
 
-add_test(NAME sanity COMMAND uncrustify --help)
+add_test(NAME sanity COMMAND uncrustify-trinity --help)

uncrustify-trinity/tests/cli/output/help.txt

@@ -1,5 +1,5 @@
 Usage:
-uncrustify [options] [files ...]
+uncrustify-trinity [options] [files ...]
 
 If no input files are specified, the input is read from stdin
 If reading from stdin, you should specify the language using -l
@@ -67,15 +67,15 @@ Debug Options:
                          Cannot be used with the -o option'
 
 Usage Examples
-cat foo.d | uncrustify -q -c my.cfg -l d
-uncrustify -c my.cfg -f foo.d
-uncrustify -c my.cfg -f foo.d -L0-2,20-23,51
-uncrustify -c my.cfg -f foo.d -o foo.d
-uncrustify -c my.cfg -f foo.d -o foo.d -ds dump
-uncrustify -c my.cfg foo.d
-uncrustify -c my.cfg --replace foo.d
-uncrustify -c my.cfg --no-backup foo.d
-uncrustify -c my.cfg --prefix=out -F files.txt
+cat foo.d | uncrustify-trinity -q -c my.cfg -l d
+uncrustify-trinity -c my.cfg -f foo.d
+uncrustify-trinity -c my.cfg -f foo.d -L0-2,20-23,51
+uncrustify-trinity -c my.cfg -f foo.d -o foo.d
+uncrustify-trinity -c my.cfg -f foo.d -o foo.d -ds dump
+uncrustify-trinity -c my.cfg foo.d
+uncrustify-trinity -c my.cfg --replace foo.d
+uncrustify-trinity -c my.cfg --no-backup foo.d
+uncrustify-trinity -c my.cfg --prefix=out -F files.txt
 
 Note: Use comments containing ' *INDENT-OFF*' and ' *INDENT-ON*' to disable
       processing of parts of the source file (these can be overridden with

uncrustify-trinity/tests/cli/test_cli_options.py

@@ -525,16 +525,16 @@ def main(args):
     bd_dir = parsed_args.build
     test_dir = parsed_args.test
 
-    bin_paths = [s_path_join(bd_dir, 'uncrustify'),
-                 s_path_join(bd_dir, 'uncrustify.exe'),
-                 s_path_join(bd_dir, 'Debug/uncrustify'),
-                 s_path_join(bd_dir, 'Debug/uncrustify.exe'),
-                 s_path_join(bd_dir, 'Release/uncrustify'),
-                 s_path_join(bd_dir, 'Release/uncrustify.exe'),
-                 s_path_join(bd_dir, 'RelWithDebInfo/uncrustify'),
-                 s_path_join(bd_dir, 'RelWithDebInfo/uncrustify.exe'),
-                 s_path_join(bd_dir, 'MinSizeRel/uncrustify'),
-                 s_path_join(bd_dir, 'MinSizeRel/uncrustify.exe')]
+    bin_paths = [s_path_join(bd_dir, 'uncrustify-trinity'),
+                 s_path_join(bd_dir, 'uncrustify-trinity.exe'),
+                 s_path_join(bd_dir, 'Debug/uncrustify-trinity'),
+                 s_path_join(bd_dir, 'Debug/uncrustify-trinity.exe'),
+                 s_path_join(bd_dir, 'Release/uncrustify-trinity'),
+                 s_path_join(bd_dir, 'Release/uncrustify-trinity.exe'),
+                 s_path_join(bd_dir, 'RelWithDebInfo/uncrustify-trinity'),
+                 s_path_join(bd_dir, 'RelWithDebInfo/uncrustify-trinity.exe'),
+                 s_path_join(bd_dir, 'MinSizeRel/uncrustify-trinity'),
+                 s_path_join(bd_dir, 'MinSizeRel/uncrustify-trinity.exe')]
     for uncr_bin in bin_paths:
         if not isfile(uncr_bin):
             eprint("is 3 not a file: %s" % uncr_bin)