Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

make the build.xml and ivy.xml files look the same

Conflicts:

	build.xml
  • Loading branch information...
commit 3b658ce650cf46ff136c686e6f725373074f00c4 1 parent 5f5984d
Doc Ritezel ohrite authored committed
Showing with 71 additions and 90 deletions.
  1. +58 −69 build.xml
  2. +13 −21 ivy.xml
127 build.xml
View
@@ -1,73 +1,77 @@
<?xml version="1.0"?>
<!--
- ~ Copyright (c) 2010 Concurrent, Inc. All Rights Reserved.
+ ~ Copyright (c) 2007-2011 Concurrent, Inc. All Rights Reserved.
~
- ~ Project and contact information: http://www.concurrentinc.com/
+ ~ Project and contact information: http://www.cascading.org/
+ ~
+ ~ This file is part of the Cascading project.
+ ~
+ ~ Cascading is free software: you can redistribute it and/or modify
+ ~ it under the terms of the GNU General Public License as published by
+ ~ the Free Software Foundation, either version 3 of the License, or
+ ~ (at your option) any later version.
+ ~
+ ~ Cascading is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ~ GNU General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU General Public License
+ ~ along with Cascading. If not, see <http://www.gnu.org/licenses/>.
-->
-<project name="cascading.load" default="build" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="load" default="compile" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
+
+ <dirname property="load.basedir" file="${ant.file.load}"/>
<!-- load properties first -->
<property file="../build.properties"/>
<property file="./build.properties"/>
- <property name="src.license" location="${basedir}/LICENSE.txt"/>
+ <property name="src.license" location="${load.basedir}/LICENSE.txt"/>
- <property name="src.dir" location="${basedir}/src/java"/>
- <property name="src.data" location="${basedir}/src/data"/>
- <property name="src.test" location="${basedir}/src/test"/>
+ <property name="src.dir" location="${load.basedir}/src/java"/>
+ <property name="src.test" location="${load.basedir}/src/test"/>
<available file="${src.dir}" type="dir" property="main.available"/>
<available file="${src.test}" type="dir" property="test.available"/>
- <property name="lib.dir" location="${basedir}/lib"/>
- <property name="compile.lib.dir" location="${lib.dir}/compile"/>
- <property name="runtime.lib.dir" location="${lib.dir}/runtime"/>
- <property name="test.lib.dir" location="${lib.dir}/test"/>
+ <property name="lib.dir" location="${load.basedir}/lib"/>
- <property name="build.dir" location="${basedir}/build/"/>
+ <property name="scripts.dir" location="${load.basedir}/bin"/>
+
+ <property name="build.dir" location="${load.basedir}/build/"/>
<property name="build.classes" location="${build.dir}/classes"/>
<property name="build.test" location="${build.dir}/test"/>
+ <property name="build.deps" location="${build.dir}/deps"/>
<property name="test.results" location="${build.dir}/testresults"/>
<property name="test.showoutput" value="no"/>
<property name="dist" location="dist"/>
- <fileset id="lib.compile.fileset" dir="${compile.lib.dir}">
- <include name="*.jar"/>
- </fileset>
-
- <fileset id="lib.runtime.fileset" dir="${runtime.lib.dir}">
- <include name="*.jar"/>
- </fileset>
-
- <fileset id="lib.test.fileset" dir="${test.lib.dir}">
- <include name="*.jar"/>
- </fileset>
-
-
<path id="project.class.path">
<pathelement location="${build.classes}"/>
<pathelement location="${build.test}"/>
- <fileset refid="lib.compile.fileset"/>
- <fileset refid="lib.runtime.fileset"/>
- <fileset refid="lib.test.fileset"/>
+ <fileset dir="${lib.dir}">
+ <include name="*.jar"/>
+ </fileset>
+
+ <fileset dir="${build.deps}">
+ <include name="*.jar"/>
+ </fileset>
</path>
<target name="clean">
-
<echo message="cleaning..."/>
<delete dir="${build.dir}"/>
<delete dir="${dist}"/>
<delete dir="${ant.project.name}.tgz"/>
-
</target>
<target name="compile">
-
<echo message="building..."/>
<mkdir dir="${build.classes}"/>
@@ -81,16 +85,10 @@
</fileset>
</copy>
- <copy todir="${build.classes}">
- <fileset dir="${src.data}">
- <exclude name="**/*.java"/>
- </fileset>
- </copy>
-
+ <copy file="${src.license}" tofile="${build.classes}/LOAD-LICENSE.txt"/>
</target>
<target name="compile-test">
-
<echo message="building..."/>
<mkdir dir="${build.test}"/>
<mkdir dir="${lib.dir}"/>
@@ -104,7 +102,6 @@
<exclude name="**/*.java"/>
</fileset>
</copy>
-
</target>
<!-- runs roundup.sh test plans -->
@@ -157,41 +154,34 @@
</target>
<target name="jar" depends="compile" description="creates a Hadoop ready jar will all dependencies">
-
- <!-- copy Cascading classes and libraries -->
- <copy todir="${build.classes}/lib">
- <fileset refid="lib.compile.fileset"/>
- <mapper type="flatten"/>
- </copy>
+ <tstamp>
+ <format property="TIMESTAMP" pattern="yyyy-MM-dd HH:mm:ss"/>
+ </tstamp>
<jar jarfile="${build.dir}/${ant.project.name}.jar">
<fileset dir="${build.classes}"/>
+ <fileset dir="${load.basedir}" includes="lib/"/>
<manifest>
<attribute name="Main-Class" value="${ant.project.name}/Main"/>
+ <attribute name="Build-Date" value="${TIMESTAMP}"/>
</manifest>
</jar>
-
</target>
- <target name="dist" depends="clean,jar,stamp-jar" description="packages current project">
-
+ <target name="dist" depends="clean,retrieve,jar,stamp-jar" description="packages current project">
<mkdir dir="${dist}"/>
<copy todir="${dist}">
-
<fileset dir=".">
<include name="bin/**"/>
<include name="data/**"/>
- <include name="src/**"/>
- <include name="lib/**"/>
- <include name="build.xml"/>
- <include name="README.TXT"/>
+ <include name="bin/**"/>
+ <include name="README.txt"/>
</fileset>
<fileset dir="${build.dir}">
<include name="*.jar"/>
</fileset>
-
</copy>
<copy file="${src.license}" tofile="${dist}/LICENSE.txt"/>
@@ -201,7 +191,6 @@
<include name="**"/>
</fileset>
</chmod>
-
</target>
<target name="tar" depends="dist" description="creates an archive of current project">
@@ -209,15 +198,20 @@
compression="gzip">
<tarfileset dir="dist/" prefix="${ant.project.name}-${DSTAMP}">
<include name="**/**"/>
+ <exclude name="bin/**"/>
+ </tarfileset>
+ <tarfileset dir="dist/" prefix="${ant.project.name}-${DSTAMP}" filemode="744">
+ <include name="bin/**"/>
</tarfileset>
</tar>
</target>
<target name="s3-package" if="package.remote.bucket">
-
<taskdef name="S3Upload" classname="dak.ant.taskdefs.S3Upload"/>
- <echo message="http://${package.remote.bucket}/multitool/${ant.project.name}-${DSTAMP}.tgz"
+ <property file="${package.aws.properties}"/>
+
+ <echo message="http://${package.remote.bucket}/load/${ant.project.name}-${DSTAMP}.tgz"
file="${ant.project.name}-current.txt"/>
<S3Upload verbose="true"
@@ -231,29 +225,24 @@
</S3Upload>
<property name="package.remote.port" value="22"/>
+
<scp file="${ant.project.name}-current.txt"
remoteTofile="${package.remote.path}/${ant.project.name}/${ant.project.name}-${DSTAMP}.tgz"
keyfile="${package.remote.keyfile}"
passphrase="" port="${package.remote.port}" trust="true"/>
<delete file="${ant.project.name}-current.txt"/>
-
</target>
- <target name="publish" depends="clean,test,tar,s3-package"/>
+ <target name="publish" depends="clean,retrieve,test,tar,s3-package"/>
<target name="retrieve">
-
<ivy:settings id="ivy.conjars.settings" url="http://conjars.org/repo/ivysettings.xml"/>
- <!--<ivy:cleancache settingsRef="ivy.conjars.settings"/>-->
-
- <!--<ivy:resolve settingsRef="ivy.conjars.settings" transitive="false"/>-->
-
- <ivy:retrieve settingsRef="ivy.conjars.settings"
- conf="compile,runtime,test"
- pattern="${lib.dir}/[conf]/[artifact]-[revision].[ext]" sync="true"/>
+ <ivy:retrieve file="${multitool.basedir}/ivy.xml" settingsRef="ivy.conjars.settings" conf="default"
+ pattern="${lib.dir}/[artifact]-[revision].[ext]" sync="true"/>
+ <ivy:retrieve file="${multitool.basedir}/ivy.xml" settingsRef="ivy.conjars.settings" conf="test"
+ pattern="${build.dir}/deps/[artifact]-[revision].[ext]" sync="true"/>
</target>
-
-</project>
+</project>
34 ivy.xml
View
@@ -1,43 +1,35 @@
<!--
- ~ Copyright (c) 2010 Concurrent, Inc. All Rights Reserved.
+ ~ Copyright (c) 2011 Concurrent, Inc. All Rights Reserved.
~
~ Project and contact information: http://www.concurrentinc.com/
-->
<ivy-module version="2.0">
-
- <info organisation="cascading" module="cascading-load" revision="">
-
- <license name="Apache 2" url="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-
+ <info organisation="cascading" module="cascading-load" revision="${cascading.release.full}">
+ <license name="GNU General Public License version 3" url="http://www.gnu.org/licenses/"/>
<ivyauthor name="Concurrent, Inc." url="http://concurrentinc.com/"/>
-
- <description homepage="http://github.com/cwensel/cascading.load">
+ <description homepage="http://cascading.org">
</description>
</info>
<configurations>
- <conf name="compile"/>
- <conf name="runtime"/>
+ <conf name="default"/>
<conf name="test"/>
</configurations>
<dependencies>
+ <dependency org="cascading" name="cascading-core" rev="1.2.3" conf="default"/>
+ <dependency org="cascading" name="cascading-test" rev="1.2.3" conf="test->default"/>
+ <dependency org="args4j" name="args4j" rev="2.0.12" conf="default"/>
- <dependency org="cascading" name="cascading-core" rev="1.2.3" conf="compile->master,compile"
- changing="true"/>
- <dependency org="args4j" name="args4j" rev="2.0.12" conf="compile->default"/>
-
- <dependency org="org.apache.hadoop" name="hadoop-core" rev="0.20.2" conf="runtime->default">
+ <dependency org="org.apache.hadoop" name="hadoop-core" rev="0.20.2" conf="test->default">
<exclude org="ant"/>
</dependency>
- <dependency org="org.apache.hadoop" name="hadoop-test" rev="0.20.2" conf="runtime->default"/>
- <dependency org="log4j" name="log4j" rev="1.2.15" conf="runtime->master"/>
+ <dependency org="org.apache.hadoop" name="hadoop-test" rev="0.20.2" conf="test->default"/>
- <dependency org="cascading" name="cascading-test" rev="1.2.3" conf="test->master,compile"
- changing="true"/>
+ <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.4.3" conf="test->default">
+ </dependency>
+ <dependency org="junit" name="junit" rev="4.4" conf="test->default"/>
</dependencies>
-
</ivy-module>
-
Please sign in to comment.
Something went wrong with that request. Please try again.