@@ -62,22 +62,26 @@ <target name="package" depends="test, make-non-executable-jar, make-executable-jar, generate-scripts, docs" description="build complete jar(s) and docs"> - <ivy:makepom ivyfile="${basedir}/ivy/ivy.xml" pomfile="${dist.dir}/${dist.name}.pom" /> + <ivy:makepom ivyfile="${basedir}/ivy/ivy.xml" pomfile="${dist.dir}/${dist.name}.pom"> + <mapping conf="*" scope="runtime" /> + <mapping conf="bootstrap" scope="compile" /> + <mapping conf="test" scope="compile" /> + </ivy:makepom> <ivy:deliver conf="*(public)" /> - <condition property="dist.zip.name" - value="${dist.name}-${revision-short}.zip" - else="${dist.name}.zip"> - <isset property="dist.build_name" /> + <condition property="dist.tarball.name" + value="${ivy.module}-${revision-short}.tar.bz2" + else="${dist.name}.tar.bz2"> + <isset property="dist.build_integration" /> </condition> - <zip destfile="${basedir}/dist/${dist.zip.name}" - basedir="${basedir}/dist"> + <tar destfile="${basedir}/dist/${dist.tarball.name}" + basedir="${basedir}/dist" compression="bzip2"> <include name="${dist.name}/${jar.name}.jar" /> <include name="${dist.name}/*.so" /> <include name="${dist.name}/*.jnilib" /> <include name="${dist.name}/libs/**" /> <include name="${dist.name}/config/**" /> <include name="${dist.name}/scripts/**" /> - </zip> + </tar> <ivy:publish resolver="local" overwrite="true"> <artifacts pattern="${dist.dir}/[artifact]-[revision].[ext]" /> </ivy:publish> ant/package.xml @@ -8,8 +8,10 @@ <ivy:info file="${ivy.dep.file}" /> + <condition property="dist.name" value="${ivy.module}" else="${ivy.module}-${ivy.revision}"> + <isset property="dist.build_integration" /> + </condition> <property name="jar.name" value="${ivy.module}-${ivy.revision}" /> - <property name="dist.name" value="${ivy.module}-${ivy.revision}" /> <property name="dist.relative.dir" value="dist/${dist.name}" /> <property name="dist.dir" value="${basedir}/${dist.relative.dir}" /> <property name="docs.target.dir" value="${dist.dir}/docs" /> ant/prepare.xml @@ -38,12 +38,19 @@ <run-test-class classname="${ivy.extra.stresstestclass}" /> </target> + <target name="run-check-tests" unless="skip.test" if="ivy.extra.checktestclass"> + <run-test-class classname="${ivy.extra.checktestclass}" /> + </target> + <target name="unit" depends="compile-tests, run-unit-tests" description="compile and run unit tests" /> <target name="stress" depends="compile-tests, run-stress-tests" description="compile and run stress tests" /> + <target name="check" depends="compile-tests, run-check-tests" + description="compile and run check tests" /> + <target name="test" depends="unit" /> </project> ant/test.xml @@ -13,11 +13,11 @@ </configurations> <dependencies> <!-- i guess scala-compiler.jar is needed for MainGenericRunner --> - <dependency org="org.scala-lang" name="scala-compiler" rev="2.7.4" conf="bootstrap->*; test->*" /> + <dependency org="org.scala-lang" name="scala-compiler" rev="2.7.4" /> <dependency org="org.scala-lang" name="scala-library" rev="2.7.4" /> <dependency org="org.scala-tools" name="vscaladoc" rev="1.1-md-3" conf="bootstrap->*" /> <dependency org="markdownj" name="markdownj" rev="1.0.2b4-0.3.0" conf="bootstrap->*" /> - <dependency org="junit" name="junit" rev="4.4" /> - <dependency org="org.scala-tools.testing" name="specs" rev="1.4.4" conf="bootstrap->*; test->*" /> + <dependency org="junit" name="junit" rev="4.4" conf="test->*" /> + <dependency org="org.scala-tools.testing" name="specs" rev="1.4.4" conf="test->*" /> </dependencies> </ivy-module> ivy/ivy.xml f7f474c229c7ecf71b0baadeb6ecfca139f8de98 Robey Pointer robeypointer@gmail.com http://github.com/robey/configgy/commit/94b4f89f5abe42663bcee1d9e955f475e8812757 94b4f89f5abe42663bcee1d9e955f475e8812757 2009-05-23T21:38:11-07:00 2009-05-23T21:38:11-07:00 fix up build scripts. 738c26d61000bbacb160681e3bf3879b1849f109 Robey Pointer robeypointer@gmail.com