ant/clean.xml ant/compile.xml ant/docs.xml ant/package.xml ant/prepare.xml ant/test.xml @@ -1,56 +1,69 @@ <project xmlns:ivy="antlib:org.apache.ivy.ant"> - <!-- defaults for all projects --> - <!-- PROJECT MUST DEFINE: project.package, project.test.classname --> - <!-- optional: "project.jar.classname" to build an executable jar --> - <!-- optional: "skip.download" "skip.tests" --> - <property name="source.dir" value="${basedir}/src/main/scala" /> - <property name="test.source.dir" value="${basedir}/src/test/scala" /> - <property name="target.dir" value="${basedir}/target/classes" /> - <property name="test.target.dir" value="${basedir}/target/test-classes" /> - - <property environment="env" /> - - <property name="ivy.install.version" value="2.0.0-beta2" /> - <property name="ivy.jar.dir" value="${user.home}/.ivy2" /> - <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy-${ivy.install.version}.jar" /> - - <!-- override some ivy config --> - <property name="ivy.distrib.dir" value="${dist.dir}" /> - <property name="ivy.deliver.ivy.pattern" value="${dist.dir}/[artifact]-[revision].[ext]" /> - - <!-- - download ivy from the web site so that it can be used without being - installed. if the file has already been downloaded, we use a rename - trick to avoid hitting the website again. (that would be annoying - when building offline.) - --> - <target name="download-ivy" unless="skip.download"> - <mkdir dir="${ivy.jar.dir}"/> - <condition property="ivy.url" value="file:${ivy.jar.file}"> - <available file="${ivy.jar.file}" /> - </condition> - <property name="ivy.url" value="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" /> - <get src="${ivy.url}" dest="${ivy.jar.file}.download" usetimestamp="true" /> - <move file="${ivy.jar.file}.download" tofile="${ivy.jar.file}" /> - </target> - - <!-- import ivy's ant tasks --> - <target name="install-ivy" depends="download-ivy"> - <path id="ivy.lib.path"> - <fileset dir="${ivy.jar.dir}" includes="*.jar"/> - </path> - <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path" /> - </target> - - <!-- define filename-friendly names for the OS variants --> - <condition property="os.libsname" value="osx"> - <os name="Mac OS X" /> + <!-- defaults for all projects --> + <property name="source.dir" value="${basedir}/src/main" /> + <property name="test.source.dir" value="${basedir}/src/test" /> + <property name="target.dir" value="${basedir}/target" /> + + <property environment="env" /> + + <property name="ivy.install.version" value="2.0.0-rc1" /> + <property name="ivy.jar.dir" value="${user.home}/.ivy2" /> + <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy-${ivy.install.version}.jar" /> + <property name="jsch.install.version" value="0.1.29" /> + <property name="jsch.jar.file" value="${ivy.jar.dir}/jsch-${jsch.install.version}.jar" /> + + <!-- override some ivy config --> + <property name="ivy.distrib.dir" value="${dist.dir}" /> + <property name="ivy.deliver.ivy.pattern" value="${dist.dir}/[artifact]-[revision].[ext]" /> + + <!-- + download ivy from the web site so that it can be used without being + installed. if the file has already been downloaded, we use a rename + trick to avoid hitting the website again. (that would be annoying + when building offline.) + --> + <target name="download-ivy" unless="skip.download"> + <mkdir dir="${ivy.jar.dir}"/> + <condition property="ivy.url" value="file:${ivy.jar.file}"> + <available file="${ivy.jar.file}" /> </condition> - <condition property="os.libsname" value="linux"> - <os name="Linux" /> + <property name="ivy.url" value="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" /> + <get src="${ivy.url}" dest="${ivy.jar.file}.download" usetimestamp="true" /> + <move file="${ivy.jar.file}.download" tofile="${ivy.jar.file}" /> + + <condition property="jsch.url" value="file:${jsch.jar.file}"> + <available file="${jsch.jar.file}" /> </condition> + <property name="jsch.url" value="http://repo1.maven.org/maven2/jsch/jsch/${jsch.install.version}/jsch-${jsch.install.version}.jar" /> + <get src="${jsch.url}" dest="${jsch.jar.file}.download" usetimestamp="true" /> + <move file="${jsch.jar.file}.download" tofile="${jsch.jar.file}" /> + </target> + + <!-- import ivy's ant tasks --> + <target name="install-ivy" depends="download-ivy"> + <path id="ivy.lib.path"> + <fileset dir="${ivy.jar.dir}" includes="*.jar"/> + </path> + <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path" /> + </target> + + <!-- define filename-friendly names for the OS variants --> + <condition property="os.libsname" value="osx"> + <os name="Mac OS X" /> + </condition> + <condition property="os.libsname" value="linux"> + <os name="Linux" /> + </condition> - <import file="base_rules.xml" /> + <!-- where to look for the ivy config --> + <property name="ivy.dep.file" value="${basedir}/ivy/ivy.xml" /> + <property name="ivy.settings.file" value="${basedir}/ivy/ivysettings.xml" /> + <import file="clean.xml" /> + <import file="prepare.xml" /> + <import file="compile.xml" /> + <import file="test.xml" /> + <import file="docs.xml" /> + <import file="package.xml" /> </project> ant/bootstrap.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="configgy" default="install" xmlns:ivy="antlib:org.apache.ivy.ant"> +<project name="configgy" default="package" xmlns:ivy="antlib:org.apache.ivy.ant"> <description> Simple configuration and logging for scala. </description> <import file="ant/bootstrap.xml" /> </project> build.xml ant/base_rules.xml 6f101a9b4dcd30e75dbc6646e66139e7dac76c65 Robey Pointer robey@lag.net http://github.com/robey/configgy/commit/f54594f315ac1e64988d08077f38daa849acf96a f54594f315ac1e64988d08077f38daa849acf96a 2008-10-26T17:47:46-07:00 2008-10-26T17:47:46-07:00 use scala-build files. de761af812276bb8f46902e490951afa92eda138 Robey Pointer robey@lag.net