Commit 49dc4bf5 authored by Vít Kabele's avatar Vít Kabele

SHVM compile and build using separate build.xml

parent b98c10af
......@@ -278,7 +278,7 @@
</path>
<path id="shvm.classpath">
<pathelement location="${build.shvm}"/>
<pathelement location="${src.shvm.prefix}/${build.shvm}"/>
<pathelement location="${build.shvm.dispatch}"/>
</path>
</target>
......@@ -633,45 +633,13 @@
<target name="compile-shvm" depends="compile-util,compile-shvm-dispatch">
<mkdir dir="${build.shvm}"/>
<javac destdir="${build.shvm}" debug="true">
<src path="shvm/src/src-dislreserver" />
<src path="shvm/src/src-msg-analyze" />
<src path="shvm/src/src-msg-analyze-mtdispatch" />
<src path="shvm/src/src-msg-classinfo" />
<src path="shvm/src/src-msg-close" />
<src path="shvm/src/src-msg-instr" />
<src path="shvm/src/src-msg-newclass" />
<src path="shvm/src/src-msg-objfree" />
<src path="shvm/src/src-msg-reganalysis" />
<src path="shvm/src/src-msg-stringinfo" />
<src path="shvm/src/src-msg-threadend" />
<src path="shvm/src/src-msg-threadinfo" />
<src path="shvm/src/src-remoteanalysis" />
<src path="shvm/src/src-reqdispatch" />
<src path="shvm/src/src-shadow" />
<src path="shvm/src/src-util" />
<classpath refid="util.classpath"/>
<classpath refid="asm.classpath"/>
</javac>
<ant antfile="${src.shvm.prefix}/build.xml" target="compile" usenativebasedir="true"/>
</target>
<target name="build-shvm" depends="compile-shvm,build-shvm-dispatch">
<local name="shvm.server.class"/>
<find-class property="shvm.server.class" dir="${build.shvm}" name="DiSLREServer"/>
<jar destfile="${out.lib}/${shvm.lib}">
<manifest>
<attribute name="Class-Path" value="${asm.libs}"/>
<attribute name="Main-Class" value="${shvm.server.class}"/>
<attribute name="DiSL-Version" value="${disl.version}"/>
</manifest>
<fileset dir="${build.util}"/>
<fileset dir="${build.shvm}"/>
</jar>
<ant antfile="${src.shvm.prefix}/build.xml" target="build" usenativebasedir="true"/>
<copy file="${src.shvm.prefix}/${out.lib}/${shvm.lib}" tofile="${out.lib}/${shvm.lib}" />
</target>
<!-- Shadow VM agent -->
......@@ -847,7 +815,7 @@
<pathelement location="${build.util}"/>
<pathelement location="${src.disl-server.prefix}/${build.disl-server}" />
<pathelement location="${src.disl.prefix}/${build.disl}"/>
<pathelement location="${build.shvm}"/>
<pathelement location="${src.shvm.prefix}/${build.shvm}" />
</classpath>
<!-- pass properties starting with "disl.", "dislserver.", and "dislreserver." to the tests -->
......@@ -1083,16 +1051,13 @@
<ant dir="${src.examples}" target="clean"/>
</target>
<target name="clean-disl">
<ant dir="${src.disl.prefix}" target="clean" />
</target>
<target name="clean-disl-server">
<ant dir="${src.disl-server.prefix}" target="clean" />
</target>
<target name="clean" description="Removes all files produced during the build.">
<ant dir="${src.shvm.prefix}" target="clean" />
<ant dir="${src.disl-server.prefix}" target="clean" />
<ant dir="${src.disl.prefix}" target="clean" />
<target name="clean" depends="clean-disl, clean-disl-server" description="Removes all files produced during the build.">
<exec executable="make" dir="${src.disl.agent}">
<arg value="cleanall"/>
</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