Rename clang_format.exe_file to clang_format.exec_file in ant cfg

ndsev · Jan 9, 2024 · 3b4f6e9 · 3b4f6e9
1 parent 9f8ebde
commit 3b4f6e9
Show file tree

Hide file tree

Showing 103 changed files with 141 additions and 141 deletions.
diff --git a/compiler/core/build.xml b/compiler/core/build.xml
@@ -13,7 +13,7 @@ zserio_core.build_dir   - Directory where to put generated files.
 zserio_core.install_dir - Directory where to install Zserio core jar file.
                           Default is "${zserio.install_dir}/zserio_libs".
 zserio.version          - Zserio version to be used for Zserio core. Default is "unknown".
-clang_format.exe_file   - Clang-format executable file. If not set, clang-format is not run.
+clang_format.exec_file  - Clang-format executable file. If not set, clang-format is not run.
 spotbugs.home_dir       - Location of the spotbugs tool. If not set, spotbugs is not run.
 
 -->
@@ -206,13 +206,13 @@ spotbugs.home_dir       - Location of the spotbugs tool. If not set, spotbugs is
         </copy>
     </target>
 
-    <target name="clang_format" depends="install" if="clang_format.exe_file">
+    <target name="clang_format" depends="install" if="clang_format.exec_file">
         <echo>
-Command hints to reformat source using clang-format tool:
+Command hints to reformat source manually using clang-format tool (in case of format errors):
     git clang-format
     clang-format --style=file -i [SOURCE]
         </echo>
-        <apply executable="${clang_format.exe_file}" failonerror="true">
+        <apply executable="${clang_format.exec_file}" failonerror="true">
             <arg value="--style=file"/>
             <arg value="--dry-run"/>
             <arg value="--Werror"/>
@@ -262,13 +262,13 @@ Command hints to reformat source using clang-format tool:
         </javac>
     </target>
 
-    <target name="test.clang_format" depends="spotbugs, test.compile" if="clang_format.exe_file">
+    <target name="test.clang_format" depends="spotbugs, test.compile" if="clang_format.exec_file">
         <echo>
-Command hints to reformat source using clang-format tool:
+Command hints to reformat source manually using clang-format tool (in case of format errors):
     git clang-format
     clang-format --style=file -i [SOURCE]
         </echo>
-        <apply executable="${clang_format.exe_file}" failonerror="true">
+        <apply executable="${clang_format.exec_file}" failonerror="true">
             <arg value="--style=file"/>
             <arg value="--dry-run"/>
             <arg value="--Werror"/>

diff --git a/compiler/extensions/cpp/build.xml b/compiler/extensions/cpp/build.xml
@@ -18,7 +18,7 @@ zserio_cpp.install_dir        - Directory where to install Zserio C++ Extension
 zserio_core.jar_file          - Zserio core jar file used for classpath.
                                 Default is "${zserio_extensions.build_dir}/../core/${ant.java.version}/jar/
                                 zserio_core.jar".
-clang_format.exe_file         - Clang-format executable file. If not set, clang-format is not run.
+clang_format.exec_file        - Clang-format executable file. If not set, clang-format is not run.
 spotbugs.home_dir             - Location of the spotbugs tool. If not set, spotbugs is not run.
 
 -->
@@ -162,13 +162,13 @@ spotbugs.home_dir             - Location of the spotbugs tool. If not set, spotb
         </copy>
     </target>
 
-    <target name="clang_format" depends="install" if="clang_format.exe_file">
+    <target name="clang_format" depends="install" if="clang_format.exec_file">
         <echo>
-Command hints to reformat source using clang-format tool:
+Command hints to reformat source manually using clang-format tool (in case of format errors):
     git clang-format
     clang-format --style=file -i [SOURCE]
         </echo>
-        <apply executable="${clang_format.exe_file}" failonerror="true">
+        <apply executable="${clang_format.exec_file}" failonerror="true">
             <arg value="--style=file"/>
             <arg value="--dry-run"/>
             <arg value="--Werror"/>
@@ -219,13 +219,13 @@ Command hints to reformat source using clang-format tool:
         </javac>
     </target>
 
-    <target name="test.clang_format" depends="spotbugs, test.compile" if="clang_format.exe_file">
+    <target name="test.clang_format" depends="spotbugs, test.compile" if="clang_format.exec_file">
         <echo>
-Command hints to reformat source using clang-format tool:
+Command hints to reformat source manually using clang-format tool (in case of format errors):
     git clang-format
     clang-format --style=file -i [SOURCE]
         </echo>
-        <apply executable="${clang_format.exe_file}" failonerror="true">
+        <apply executable="${clang_format.exec_file}" failonerror="true">
             <arg value="--style=file"/>
             <arg value="--dry-run"/>
             <arg value="--Werror"/>

diff --git a/compiler/extensions/doc/build.xml b/compiler/extensions/doc/build.xml
@@ -19,7 +19,7 @@ zserio_doc.install_dir        - Directory where to install Zserio Doc Extension
 zserio_core.jar_file          - Zserio core jar file used for classpath.
                                 Default is "${zserio_extensions.build_dir}/../core/${ant.java.version}/jar/
                                 zserio_core.jar".
-clang_format.exe_file         - Clang-format executable file. If not set, clang-format is not run.
+clang_format.exec_file        - Clang-format executable file. If not set, clang-format is not run.
 spotbugs.home_dir             - Location of the spotbugs tool. If not set, spotbugs is not run.
 
 -->
@@ -185,13 +185,13 @@ spotbugs.home_dir             - Location of the spotbugs tool. If not set, spotb
         </copy>
     </target>
 
-    <target name="clang_format" depends="install" if="clang_format.exe_file">
+    <target name="clang_format" depends="install" if="clang_format.exec_file">
         <echo>
-Command hints to reformat source using clang-format tool:
+Command hints to reformat source manually using clang-format tool (in case of format errors):
     git clang-format
     clang-format --style=file -i [SOURCE]
         </echo>
-        <apply executable="${clang_format.exe_file}" failonerror="true">
+        <apply executable="${clang_format.exec_file}" failonerror="true">
             <arg value="--style=file"/>
             <arg value="--dry-run"/>
             <arg value="--Werror"/>

diff --git a/compiler/extensions/java/build.xml b/compiler/extensions/java/build.xml
@@ -18,7 +18,7 @@ zserio_java.install_dir       - Directory where to install Zserio Doc Extension
 zserio_core.jar_file          - Zserio core jar file used for classpath.
                                 Default is "${zserio_extensions.build_dir}/../core/${ant.java.version}/jar/
                                 zserio_core.jar".
-clang_format.exe_file         - Clang-format executable file. If not set, clang-format is not run.
+clang_format.exec_file        - Clang-format executable file. If not set, clang-format is not run.
 spotbugs.home_dir             - Location of the spotbugs tool. If not set, spotbugs is not run.
 
 -->
@@ -151,13 +151,13 @@ spotbugs.home_dir             - Location of the spotbugs tool. If not set, spotb
         </copy>
     </target>
 
-    <target name="clang_format" depends="install" if="clang_format.exe_file">
+    <target name="clang_format" depends="install" if="clang_format.exec_file">
         <echo>
-Command hints to reformat source using clang-format tool:
+Command hints to reformat source manually using clang-format tool (in case of format errors):
     git clang-format
     clang-format --style=file -i [SOURCE]
         </echo>
-        <apply executable="${clang_format.exe_file}" failonerror="true">
+        <apply executable="${clang_format.exec_file}" failonerror="true">
             <arg value="--style=file"/>
             <arg value="--dry-run"/>
             <arg value="--Werror"/>

diff --git a/compiler/extensions/java/runtime/build.xml b/compiler/extensions/java/runtime/build.xml
@@ -17,7 +17,7 @@ relational.sqlite.jar_file      - SQLite JDBC jar file.
                                   Default is "../../../../3rdparty/java/sqlitejdbc-3.39.4.jar".
 relational.validation           - Flag whether the support for low level validation is included.
                                   Default is "yes".
-clang_format.exe_file           - Clang-format executable file. If not set, clang-format is not run.
+clang_format.exec_file          - Clang-format executable file. If not set, clang-format is not run.
 spotbugs.home_dir               - Location of the spotbugs tool. If not set, spotbugs is not run.
 
 -->
@@ -209,13 +209,13 @@ spotbugs.home_dir               - Location of the spotbugs tool. If not set, spo
                overwrite="true"/>
     </target>
 
-    <target name="clang_format" depends="install" if="clang_format.exe_file">
+    <target name="clang_format" depends="install" if="clang_format.exec_file">
         <echo>
-Command hints to reformat source using clang-format tool:
+Command hints to reformat source manually using clang-format tool (in case of format errors):
     git clang-format
     clang-format --style=file -i [SOURCE]
         </echo>
-        <apply executable="${clang_format.exe_file}" failonerror="true">
+        <apply executable="${clang_format.exec_file}" failonerror="true">
             <arg value="--style=file"/>
             <arg value="--dry-run"/>
             <arg value="--Werror"/>
@@ -279,13 +279,13 @@ Command hints to reformat source using clang-format tool:
         </javac>
     </target>
 
-    <target name="test.clang_format" depends="spotbugs, test.compile" if="clang_format.exe_file">
+    <target name="test.clang_format" depends="spotbugs, test.compile" if="clang_format.exec_file">
         <echo>
-Command hints to reformat source using clang-format tool:
+Command hints to reformat source manually using clang-format tool (in case of format errors):
     git clang-format
     clang-format --style=file -i [SOURCE]
         </echo>
-        <apply executable="${clang_format.exe_file}" failonerror="true">
+        <apply executable="${clang_format.exec_file}" failonerror="true">
             <arg value="--style=file"/>
             <arg value="--dry-run"/>
             <arg value="--Werror"/>

diff --git a/compiler/extensions/python/build.xml b/compiler/extensions/python/build.xml
@@ -18,7 +18,7 @@ zserio_python.install_dir     - Directory where to install Zserio Python Extensi
 zserio_core.jar_file          - Zserio core jar file used for classpath.
                                 Default is "${zserio_extensions.build_dir}/../core/${ant.java.version}/jar/
                                 zserio_core.jar".
-clang_format.exe_file         - Clang-format executable file. If not set, clang-format is not run.
+clang_format.exec_file        - Clang-format executable file. If not set, clang-format is not run.
 spotbugs.home_dir             - Location of the spotbugs tool. If not set, spotbugs is not run.
 
 -->
@@ -165,13 +165,13 @@ spotbugs.home_dir             - Location of the spotbugs tool. If not set, spotb
         </copy>
     </target>
 
-    <target name="clang_format" depends="install" if="clang_format.exe_file">
+    <target name="clang_format" depends="install" if="clang_format.exec_file">
         <echo>
-Command hints to reformat source using clang-format tool:
+Command hints to reformat source manually using clang-format tool (in case of format errors):
     git clang-format
     clang-format --style=file -i [SOURCE]
         </echo>
-        <apply executable="${clang_format.exe_file}" failonerror="true">
+        <apply executable="${clang_format.exec_file}" failonerror="true">
             <arg value="--style=file"/>
             <arg value="--dry-run"/>
             <arg value="--Werror"/>
@@ -221,13 +221,13 @@ Command hints to reformat source using clang-format tool:
         </javac>
     </target>
 
-    <target name="test.clang_format" depends="spotbugs, test.compile" if="clang_format.exe_file">
+    <target name="test.clang_format" depends="spotbugs, test.compile" if="clang_format.exec_file">
         <echo>
-Command hints to reformat source using clang-format tool:
+Command hints to reformat source manually using clang-format tool (in case of format errors):
     git clang-format
     clang-format --style=file -i [SOURCE]
         </echo>
-        <apply executable="${clang_format.exe_file}" failonerror="true">
+        <apply executable="${clang_format.exec_file}" failonerror="true">
             <arg value="--style=file"/>
             <arg value="--dry-run"/>
             <arg value="--Werror"/>

diff --git a/compiler/extensions/xml/build.xml b/compiler/extensions/xml/build.xml
@@ -19,7 +19,7 @@ zserio_xml.install_dir        - Directory where to install Zserio Doc Extension
 zserio_core.jar_file          - Zserio core jar file used for classpath.
                                 Default is "${zserio_extensions.build_dir}/../core/${ant.java.version}/jar/
                                 zserio_core.jar".
-clang_format.exe_file         - Clang-format executable file. If not set, clang-format is not run.
+clang_format.exec_file        - Clang-format executable file. If not set, clang-format is not run.
 spotbugs.home_dir             - Location of the spotbugs tool. If not set, spotbugs is not run.
 
 -->
@@ -150,13 +150,13 @@ spotbugs.home_dir             - Location of the spotbugs tool. If not set, spotb
         </copy>
     </target>
 
-    <target name="clang_format" depends="install" if="clang_format.exe_file">
+    <target name="clang_format" depends="install" if="clang_format.exec_file">
         <echo>
-Command hints to reformat source using clang-format tool:
+Command hints to reformat source manually using clang-format tool (in case of format errors):
     git clang-format
     clang-format --style=file -i [SOURCE]
         </echo>
-        <apply executable="${clang_format.exe_file}" failonerror="true">
+        <apply executable="${clang_format.exec_file}" failonerror="true">
             <arg value="--style=file"/>
             <arg value="--dry-run"/>
             <arg value="--Werror"/>

diff --git a/scripts/common_tools.sh b/scripts/common_tools.sh
@@ -684,7 +684,7 @@ compile_java()
     local ANT_TARGET="$1"; shift
 
     if [ -n "${CLANG_FORMAT_BIN}" ] ; then
-        ANT_PROPS+=("-Dclang_format.exe_file=${CLANG_FORMAT_BIN}")
+        ANT_PROPS+=("-Dclang_format.exec_file=${CLANG_FORMAT_BIN}")
     fi
 
     if [ -n "${SPOTBUGS_HOME}" ] ; then

diff --git a/test/arguments/allow_implicit_arrays/build.xml b/test/arguments/allow_implicit_arrays/build.xml
@@ -24,7 +24,7 @@
         <testCompile testName="allow_implicit_arrays"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="allow_implicit_arrays"/>
     </target>
 

diff --git a/test/arguments/set_top_level_package/build.xml b/test/arguments/set_top_level_package/build.xml
@@ -24,7 +24,7 @@
         <testCompile testName="set_top_level_package"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="set_top_level_package"/>
     </target>
 

diff --git a/test/arguments/with_range_check_code/build.xml b/test/arguments/with_range_check_code/build.xml
@@ -24,7 +24,7 @@
         <testCompile testName="with_range_check_code"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="with_range_check_code"/>
     </target>
 

diff --git a/test/arguments/with_type_info_code/build.xml b/test/arguments/with_type_info_code/build.xml
@@ -25,7 +25,7 @@
         <testCompile testName="with_type_info_code"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="with_type_info_code"/>
     </target>
 

diff --git a/test/arguments/with_validation_code/build.xml b/test/arguments/with_validation_code/build.xml
@@ -24,7 +24,7 @@
         <testCompile testName="with_validation_code"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="with_validation_code"/>
     </target>
 

diff --git a/test/arguments/without_cross_extension_check/build.xml b/test/arguments/without_cross_extension_check/build.xml
@@ -28,7 +28,7 @@
         <testCompile testName="without_cross_extension_check"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="without_cross_extension_check"/>
     </target>
 

diff --git a/test/arguments/without_pubsub_code/build.xml b/test/arguments/without_pubsub_code/build.xml
@@ -24,7 +24,7 @@
         <testCompile testName="without_pubsub_code"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="without_pubsub_code"/>
     </target>
 

diff --git a/test/arguments/without_service_code/build.xml b/test/arguments/without_service_code/build.xml
@@ -24,7 +24,7 @@
         <testCompile testName="without_service_code"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="without_service_code"/>
     </target>
 

diff --git a/test/arguments/without_writer_code/build.xml b/test/arguments/without_writer_code/build.xml
@@ -24,7 +24,7 @@
         <testCompile testName="without_writer_code"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="without_writer_code"/>
     </target>
 

diff --git a/test/build.xml b/test/build.xml
@@ -8,7 +8,7 @@ zserio.release_dir              - Directory where to find Zserio release to test
 zserio_java_test.build_root_dir - Build directory where to put generated files.
                                   Default is "../build/test/java".
 zserio_java_test.test_suites    - Test suites. Default is "**".
-clang_format.exe_file           - Clang-format executable file. If not set, clang-format is not run.
+clang_format.exec_file          - Clang-format executable file. If not set, clang-format is not run.
 spotbugs.home_dir               - Location of the spotbugs tool. If not set, spotbugs is not run.
 
 -->
@@ -199,11 +199,11 @@ spotbugs.home_dir               - Location of the spotbugs tool. If not set, spo
         <attribute name="srcPath" default="${@{testName}.base_dir}/java"/>
         <sequential>
             <echo>
-    Command hints to reformat source using clang-format tool:
+    Command hints to reformat source manually using clang-format tool (in case of format errors):
         git clang-format
         clang-format --style=file -i [SOURCE]
             </echo>
-            <apply executable="${clang_format.exe_file}" failonerror="true">
+            <apply executable="${clang_format.exec_file}" failonerror="true">
                 <arg value="--style=file"/>
                 <arg value="--dry-run"/>
                 <arg value="--Werror"/>

diff --git a/test/errors/alignment_error/build.xml b/test/errors/alignment_error/build.xml
@@ -21,7 +21,7 @@
         <testCompile testName="alignment_error" srcPath="${alignment_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="alignment_error" srcPath="${alignment_error.base_dir}/java"/>
     </target>
 

diff --git a/test/errors/array_types_error/build.xml b/test/errors/array_types_error/build.xml
@@ -75,7 +75,7 @@
         <testCompile testName="array_types_error" srcPath="${array_types_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="array_types_error" srcPath="${array_types_error.base_dir}/java"/>
     </target>
 

diff --git a/test/errors/bitmask_types_error/build.xml b/test/errors/bitmask_types_error/build.xml
@@ -37,7 +37,7 @@
         <testCompile testName="bitmask_types_error" srcPath="${bitmask_types_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="bitmask_types_error" srcPath="${bitmask_types_error.base_dir}/java"/>
     </target>
 

diff --git a/test/errors/builtin_types_error/build.xml b/test/errors/builtin_types_error/build.xml
@@ -31,7 +31,7 @@
         <testCompile testName="builtin_types_error" srcPath="${builtin_types_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="builtin_types_error" srcPath="${builtin_types_error.base_dir}/java"/>
     </target>