Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 36 additions & 5 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
<!-- <property file="${basedir}/default_build.properties"/> -->

<!-- <import file="${basedir}/../d4m_api_java/build_common_targets.xml"/> -->
<property name="graphulo.dir" value="${basedir}/../graphulo"/>
<property name="build.dir" value="${basedir}/build"/>
<property name="lib.dir" value="${basedir}/lib"/>
<property name="src.dir" value="${basedir}/src"/>
<property name="matlab_src.dir" value="${basedir}/matlab_src"/>
<property name="test_src.dir" value="${basedir}/test"/>
<property name="dist.dir" value="${build.dir}/dist"/>
<property name="bin.dir" value="${build.dir}/dist/bin"/>
Expand All @@ -25,7 +27,7 @@
<include name="matlab_src/**"/>
<exclude name="matlab_src/html/**"/>
<include name="TEST/**"/>
<include name="lib/**"/>
<include name="lib/graphulo-${version.num}*.jar"/>
<include name="libext/**"/>
<include name="examples/**"/>
<include name="COPYING.txt"/>
Expand All @@ -45,16 +47,22 @@
</fileset>
</copy>
<copy todir="${dist.dir}">
<fileset dir="${basedir}/../d4m_api_java/target">
<fileset dir="${graphulo.dir}/target">
<include name="graphulo-${version.num}-libext.zip"/>
</fileset>
</copy>
<copy todir="${dist.dir}/lib">
<fileset dir="${basedir}/../d4m_api_java/target">
<fileset dir="${graphulo.dir}/target">
<include name="graphulo-${version.num}.jar"/>
<include name="graphulo-${version.num}-alldeps.jar"/>
</fileset>
</copy>
<copy todir="${matlab_src.dir}">
<fileset dir="${graphulo.dir}/target">
<include name="DBinit.m"/>
</fileset>
</copy>

<!--
<copy todir="${dist.dir}/matlab_src">
<fileset dir="${basedir}/../d4m_api_java/target">
Expand All @@ -63,7 +71,30 @@
</copy>
-->
</target>

<target name="copy-graphulo-artifacts" depends="">
<!--
graphulo-X.X.X.jar > lib
graphulo-X.X.X-alldeps.jar > lib
graphulo-X.X.X-libext.zip > basedir
DBinit.m > matlab_src
-->
<copy todir="${basedir}/lib">
<fileset dir="${graphulo.dir}/target">
<include name="graphulo-${version.num}.jar"/>
<include name="graphulo-${version.num}-alldeps.jar"/>
</fileset>
</copy>
<copy todir="${basedir}">
<fileset dir="${graphulo.dir}/target">
<include name="graphulo-${version.num}-libext.zip"/>
</fileset>
</copy>
<copy todir="${matlab_src.dir}">
<fileset dir="${graphulo.dir}/target">
<include name="DBinit.m"/>
</fileset>
</copy>
</target>
<target name="init" depends="">
<mkdir dir="${build.dir}/dist"/>
<mkdir dir="${build.dir}/dist/docs"/>
Expand Down Expand Up @@ -111,7 +142,7 @@
</target>

<target name="all"
depends="clean, init_local, unzip-libext, build_distribution"
depends="clean,copy-graphulo-artifacts, init_local , unzip-libext, build_distribution"
description="Build a distribution of the whole software package"/>

<target name="my-echo" >
Expand Down
Binary file removed lib/graphulo-3.1.0.jar
Binary file not shown.
Binary file removed lib/graphulo-3.1.1.jar
Binary file not shown.
Binary file added lib/graphulo-3.2.0-alldeps.jar
Binary file not shown.
Binary file renamed lib/graphulo-3.1.2.jar → lib/graphulo-3.2.0.jar
Binary file not shown.
Binary file added lib/graphulo-3.3.0-alldeps.jar
Binary file not shown.
Binary file added lib/graphulo-3.3.0.jar
Binary file not shown.
140 changes: 80 additions & 60 deletions matlab_src/DBinit.m

Large diffs are not rendered by default.