mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-12 10:49:06 +01:00
Updated ant build files for multi-project structure.
This commit is contained in:
@@ -9,8 +9,9 @@
|
||||
# 'source.dir' for the location of your java source folder and
|
||||
# 'out.dir' for the location of your output folder.
|
||||
|
||||
source.dir=src:../briar-core/src
|
||||
external.libs.dir=../briar-core/libs
|
||||
source.dir=../briar-api/src:../briar-core/src:src
|
||||
api.jar.libs.dir=../briar-api/libs
|
||||
core.jar.libs.dir=../briar-core/libs
|
||||
|
||||
# You can also use it define how the release builds are signed by declaring
|
||||
# the following properties:
|
||||
|
||||
@@ -1,14 +1,18 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project name="Briar" default="help">
|
||||
<target name="-pre-compile">
|
||||
<path id="project.all.jars.path">
|
||||
<path path="${toString:project.all.jars.path}"/>
|
||||
<fileset dir="${jar.libs.dir}">
|
||||
<include name="*.jar"/>
|
||||
</fileset>
|
||||
<fileset dir="${external.libs.dir}">
|
||||
<include name="*.jar"/>
|
||||
</fileset>
|
||||
</path>
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<project name='Briar Custom Rules' default='help'>
|
||||
<target name='-pre-compile'>
|
||||
<path id='project.all.jars.path'>
|
||||
<path path='${toString:project.all.jars.path}'/>
|
||||
<fileset dir='${api.jar.libs.dir}'>
|
||||
<exclude name='android.jar'/>
|
||||
<include name='*.jar'/>
|
||||
</fileset>
|
||||
<fileset dir='${core.jar.libs.dir}'>
|
||||
<include name='*.jar'/>
|
||||
</fileset>
|
||||
<fileset dir='${jar.libs.dir}'>
|
||||
<include name='*.jar'/>
|
||||
</fileset>
|
||||
</path>
|
||||
</target>
|
||||
</project>
|
||||
|
||||
@@ -1,20 +1,19 @@
|
||||
<project name='briar-api' default='compile'>
|
||||
<fileset id='api-jars' dir='../libs'>
|
||||
<fileset id='api-jars' dir='libs'>
|
||||
<include name='*.jar'/>
|
||||
</fileset>
|
||||
<path id='api-classes'>
|
||||
<pathelement location='../build'/>
|
||||
<pathelement location='build'/>
|
||||
</path>
|
||||
<target name='clean'>
|
||||
<delete dir='../build'/>
|
||||
<delete dir='build'/>
|
||||
</target>
|
||||
<target name='compile'>
|
||||
<mkdir dir='../build'/>
|
||||
<javac srcdir='.' destdir='../build' source='1.5'
|
||||
<mkdir dir='build'/>
|
||||
<javac srcdir='src' destdir='build' source='1.5'
|
||||
includeantruntime='false' debug='off'>
|
||||
<classpath>
|
||||
<fileset refid='api-jars'/>
|
||||
<path refid='api-classes'/>
|
||||
</classpath>
|
||||
</javac>
|
||||
</target>
|
||||
@@ -1,28 +1,28 @@
|
||||
<project name='briar-core' default='compile'>
|
||||
<fileset id='api-jars' dir='../../briar-api/libs'>
|
||||
<fileset id='api-jars' dir='../briar-api/libs'>
|
||||
<include name='*.jar'/>
|
||||
</fileset>
|
||||
<fileset id='core-jars' dir='../libs'>
|
||||
<fileset id='core-jars' dir='libs'>
|
||||
<include name='*.jar'/>
|
||||
</fileset>
|
||||
<path id='api-classes'>
|
||||
<pathelement location='../../briar-api/build'/>
|
||||
<pathelement location='../briar-api/build'/>
|
||||
</path>
|
||||
<target name='clean'>
|
||||
<delete dir='../../briar-api/build'/>
|
||||
<delete dir='../build'/>
|
||||
<delete dir='../briar-api/build'/>
|
||||
<delete dir='build'/>
|
||||
</target>
|
||||
<target name='compile'>
|
||||
<mkdir dir='../../briar-api/build'/>
|
||||
<javac srcdir='../../briar-api/src'
|
||||
destdir='../../briar-api/build' source='1.5'
|
||||
<mkdir dir='../briar-api/build'/>
|
||||
<javac srcdir='../briar-api/src'
|
||||
destdir='../briar-api/build' source='1.5'
|
||||
includeantruntime='false' debug='off'>
|
||||
<classpath>
|
||||
<fileset refid='api-jars'/>
|
||||
</classpath>
|
||||
</javac>
|
||||
<mkdir dir='../build'/>
|
||||
<javac srcdir='.' destdir='../build' source='1.5'
|
||||
<mkdir dir='build'/>
|
||||
<javac srcdir='src' destdir='build' source='1.5'
|
||||
includeantruntime='false' debug='off'>
|
||||
<classpath>
|
||||
<fileset refid='core-jars'/>
|
||||
@@ -1,40 +1,40 @@
|
||||
<project name='briar-tests' default='test'>
|
||||
<fileset id='api-jars' dir='../../briar-api/libs'>
|
||||
<fileset id='api-jars' dir='../briar-api/libs'>
|
||||
<include name='*.jar'/>
|
||||
</fileset>
|
||||
<fileset id='core-jars' dir='../../briar-core/libs'>
|
||||
<fileset id='core-jars' dir='../briar-core/libs'>
|
||||
<include name='*.jar'/>
|
||||
</fileset>
|
||||
<fileset id='test-jars' dir='../libs'>
|
||||
<fileset id='test-jars' dir='libs'>
|
||||
<include name='*.jar'/>
|
||||
</fileset>
|
||||
<path id='api-classes'>
|
||||
<pathelement location='../../briar-api/build'/>
|
||||
<pathelement location='../briar-api/build'/>
|
||||
</path>
|
||||
<path id='core-classes'>
|
||||
<pathelement location='../../briar-core/build'/>
|
||||
<pathelement location='../briar-core/build'/>
|
||||
</path>
|
||||
<path id='test-classes'>
|
||||
<pathelement location='../build'/>
|
||||
<pathelement location='build'/>
|
||||
</path>
|
||||
<target name='clean'>
|
||||
<delete dir='../../briar-api/build'/>
|
||||
<delete dir='../../briar-core/build'/>
|
||||
<delete dir='../build'/>
|
||||
<delete dir='../briar-api/build'/>
|
||||
<delete dir='../briar-core/build'/>
|
||||
<delete dir='build'/>
|
||||
<delete dir='test.tmp'/>
|
||||
</target>
|
||||
<target name='compile'>
|
||||
<mkdir dir='../../briar-api/build'/>
|
||||
<javac srcdir='../../briar-api/src'
|
||||
destdir='../../briar-api/build' source='1.5'
|
||||
<mkdir dir='../briar-api/build'/>
|
||||
<javac srcdir='../briar-api/src'
|
||||
destdir='../briar-api/build' source='1.5'
|
||||
includeantruntime='false' debug='off'>
|
||||
<classpath>
|
||||
<fileset refid='api-jars'/>
|
||||
</classpath>
|
||||
</javac>
|
||||
<mkdir dir='../../briar-core/build'/>
|
||||
<javac srcdir='../../briar-core/src'
|
||||
destdir='../../briar-core/build' source='1.5'
|
||||
<mkdir dir='../briar-core/build'/>
|
||||
<javac srcdir='../briar-core/src'
|
||||
destdir='../briar-core/build' source='1.5'
|
||||
includeantruntime='false' debug='off'>
|
||||
<classpath>
|
||||
<fileset refid='core-jars'/>
|
||||
@@ -42,8 +42,8 @@
|
||||
<path refid='api-classes'/>
|
||||
</classpath>
|
||||
</javac>
|
||||
<mkdir dir='../build'/>
|
||||
<javac srcdir='.' destdir='../build' source='1.5'
|
||||
<mkdir dir='build'/>
|
||||
<javac srcdir='src' destdir='build' source='1.5'
|
||||
includeantruntime='false' debug='off'>
|
||||
<classpath>
|
||||
<fileset refid='test-jars'/>
|
||||
@@ -67,7 +67,7 @@
|
||||
<path refid='core-classes'/>
|
||||
<path refid='api-classes'/>
|
||||
</classpath>
|
||||
<jvmarg value='-Djava.library.path=../../briar-core/libs'/>
|
||||
<jvmarg value='-Djava.library.path=../briar-core/libs'/>
|
||||
<test name='net.sf.briar.LockFairnessTest'/>
|
||||
<test name='net.sf.briar.ProtocolIntegrationTest'/>
|
||||
<test name='net.sf.briar.crypto.CounterModeTest'/>
|
||||
@@ -114,7 +114,7 @@
|
||||
</junit>
|
||||
</target>
|
||||
<target name='test-slow' depends='compile'>
|
||||
<junit printsummary='withOutAndErr' fork='yes' forkmode='once'>
|
||||
<junit printsummary='on' fork='yes' forkmode='once'>
|
||||
<assertions>
|
||||
<enable/>
|
||||
</assertions>
|
||||
@@ -126,7 +126,7 @@
|
||||
<path refid='core-classes'/>
|
||||
<path refid='api-classes'/>
|
||||
</classpath>
|
||||
<jvmarg value='-Djava.library.path=../../briar-core/libs'/>
|
||||
<jvmarg value='-Djava.library.path=../briar-core/libs'/>
|
||||
<test name='net.sf.briar.db.H2DatabaseTest'/>
|
||||
<test name='net.sf.briar.plugins.tor.TorPluginTest'/>
|
||||
</junit>
|
||||
Reference in New Issue
Block a user