This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 97c8f419d9 Checkstyle config is relative to cwd, not basedir
97c8f419d9 is described below
commit 97c8f419d90af6225774815cfde212c71c14de87
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jun 9 13:24:52 2023 +0100
Checkstyle config is relative to cwd, not basedir
This fixes building when the cwd is not the root of the source tree
---
build.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/build.xml b/build.xml
index 099ee65b82..c14e94a939 100644
--- a/build.xml
+++ b/build.xml
@@ -852,7 +852,7 @@
<taskdef resource="${checkstyletask.properties}"
classpath="${checkstyle.jar}" />
<!-- Main checks -->
- <checkstyle config="res/checkstyle/checkstyle.xml">
+ <checkstyle config="${basedir}/res/checkstyle/checkstyle.xml">
<fileset dir="." >
<patternset refid="text.files" />
<include name="**/*.bat"/>
@@ -896,19 +896,19 @@
</fileset>
</checkstyle>
<!-- jakarta package checks -->
- <checkstyle config="res/checkstyle/jakarta-checkstyle.xml">
+ <checkstyle config="${basedir}/res/checkstyle/jakarta-checkstyle.xml">
<fileset dir="java/jakarta" >
<include name="**/*.java"/>
</fileset>
</checkstyle>
<!-- org package checks -->
- <checkstyle config="res/checkstyle/org-checkstyle.xml">
+ <checkstyle config="${basedir}/res/checkstyle/org-checkstyle.xml">
<fileset dir="java/org" >
<include name="**/*.java"/>
</fileset>
</checkstyle>
<!-- Tests checks -->
- <checkstyle config="res/checkstyle/test-checkstyle.xml">
+ <checkstyle config="${basedir}/res/checkstyle/test-checkstyle.xml">
<fileset dir="test" >
<patternset refid="text.files" />
<exclude name=".*/**"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
