Issue #915: correct handling of checkstyle.ant.skip

sevntu-checkstyle · Oct 23, 2022 · 877e98b · 877e98b
1 parent eb45480
commit 877e98b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/sevntu-checks/ant-phase-verify-sevntu.xml b/sevntu-checks/ant-phase-verify-sevntu.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project name="phase-package" default="execute">
-
-  <condition property="checkstyle.ant.skip">
-    <isset property="checkstyle.ant.skip" />
+  <condition property="run">
+    <or>
+        <not>
+            <isset property="checkstyle.ant.skip"/>
+        </not>
+        <isfalse value="${checkstyle.ant.skip}"/>
+     </or>
   </condition>
 
-  <target name="execute" unless="checkstyle.ant.skip">
+  <target name="execute" if="run">
     <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"/>
 
     <property name="check.config" location="sevntu-checks.xml"/>

diff --git a/sevntu-checks/ant-phase-verify.xml b/sevntu-checks/ant-phase-verify.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project name="phase-package" default="execute">
-
-  <condition property="checkstyle.ant.skip">
-    <isset property="checkstyle.ant.skip" />
+  <condition property="run">
+    <or>
+        <not>
+            <isset property="checkstyle.ant.skip"/>
+        </not>
+        <isfalse value="${checkstyle.ant.skip}"/>
+     </or>
   </condition>
 
-  <target name="execute" unless="checkstyle.ant.skip">
+  <target name="execute" if="run">
     <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"/>
 
     <tstamp>