Commit ed59ffb4 authored by Lubomir Bulej's avatar Lubomir Bulej

Don't set properties outside targets to avoid problems with outdated property...

Don't set properties outside targets to avoid problems with outdated property values when running multiple targets at the same time.
parent a3f9f711
...@@ -355,12 +355,18 @@ ...@@ -355,12 +355,18 @@
<!-- pathconvert property="build.disl.thread.available" setonempty="false"> <!-- pathconvert property="build.disl.thread.available" setonempty="false">
<fileset dir="." includes="${build.disl.thread}/**/Thread.class"/> <fileset dir="." includes="${build.disl.thread}/**/Thread.class"/>
</pathconvert --> </pathconvert -->
<condition property="build.disl.thread.available"><and> <target name="-check-disl-thread">
<available file="${build.disl.thread}/java/lang/Thread.class"/> <condition property="build.disl.thread.available"><and>
<length file="${build.disl.thread}/java/lang/Thread.class" when="greater" length="1024"/> <available file="${build.disl.thread}/java/lang/Thread.class"/>
</and></condition> <length file="${build.disl.thread}/java/lang/Thread.class" when="greater" length="1024"/>
</and></condition>
</target>
<target name="-create-disl-thread-if-needed" unless="build.disl.thread.available" depends="-check-disl-thread">
<antcall target="-create-disl-thread"/>
</target>
<target name="-prepare-disl-thread" unless="build.disl.thread.available" depends="compile-tools"> <target name="-create-disl-thread" depends="compile-tools">
<local name="extender.class"/> <local name="extender.class"/>
<find-class property="extender.class" dir="${build.tools}" name="ExtendThread"/> <find-class property="extender.class" dir="${build.tools}" name="ExtendThread"/>
...@@ -389,7 +395,7 @@ ...@@ -389,7 +395,7 @@
The DiSL server requires both classes to create class literals The DiSL server requires both classes to create class literals
in the weaver code. in the weaver code.
--> -->
<target name="compile-disl-bypass" depends="-init,-prepare-disl-thread"> <target name="compile-disl-bypass" depends="-init,-create-disl-thread-if-needed">
<ac:for list="always,never,dynamic" param="variant"> <ac:for list="always,never,dynamic" param="variant">
<sequential> <sequential>
<mkdir dir="${build.disl.bypass}/@{variant}"/> <mkdir dir="${build.disl.bypass}/@{variant}"/>
...@@ -1056,7 +1062,7 @@ ...@@ -1056,7 +1062,7 @@
</target> </target>
<target name="clean" depends="clean-examples" description="Removes all files produced during the build."> <target name="clean" description="Removes all files produced during the build.">
<exec executable="make" dir="${src.disl.agent}"> <exec executable="make" dir="${src.disl.agent}">
<arg value="cleanall"/> <arg value="cleanall"/>
</exec> </exec>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment