INSTALL.md @@ -71,6 +71,8 @@ Properties that can change behavior any extra files to copy into dist/<p> during compile - config.extra any extra files to copy into config/ during compile +- pack.deps + pack dependent jars into the final dist jar, to remove dependencies Extra ivy thingies ant/README.txt @@ -135,13 +135,10 @@ <copy todir="${dist.dir}/libs" flatten="true"> <path refid="deps.path" /> </copy> - <copy todir="${target.dir}/test-classes/resources" failonerror="false"> + <copy todir="${target.dir}/test-classes/" failonerror="false"> <fileset dir="${test.source.dir}/resources" /> </copy> - <copy todir="${target.dir}/classes/resources" overwrite="true" failonerror="false"> - <fileset dir="${source.dir}/resources" /> - </copy> - <copy todir="${dist.dir}/resources" overwrite="true" failonerror="false"> + <copy todir="${target.dir}/classes/" overwrite="true" failonerror="false"> <fileset dir="${source.dir}/resources" /> </copy> </target> ant/compile.xml @@ -1,13 +1,25 @@ <project xmlns:ivy="antlib:org.apache.ivy.ant"> - <target name="make-non-executable-jar" unless="ivy.extra.jarclassname"> + <!-- unzip all the dependent jars into target/ so that the final jar will depend on nothing. kinda evil. --> + <target name="pack-deps" if="pack.deps"> + <pathconvert pathsep="," property="deps.path.list"> + <path refid="deps.path" /> + <map from="/" to="" /> + </pathconvert> + <unzip dest="${target.dir}/classes"> + <fileset dir="/" includes="${deps.path.list}" /> + </unzip> + <delete dir="${target.dir}/classes/META-INF" /> + </target> + + <target name="make-non-executable-jar" unless="ivy.extra.jarclassname" depends="pack-deps"> <jar destfile="${dist.dir}/${jar.name}.jar"> <fileset dir="${target.dir}/classes" /> </jar> </target> <!-- generate a jar that contains all deps inside it, so it can be run with "java -jar" --> - <target name="make-executable-jar" if="ivy.extra.jarclassname" depends="copy-extra"> + <target name="make-executable-jar" if="ivy.extra.jarclassname" depends="copy-extra,pack-deps"> <pathconvert refid="deps.path" pathsep=" " property="deps.path.jar-format"> <chainedmapper> <flattenmapper /> @@ -42,6 +54,7 @@ <filter token="TEST_CLASSPATH" value="${test.classpath}:${target.dir}/classes:${target.dir}/test-classes" /> <filter token="DIST_CLASSPATH" value="${deps.path.dist-format}:$${DIST_HOME}/${jar.name}.jar" /> <filter token="TARGET" value="${target.dir}" /> + <filter token="DIST_NAME" value="${dist.name}" /> </filterset> </copy> <chmod dir="${dist.dir}/scripts" includes="*" perm="ugo+x" /> ant/package.xml INSTALL 6719c784b43f0965966fe2547ba2d9e60766c527 Robey Pointer robeypointer@gmail.com http://github.com/robey/configgy/commit/d84f5800d3a0cf00c5952123ec78178753d892a3 d84f5800d3a0cf00c5952123ec78178753d892a3 2008-12-27T22:16:07-08:00 2008-12-27T22:16:07-08:00 update scala-build. 003cd77ba0c035b23c09955e120be525c64d936f Robey Pointer robeypointer@gmail.com