Browse Source

Properly exclude ejbjar unless BCEL is around

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270119 13f79535-47bb-0310-9956-ffa450edef68
master
Conor MacNeill 23 years ago
parent
commit
5971a069cf
1 changed files with 10 additions and 3 deletions
  1. +10
    -3
      build.xml

+ 10
- 3
build.xml View File

@@ -200,6 +200,13 @@
<isset property="jakarta.oro.present" /> <isset property="jakarta.oro.present" />
</or> </or>
</condition> </condition>
<condition property="ejbjar.support">
<and>
<isset property="bcel.present" />
<isset property="jdk1.2+" />
</and>
</condition>
</target> </target>


<!-- <!--
@@ -260,9 +267,9 @@
<exclude name="${optional.package}/ejb/DDCreator*.java" unless="ejb.DDCreator.present" /> <exclude name="${optional.package}/ejb/DDCreator*.java" unless="ejb.DDCreator.present" />
<exclude name="${optional.package}/ejb/WLRun.java" unless="ejb.wls.present" /> <exclude name="${optional.package}/ejb/WLRun.java" unless="ejb.wls.present" />
<exclude name="${optional.package}/ejb/WLStop.java" unless="ejb.wls.present" /> <exclude name="${optional.package}/ejb/WLStop.java" unless="ejb.wls.present" />
<exclude name="${optional.package}/ejb/EjbJar.java" unless="jdk1.2+" />
<exclude name="${optional.package}/ejb/*DeploymentTool.java" unless="jdk1.2+" />
<exclude name="${optional.package}/ejb/IPlanet*.java" unless="jdk1.2+" />
<exclude name="${optional.package}/ejb/EjbJar.java" unless="ejbjar.support" />
<exclude name="${optional.package}/ejb/*DeploymentTool.java" unless="ejbjar.support" />
<exclude name="${optional.package}/ejb/IPlanet*.java" unless="ejbjar.support" />
<exclude name="${optional.package}/Javah.java" unless="jdk1.2+" /> <exclude name="${optional.package}/Javah.java" unless="jdk1.2+" />
<exclude name="${optional.package}/junit/*" unless="junit.present" /> <exclude name="${optional.package}/junit/*" unless="junit.present" />
<exclude name="${optional.package}/net/MimeMail.java" unless="javamail.complete" /> <exclude name="${optional.package}/net/MimeMail.java" unless="javamail.complete" />


Loading…
Cancel
Save