summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-01-26 00:00:19 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-01-26 00:00:19 +0100
commitb372c6eef8f972c1164af33acfcc5c6388231e58 (patch)
treef46940173020c112f4a31cfd1bb300075e09852f
parentde2b05dea8822aeb31505116bb9c01a0553b0fe8 (diff)
downloadtoolchain_jack-ub-jack-brest.zip
toolchain_jack-ub-jack-brest.tar.gz
toolchain_jack-ub-jack-brest.tar.bz2
get simple jars directly from their out dirsub-jack-brest
remove a jack-default-lib dependency (breaks build) Change-Id: I70e5744a684bf3ac6c8579b8758c1cbd060d50ac Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
-rw-r--r--build.xml10
1 files changed, 3 insertions, 7 deletions
diff --git a/build.xml b/build.xml
index 7ea2e03..0423aae 100644
--- a/build.xml
+++ b/build.xml
@@ -384,10 +384,6 @@
<copy todir="${jack.exec.build.outdir}">
<fileset dir="${jack-server.build.outdir}"/>
</copy>
- <mkdir dir="${jack.exec.build.outdir}/jack-default-lib"/>
- <copy todir="${jack.exec.build.outdir}/jack-default-lib">
- <fileset dir="${jack-default-lib.build.outdir}"/>
- </copy>
<jar destfile="${jack.dist.dir}/${jack.execname}"
manifest="${jack.dir}/etc/manifest.txt" basedir="${jack.exec.build.outdir}" includes="**"/>
</target>
@@ -990,9 +986,9 @@
<target name="simple-lib">
<mkdir dir="${simple.dist.dir}"/>
<mkdir dir="${simple.build.outdir}"/>
- <unzip dest="${simple.build.outdir}" src="${simple.dir}/simple-common-6.0.1.jar"/>
- <unzip dest="${simple.build.outdir}" src="${simple.dir}/simple-http-6.0.1.jar"/>
- <unzip dest="${simple.build.outdir}" src="${simple.dir}/simple-transport-6.0.1.jar"/>
+ <unzip dest="${simple.build.outdir}" src="${simple.dir}/simple-common/target/simple-common-6.0.1.jar"/>
+ <unzip dest="${simple.build.outdir}" src="${simple.dir}/simple-http/target/simple-http-6.0.1.jar"/>
+ <unzip dest="${simple.build.outdir}" src="${simple.dir}/simple-transport/target/simple-transport-6.0.1.jar"/>
<jar basedir="${simple.build.outdir}" destfile="${simple.dist.dir}/${simple.libname}"/>
</target>