|
|
@@ -202,12 +202,6 @@ |
|
|
<available property="kaffe.present" classname="jkaffe.rmi.rmic.RMIC"/> |
|
|
<available property="kaffe.present" classname="jkaffe.rmi.rmic.RMIC"/> |
|
|
<available property="rmic.present" classname="sun.rmi.rmic.Main"/> |
|
|
<available property="rmic.present" classname="sun.rmi.rmic.Main"/> |
|
|
<available property="wlrmic.present" classname="weblogic.rmic"/> |
|
|
<available property="wlrmic.present" classname="weblogic.rmic"/> |
|
|
<condition property="rmic5.present"> |
|
|
|
|
|
<and> |
|
|
|
|
|
<isset property="rmic.present"/> |
|
|
|
|
|
<available classname="java.net.Proxy"/> |
|
|
|
|
|
</and> |
|
|
|
|
|
</condition> |
|
|
|
|
|
<condition property="rmic6.present"> |
|
|
<condition property="rmic6.present"> |
|
|
<and> |
|
|
<and> |
|
|
<isset property="rmic.present"/> |
|
|
<isset property="rmic.present"/> |
|
|
@@ -434,41 +428,41 @@ |
|
|
<!-- |
|
|
<!-- |
|
|
This test stamps on the XML parser settings on java6, so it is disabled. |
|
|
This test stamps on the XML parser settings on java6, so it is disabled. |
|
|
--> |
|
|
--> |
|
|
<target name="testXnew" if="rmic5.present" unless="rmic6.present" depends="init"> |
|
|
|
|
|
|
|
|
<target name="testXnew" if="rmic.present" unless="rmic6.present" depends="init"> |
|
|
<base-rmic compiler="sun"> |
|
|
<base-rmic compiler="sun"> |
|
|
<compilerarg value="-Xnew"/> |
|
|
<compilerarg value="-Xnew"/> |
|
|
</base-rmic> |
|
|
</base-rmic> |
|
|
<assertBaseCompiled/> |
|
|
<assertBaseCompiled/> |
|
|
</target> |
|
|
</target> |
|
|
|
|
|
|
|
|
<target name="testXnewDest" if="rmic5.present" unless="rmic6.present" depends="init"> |
|
|
|
|
|
|
|
|
<target name="testXnewDest" if="rmic.present" unless="rmic6.present" depends="init"> |
|
|
<dest-rmic compiler="sun"> |
|
|
<dest-rmic compiler="sun"> |
|
|
<compilerarg value="-Xnew"/> |
|
|
<compilerarg value="-Xnew"/> |
|
|
</dest-rmic> |
|
|
</dest-rmic> |
|
|
<assertBaseCompiledInDest/> |
|
|
<assertBaseCompiledInDest/> |
|
|
</target> |
|
|
</target> |
|
|
|
|
|
|
|
|
<target name="testXnewForked" if="rmic5.present" depends="init"> |
|
|
|
|
|
|
|
|
<target name="testXnewForked" if="rmic.present" depends="init"> |
|
|
<base-rmic compiler="forking"> |
|
|
<base-rmic compiler="forking"> |
|
|
<compilerarg value="-Xnew"/> |
|
|
<compilerarg value="-Xnew"/> |
|
|
</base-rmic> |
|
|
</base-rmic> |
|
|
<assertBaseCompiled/> |
|
|
<assertBaseCompiled/> |
|
|
</target> |
|
|
</target> |
|
|
|
|
|
|
|
|
<target name="testXnewForkedDest" if="rmic5.present" depends="init"> |
|
|
|
|
|
|
|
|
<target name="testXnewForkedDest" if="rmic.present" depends="init"> |
|
|
<dest-rmic compiler="forking"> |
|
|
<dest-rmic compiler="forking"> |
|
|
<compilerarg value="-Xnew"/> |
|
|
<compilerarg value="-Xnew"/> |
|
|
</dest-rmic> |
|
|
</dest-rmic> |
|
|
<assertBaseCompiledInDest/> |
|
|
<assertBaseCompiledInDest/> |
|
|
</target> |
|
|
</target> |
|
|
|
|
|
|
|
|
<target name="testXnewCompiler" if="rmic5.present" depends="init"> |
|
|
|
|
|
|
|
|
<target name="testXnewCompiler" if="rmic.present" depends="init"> |
|
|
<base-rmic compiler="xnew"> |
|
|
<base-rmic compiler="xnew"> |
|
|
</base-rmic> |
|
|
</base-rmic> |
|
|
<assertBaseCompiled/> |
|
|
<assertBaseCompiled/> |
|
|
</target> |
|
|
</target> |
|
|
|
|
|
|
|
|
<target name="testXnewCompilerDest" if="rmic5.present" depends="init"> |
|
|
|
|
|
|
|
|
<target name="testXnewCompilerDest" if="rmic.present" depends="init"> |
|
|
<dest-rmic compiler="xnew"> |
|
|
<dest-rmic compiler="xnew"> |
|
|
</dest-rmic> |
|
|
</dest-rmic> |
|
|
<assertBaseCompiledInDest/> |
|
|
<assertBaseCompiledInDest/> |
|
|
|
Stefan Bodewig