Commit 07ac0b7f authored by Ivo Anjo's avatar Ivo Anjo

Import jars of both ant-contrib and ant-contrib-cpptasks

This makes it easier to build javartm, especially since the ubuntu and debian packages for these
jars did not work out of the box (see old version of the README).
parent 6bbb4bde
......@@ -14,10 +14,7 @@ Testing on other CPUs can be done using the [Intel Software Development Emulator
## Building
Building is done with ant, and requires both the [ant-cpptasks][ant-cpptasks] and the [ant-contrib][ant-contrib] libraries.
Note that both the `ant-contrib-cpptasks` and the `ant-contrib` packages in Ubuntu are not installed to the right places, and ant will not be able to use them automatically. (To fix it, run `sudo ln -s /usr/share/java/ant-contrib-cpptasks.jar /usr/share/ant/lib/` && `sudo ln -s /usr/share/java/ant-contrib.jar /usr/share/ant/lib/`)
Building is done with ant.
Gcc's native suport for RTM (for versions >= 4.8) is used if available; otherwise javartm includes a fallback alternative.
I plan on providing binary packages of javartm soon. If they aren't up yet, feel free to mail me to ask for them.
......@@ -39,8 +36,6 @@ Thanks for reading this far! :)
[inteltsx]: http://software.intel.com/en-us/blogs/2012/02/07/transactional-synchronization-in-haswell
[intelsde]: http://software.intel.com/en-us/articles/intel-software-development-emulator
[tsxspecs]: http://software.intel.com/sites/default/files/m/9/2/3/41604 "Intel Architecture Instruction Set Extensions Programming Reference"
[ant-cpptasks]: http://ant-contrib.sourceforge.net/cpptasks/index.html
[ant-contrib]: http://ant-contrib.sourceforge.net/
[insthome]: https://fenix.ist.utl.pt/homepage/ist155460
[eswweb]: http://www.esw.inesc-id.pt/
[jvstm]: http://esw.inesc-id.pt/git/jvstm.git/
......
......@@ -16,6 +16,20 @@
<property name="jar.file" value="${dist.dir}/${jar.filename}"/>
<property name="jarfat.file" value="${dist.dir}/javartm-fat-${dist.version}.jar"/>
<property name="antjars.dir" value="antlib"/>
<property name="ant-contrib.file" value="${antjars.dir}/ant-contrib-1.0b5-SNAPSHOT.jar"/>
<property name="ant-cpptasks.file" value="${antjars.dir}/ant-contrib-cpptasks-1.0~b5.jar"/>
<!-- import ant-contrib -->
<taskdef resource="net/sf/antcontrib/antlib.xml">
<classpath><pathelement location="${ant-contrib.file}"/></classpath>
</taskdef>
<!-- import ant-cpptasks -->
<taskdef resource="cpptasks.tasks">
<classpath><pathelement location="${ant-cpptasks.file}"/></classpath>
</taskdef>
<path id="jars-classpath">
<fileset dir="${jars.dir}" >
<include name="*.jar"/>
......@@ -49,7 +63,6 @@
</target>
<target name="jni-compile-libtestrtmsupport" depends="jni-headers">
<taskdef resource="cpptasks.tasks"/> <!-- import cpptasks -->
<mkdir dir="${jnioutput.dir}"/>
<cc outtype="shared" subsystem="console" objdir="${jni.dir}" outfile="${jnioutput.dir}/testrtmsupport">
<compilerarg value="-Wall"/>
......@@ -64,7 +77,6 @@
</target>
<target name="jni-compile-libjavartm-dummy" depends="jni-headers">
<taskdef resource="cpptasks.tasks"/> <!-- import cpptasks -->
<mkdir dir="${jnioutput.dir}"/>
<cc outtype="shared" subsystem="console" objdir="${jni.dir}" outfile="${jnioutput.dir}/javartm-dummy">
<compilerarg value="-Wall"/>
......@@ -79,8 +91,6 @@
</target>
<target name="jni-compile-libjavartm" depends="jni-headers">
<taskdef resource="cpptasks.tasks"/> <!-- import cpptasks -->
<taskdef resource="net/sf/antcontrib/antlib.xml"/> <!-- import ant-contrib -->
<mkdir dir="${jnioutput.dir}"/>
<trycatch>
<try>
......
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