diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-26 00:00:19 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-28 23:34:03 +0100 |
| commit | 4986355660abd2a9672ed336cdbc707fda73b5b0 (patch) | |
| tree | c297ef2b9a3c1414f6c2b8b09ddc6c18de6d6410 | |
| parent | ff464ee8fab2bdf478adaac7b70e451e7a1c69dc (diff) | |
| download | toolchain_jack-4986355660abd2a9672ed336cdbc707fda73b5b0.zip toolchain_jack-4986355660abd2a9672ed336cdbc707fda73b5b0.tar.gz toolchain_jack-4986355660abd2a9672ed336cdbc707fda73b5b0.tar.bz2 | |
get simple jars directly from their out dirs
remove a jack-default-lib dependency (breaks build)
Change-Id: I70e5744a684bf3ac6c8579b8758c1cbd060d50ac
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
| -rw-r--r-- | build.xml | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -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> @@ -988,9 +984,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> |