Now you can truly compile without either JMF or QT4J in your

extensions/ directory tree.  If and only if they are present,
integration with them is compiled in.

Removed a FIXME that I'd fixed a long time ago.
This commit is contained in:
dchandler 2002-11-16 16:35:25 +00:00
parent 872232c108
commit 5d212a0671

View file

@ -1048,29 +1048,49 @@
</target> </target>
<target name="compile-QT4J-classes-accessed-by-reflection"
if="found.QT4J"
description="If QT4J is available, this compiles QT4J integration.">
<antcall target="our-internal-javac-task">
<param name="mybin" value="${qdbin}"/>
<param name="my.included.source.file"
value="org/thdl/media/SmartQT4JPlayer.java"/>
</antcall>
<antcall target="our-internal-javac-task">
<param name="mybin" value="${savantbin}"/>
<param name="my.included.source.file"
value="org/thdl/media/SmartQT4JPlayer.java"/>
</antcall>
</target>
<target name="compile-JMF-classes-accessed-by-reflection"
if="found.JMF"
description="If JMF is available, this compiles JMF integration.">
<antcall target="our-internal-javac-task">
<param name="mybin" value="${qdbin}"/>
<param name="my.included.source.file"
value="org/thdl/media/SmartJMFPlayer.java"/>
</antcall>
<antcall target="our-internal-javac-task">
<param name="mybin" value="${savantbin}"/>
<param name="my.included.source.file"
value="org/thdl/media/SmartJMFPlayer.java"/>
</antcall>
</target>
<!-- If JMF is not available, we don't compile SmartJMFPlayer.
Similarly for QT4J. -->
<target name="compile-classes-accessed-by-reflection" <target name="compile-classes-accessed-by-reflection"
description="Compiles classes that we access these via reflection (thus, compiling SavantShell and QDShell will not include them)"> description="Compiles classes that we access these via reflection (thus, compiling SavantShell and QDShell will not include them)">
<antcall target="our-internal-javac-task"> <available classname="javax.media.NoPlayerException"
<param name="mybin" value="${qdbin}"/> classpathref="${our.javac.classpathref}"
<param name="my.included.source.file" property="found.JMF"/>
value="org/thdl/media/SmartJMFPlayer.java"/> <available classname="quicktime.std.clocks.TimeCallBack"
</antcall> classpathref="${our.javac.classpathref}"
<antcall target="our-internal-javac-task"> property="found.QT4J"/>
<param name="mybin" value="${qdbin}"/> <antcall target="compile-JMF-classes-accessed-by-reflection"/>
<param name="my.included.source.file" <antcall target="compile-QT4J-classes-accessed-by-reflection"/>
value="org/thdl/media/SmartQT4JPlayer.java"/>
</antcall>
<antcall target="our-internal-javac-task">
<param name="mybin" value="${savantbin}"/>
<param name="my.included.source.file"
value="org/thdl/media/SmartJMFPlayer.java"/>
</antcall>
<antcall target="our-internal-javac-task">
<param name="mybin" value="${savantbin}"/>
<param name="my.included.source.file"
value="org/thdl/media/SmartQT4JPlayer.java"/>
</antcall>
</target> </target>
@ -1080,7 +1100,3 @@
<!-- DLC FIXME: If we use bootclasspath and -target 1.1, do we need a <!-- DLC FIXME: If we use bootclasspath and -target 1.1, do we need a
separate tt-handheld and tt-standalone? --> separate tt-handheld and tt-standalone? -->
<!-- DLC FIXME: create the .jnlp files based on a template and Ant
properties. Edward e-mailed thdltools-devel requesting something
like this. -->