Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 13:49:53 +01:00
Code Issues Projects Releases Wiki Activity

Updated ant build files for multi-project structure.

Browse Source
This commit is contained in:
akwizgran
2012-12-05 23:15:35 +00:00
parent f5626bee05
commit dca9470c28
5 changed files with 54 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
briar-android/ant.properties
View File

@@ -9,8 +9,9 @@
# 'source.dir' for the location of your java source folder and # 'source.dir' for the location of your java source folder and
# 'out.dir' for the location of your output folder. # 'out.dir' for the location of your output folder.
source.dir=src:../briar-core/src source.dir=../briar-api/src:../briar-core/src:src
external.libs.dir=../briar-core/libs 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 # You can also use it define how the release builds are signed by declaring
# the following properties: # the following properties:

28
briar-android/custom_rules.xml
View File

@@ -1,14 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version='1.0' encoding='UTF-8'?>
<project name="Briar" default="help"> <project name='Briar Custom Rules' default='help'>
<target name="-pre-compile"> <target name='-pre-compile'>
<path id="project.all.jars.path"> <path id='project.all.jars.path'>
<path path="${toString:project.all.jars.path}"/> <path path='${toString:project.all.jars.path}'/>
<fileset dir="${jar.libs.dir}"> <fileset dir='${api.jar.libs.dir}'>
<include name="*.jar"/> <exclude name='android.jar'/>
</fileset> <include name='*.jar'/>
<fileset dir="${external.libs.dir}"> </fileset>
<include name="*.jar"/> <fileset dir='${core.jar.libs.dir}'>
</fileset> <include name='*.jar'/>
</path> </fileset>
<fileset dir='${jar.libs.dir}'>
<include name='*.jar'/>
</fileset>
</path>
</target> </target>
</project> </project>

11
briar-api/src/build.xml → briar-api/build.xml
View File

@@ -1,20 +1,19 @@
<project name='briar-api' default='compile'> <project name='briar-api' default='compile'>
<fileset id='api-jars' dir='../libs'> <fileset id='api-jars' dir='libs'>
<include name='*.jar'/> <include name='*.jar'/>
</fileset> </fileset>
<path id='api-classes'> <path id='api-classes'>
<pathelement location='../build'/> <pathelement location='build'/>
</path> </path>
<target name='clean'> <target name='clean'>
<delete dir='../build'/> <delete dir='build'/>
</target> </target>
<target name='compile'> <target name='compile'>
<mkdir dir='../build'/> <mkdir dir='build'/>
<javac srcdir='.' destdir='../build' source='1.5' <javac srcdir='src' destdir='build' source='1.5'
includeantruntime='false' debug='off'> includeantruntime='false' debug='off'>
<classpath> <classpath>
<fileset refid='api-jars'/> <fileset refid='api-jars'/>
<path refid='api-classes'/>
</classpath> </classpath>
</javac> </javac>
</target> </target>

20
briar-core/src/build.xml → briar-core/build.xml
View File

@@ -1,28 +1,28 @@
<project name='briar-core' default='compile'> <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'/> <include name='*.jar'/>
</fileset> </fileset>
<fileset id='core-jars' dir='../libs'> <fileset id='core-jars' dir='libs'>
<include name='*.jar'/> <include name='*.jar'/>
</fileset> </fileset>
<path id='api-classes'> <path id='api-classes'>
<pathelement location='../../briar-api/build'/> <pathelement location='../briar-api/build'/>
</path> </path>
<target name='clean'> <target name='clean'>
<delete dir='../../briar-api/build'/> <delete dir='../briar-api/build'/>
<delete dir='../build'/> <delete dir='build'/>
</target> </target>
<target name='compile'> <target name='compile'>
<mkdir dir='../../briar-api/build'/> <mkdir dir='../briar-api/build'/>
<javac srcdir='../../briar-api/src' <javac srcdir='../briar-api/src'
destdir='../../briar-api/build' source='1.5' destdir='../briar-api/build' source='1.5'
includeantruntime='false' debug='off'> includeantruntime='false' debug='off'>
<classpath> <classpath>
<fileset refid='api-jars'/> <fileset refid='api-jars'/>
</classpath> </classpath>
</javac> </javac>
<mkdir dir='../build'/> <mkdir dir='build'/>
<javac srcdir='.' destdir='../build' source='1.5' <javac srcdir='src' destdir='build' source='1.5'
includeantruntime='false' debug='off'> includeantruntime='false' debug='off'>
<classpath> <classpath>
<fileset refid='core-jars'/> <fileset refid='core-jars'/>

40
briar-tests/src/build.xml → briar-tests/build.xml
View File

@@ -1,40 +1,40 @@
<project name='briar-tests' default='test'> <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'/> <include name='*.jar'/>
</fileset> </fileset>
<fileset id='core-jars' dir='../../briar-core/libs'> <fileset id='core-jars' dir='../briar-core/libs'>
<include name='*.jar'/> <include name='*.jar'/>
</fileset> </fileset>
<fileset id='test-jars' dir='../libs'> <fileset id='test-jars' dir='libs'>
<include name='*.jar'/> <include name='*.jar'/>
</fileset> </fileset>
<path id='api-classes'> <path id='api-classes'>
<pathelement location='../../briar-api/build'/> <pathelement location='../briar-api/build'/>
</path> </path>
<path id='core-classes'> <path id='core-classes'>
<pathelement location='../../briar-core/build'/> <pathelement location='../briar-core/build'/>
</path> </path>
<path id='test-classes'> <path id='test-classes'>
<pathelement location='../build'/> <pathelement location='build'/>
</path> </path>
<target name='clean'> <target name='clean'>
<delete dir='../../briar-api/build'/> <delete dir='../briar-api/build'/>
<delete dir='../../briar-core/build'/> <delete dir='../briar-core/build'/>
<delete dir='../build'/> <delete dir='build'/>
<delete dir='test.tmp'/> <delete dir='test.tmp'/>
</target> </target>
<target name='compile'> <target name='compile'>
<mkdir dir='../../briar-api/build'/> <mkdir dir='../briar-api/build'/>
<javac srcdir='../../briar-api/src' <javac srcdir='../briar-api/src'
destdir='../../briar-api/build' source='1.5' destdir='../briar-api/build' source='1.5'
includeantruntime='false' debug='off'> includeantruntime='false' debug='off'>
<classpath> <classpath>
<fileset refid='api-jars'/> <fileset refid='api-jars'/>
</classpath> </classpath>
</javac> </javac>
<mkdir dir='../../briar-core/build'/> <mkdir dir='../briar-core/build'/>
<javac srcdir='../../briar-core/src' <javac srcdir='../briar-core/src'
destdir='../../briar-core/build' source='1.5' destdir='../briar-core/build' source='1.5'
includeantruntime='false' debug='off'> includeantruntime='false' debug='off'>
<classpath> <classpath>
<fileset refid='core-jars'/> <fileset refid='core-jars'/>
@@ -42,8 +42,8 @@
<path refid='api-classes'/> <path refid='api-classes'/>
</classpath> </classpath>
</javac> </javac>
<mkdir dir='../build'/> <mkdir dir='build'/>
<javac srcdir='.' destdir='../build' source='1.5' <javac srcdir='src' destdir='build' source='1.5'
includeantruntime='false' debug='off'> includeantruntime='false' debug='off'>
<classpath> <classpath>
<fileset refid='test-jars'/> <fileset refid='test-jars'/>
@@ -67,7 +67,7 @@
<path refid='core-classes'/> <path refid='core-classes'/>
<path refid='api-classes'/> <path refid='api-classes'/>
</classpath> </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.LockFairnessTest'/>
<test name='net.sf.briar.ProtocolIntegrationTest'/> <test name='net.sf.briar.ProtocolIntegrationTest'/>
<test name='net.sf.briar.crypto.CounterModeTest'/> <test name='net.sf.briar.crypto.CounterModeTest'/>
@@ -114,7 +114,7 @@
</junit> </junit>
</target> </target>
<target name='test-slow' depends='compile'> <target name='test-slow' depends='compile'>
<junit printsummary='withOutAndErr' fork='yes' forkmode='once'> <junit printsummary='on' fork='yes' forkmode='once'>
<assertions> <assertions>
<enable/> <enable/>
</assertions> </assertions>
@@ -126,7 +126,7 @@
<path refid='core-classes'/> <path refid='core-classes'/>
<path refid='api-classes'/> <path refid='api-classes'/>
</classpath> </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.db.H2DatabaseTest'/>
<test name='net.sf.briar.plugins.tor.TorPluginTest'/> <test name='net.sf.briar.plugins.tor.TorPluginTest'/>
</junit> </junit>