Skip to content

Commit

Permalink
Cleaning up how build works so you only need to specify hadoop.dir an…
Browse files Browse the repository at this point in the history 
…d pig.jar when running ant targets. Changing default build location to not be the root dir.
  • Loading branch information
Bill Graham committed Jan 22, 2013
1 parent a744b5c commit 3db42d2
Show file tree
Hide file tree
Showing 6 changed files with 114 additions and 29 deletions.
2 changes: 1 addition & 1 deletion build.xml
View file
Expand Up @@ -10,7 +10,7 @@


<property environment="env"/> <property environment="env"/>
<condition property="ispig07"> <condition property="ispig07">
<contains string="${pig.version}" substring="0.7"/> <contains string="${pig.jar}" substring="pig-0.7"/>
</condition> </condition>
<target name="executeRecursively"> <target name="executeRecursively">
<ant dir="hadoop-connector" target="${action}"/> <ant dir="hadoop-connector" target="${action}"/>
Expand Down
30 changes: 22 additions & 8 deletions hadoop-connector/build.xml
View file
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project basedir="." default="jar" name="hadoop-vertica"> <project basedir="." default="jar" name="hadoop-connector">
<property environment="env"/> <property environment="env"/>
<!--Required parameters. You have to specify these on the ANT command line --> <!--Required parameters. You have to specify these on the ANT command line -->
<!--JUNIT jars should be in the lib path. For e.g. specify using -lib --> <!--JUNIT jars should be in the lib path. For e.g. specify using -lib -->
<property name="vertica.jar" value = "" /> <property name="vertica.jar" value = "" />
<property name="hadoop.dir" value="" />
<property name="doc.dir" value="" /> <property name="doc.dir" value="" />
<property name="dist" value=""/>

<property name="jar.name" value="hadoop-vertica" /> <property name="jar.name" value="hadoop-vertica" />
<property name="debuglevel" value="source,lines,vars"/> <property name="debuglevel" value="source,lines,vars"/>
<property name="javac.source" value="1.6" /> <property name="javac.source" value="1.6" />
Expand All @@ -18,6 +16,8 @@
<property name="test.dir" location="${basedir}/test" /> <property name="test.dir" location="${basedir}/test" />


<property name="build.dir" location="${basedir}/build" /> <property name="build.dir" location="${basedir}/build" />
<property name="dist" value="${build.dir}/hadoop-connector/jar"/>
<property name="jar.file" location="${dist}/${jar.name}.jar" />
<property name="build.classes" location="${build.dir}/hadoop-connector/classes"/> <property name="build.classes" location="${build.dir}/hadoop-connector/classes"/>
<property name="build.test.classes" location="${build.dir}/hadoop-connector/tests" /> <property name="build.test.classes" location="${build.dir}/hadoop-connector/tests" />
<property name="junit.output.dir" value="${build.dir}/hadoop-connector/junit"/> <property name="junit.output.dir" value="${build.dir}/hadoop-connector/junit"/>
Expand Down Expand Up @@ -55,13 +55,27 @@


<target name="clean"> <target name="clean">
<delete dir="${build.dir}/hadoop-connector"/> <delete dir="${build.dir}/hadoop-connector"/>
<delete file="${dist}/${jar.name}.jar"/> <delete file="${jar.file}"/>
<delete dir="${doc.dir}/hadoop-connector"/> <delete dir="${doc.dir}/hadoop-connector"/>
</target> </target>


<target depends="clean" name="cleanall"/> <target depends="clean" name="cleanall"/>


<target depends="init" name="compile"> <target name="requirehadoopdir">
<fail message="Property &quot;hadoop.dir&quot; needs to be set to a value">
<condition>
<or>
<equals arg1="${hadoop.dir}" arg2=""/>
<not><isset property="hadoop.dir"/></not>
<not><available file="${hadoop.dir}" type="dir"/></not>
</or>
</condition>
</fail>
</target>

<target depends="requirehadoopdir,init" name="compile">
<echo>hadoop.dir: ${hadoop.dir}</echo>
<echo></echo>
<mkdir dir="${build.classes}"/> <mkdir dir="${build.classes}"/>
<echo message="${ant.project.name}: ${ant.file}"/> <echo message="${ant.project.name}: ${ant.file}"/>
<javac debug="true" debuglevel="${debuglevel}" destdir="${build.classes}" <javac debug="true" debuglevel="${debuglevel}" destdir="${build.classes}"
Expand Down Expand Up @@ -97,7 +111,7 @@
</tstamp> </tstamp>
<exec executable="svnversion" outputproperty="svnversion"/> <exec executable="svnversion" outputproperty="svnversion"/>
<exec executable="uname" outputproperty="buildsystem"><arg value="-a"/></exec> <exec executable="uname" outputproperty="buildsystem"><arg value="-a"/></exec>
<jar jarfile="${dist}/${jar.name}.jar" basedir="${build.classes}"> <jar jarfile="${jar.file}" basedir="${build.classes}">
<manifest> <manifest>
<attribute name="Built-By" value="${user.name}"/> <attribute name="Built-By" value="${user.name}"/>
<attribute name="Implementation-Vendor" value="Vertica Systems, Inc."/> <attribute name="Implementation-Vendor" value="Vertica Systems, Inc."/>
Expand Down
27 changes: 21 additions & 6 deletions hadoop-example/build.xml
View file
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project basedir="." default="jar" name="hadoop-vertica"> <project basedir="." default="jar" name="hadoop-example">
<property environment="env"/> <property environment="env"/>
<!--Required parameters. You have to specify these on the ANT command line --> <!--Required parameters. You have to specify these on the ANT command line -->
<!--JUNIT jars should be in the lib path. For e.g. specify using -lib --> <!--JUNIT jars should be in the lib path. For e.g. specify using -lib -->
<property name="vertica.jar" value = "" /> <property name="vertica.jar" value = "" />
<property name="hadoop-connector.jar" value = "${basedir}/../hadoop-connector/build/hadoop-connector/jar/hadoop-vertica.jar" />
<property name="hadoop.dir" value="" /> <property name="hadoop.dir" value="" />
<property name="dist" value=""/>
<property name="doc.dir" value="" /> <property name="doc.dir" value="" />


<property name="jar.name" value="hadoop-vertica-example" /> <property name="jar.name" value="hadoop-vertica-example" />
Expand All @@ -17,6 +17,8 @@
<property name="src.dir" location="${basedir}" /> <property name="src.dir" location="${basedir}" />


<property name="build.dir" location="${basedir}/build" /> <property name="build.dir" location="${basedir}/build" />
<property name="dist" value="${build.dir}/hadoop-example/jar"/>
<property name="jar.file" location="${dist}/${jar.name}.jar" />
<property name="build.classes" location="${build.dir}/hadoop-example/" /> <property name="build.classes" location="${build.dir}/hadoop-example/" />


<!-- Lesson: You can add location of jar files here --> <!-- Lesson: You can add location of jar files here -->
Expand All @@ -40,13 +42,25 @@


<target name="clean"> <target name="clean">
<delete dir="${build.classes}"/> <delete dir="${build.classes}"/>
<delete file="${dist}/${jar.name}.jar"/> <delete file="${jar.file}"/>
<delete dir="${doc.dir}/hadoop-examples"/> <delete dir="${doc.dir}/hadoop-examples"/>
</target> </target>


<target depends="clean" name="cleanall"/> <target depends="clean" name="cleanall"/>


<target depends="init" name="compile"> <target name="requirehadoopdir">
<fail message="Property &quot;hadoop.dir&quot; needs to be set to a valid directory">
<condition>
<or>
<equals arg1="${hadoop.dir}" arg2=""/>
<not><isset property="hadoop.dir"/></not>
<not><available file="${hadoop.dir}" type="dir"/></not>
</or>
</condition>
</fail>
</target>

<target depends="requirehadoopdir,init" name="compile">
<mkdir dir="${build.classes}"/> <mkdir dir="${build.classes}"/>
<echo message="${ant.project.name}: ${ant.file}"/> <echo message="${ant.project.name}: ${ant.file}"/>
<javac debug="true" debuglevel="${debuglevel}" destdir="${build.classes}" <javac debug="true" debuglevel="${debuglevel}" destdir="${build.classes}"
Expand All @@ -71,8 +85,9 @@
<format property="builtat" pattern="yyyy-MM-dd HH:mm:ss Z" timezone="America/New_York"/> <format property="builtat" pattern="yyyy-MM-dd HH:mm:ss Z" timezone="America/New_York"/>
</tstamp> </tstamp>
<exec executable="svnversion" outputproperty="svnversion"/> <exec executable="svnversion" outputproperty="svnversion"/>
<exec executable="uname" outputproperty="buildsystem"><arg value="-a"/></exec> <delete file="${jar.file}"/>
<jar jarfile="${dist}/${jar.name}.jar" basedir="${build.classes}"> <exec executable="uname" outputproperty="buildsystem"><arg value="-a"/></exec>
<jar jarfile="${jar.file}" basedir="${build.classes}">
<manifest> <manifest>
<attribute name="Built-By" value="${user.name}"/> <attribute name="Built-By" value="${user.name}"/>
<attribute name="Implementation-Vendor" value="Vertica Systems, Inc."/> <attribute name="Implementation-Vendor" value="Vertica Systems, Inc."/>
Expand Down
2 changes: 1 addition & 1 deletion makefile
View file
Expand Up @@ -8,7 +8,7 @@
### ###
# Load the standard make definitions # Load the standard make definitions
### ###
export BUILD_ARGS := -lib ${HADOOP_HOME}/ -lib ${PIG_HOME}/lib -Dhadoop.dir=${HADOOP_HOME} -Dbuild.dir=${BUILDDIR} -Ddist=${JAR_DIR} -Dpig.jar=${PIG_HOME}/${PIG_JAR} -Dpig.version="$(pig_version)" -Dvertica.jar=$(VERTICA_JAR) -Dhadoop-connector.jar=$(JAR_DIR)/hadoop-vertica.jar -Dpig-connector.jar=$(JAR_DIR)/pig-vertica.jar -Ddoc.dir=$(JAR_DIR)/doc/ export BUILD_ARGS :=-Dhadoop.dir=${HADOOP_HOME} -Dpig.jar=${PIG_JAR}


jar: jar:
JAVA_HOME=${JDK16} ant $(BUILD_ARGS) jar JAVA_HOME=${JDK16} ant $(BUILD_ARGS) jar
Expand Down
44 changes: 37 additions & 7 deletions pig-connector/build.xml
View file
Expand Up @@ -4,10 +4,7 @@
<!--Required parameters. You have to specify these on the ANT command line --> <!--Required parameters. You have to specify these on the ANT command line -->
<!--JUNIT jars should be in the lib path. For e.g. specify using -lib --> <!--JUNIT jars should be in the lib path. For e.g. specify using -lib -->
<property name="vertica.jar" value = "" /> <property name="vertica.jar" value = "" />
<property name="hadoop-connector.jar" value = "" /> <property name="hadoop-connector.jar" value = "${basedir}/../hadoop-connector/build/hadoop-connector/jar/hadoop-vertica.jar" />
<property name="hadoop.dir" value="" />
<property name="pig.jar" value="" />
<property name="dist" value=""/>
<property name="doc.dir" value="" /> <property name="doc.dir" value="" />


<property name="jar.name" value="pig-vertica" /> <property name="jar.name" value="pig-vertica" />
Expand All @@ -19,6 +16,8 @@
<property name="src.dir" location="${basedir}" /> <property name="src.dir" location="${basedir}" />


<property name="build.dir" location="${basedir}/build" /> <property name="build.dir" location="${basedir}/build" />
<property name="dist" value="${build.dir}/pig-connector/jar"/>
<property name="jar.file" location="${dist}/${jar.name}.jar" />
<property name="build.classes" location="${build.dir}/pig-connector/classes"/> <property name="build.classes" location="${build.dir}/pig-connector/classes"/>


<!-- Lesson: You can add location of jar files here --> <!-- Lesson: You can add location of jar files here -->
Expand Down Expand Up @@ -46,11 +45,42 @@


<target name="clean"> <target name="clean">
<delete dir="${build.dir}/pig-connector"/> <delete dir="${build.dir}/pig-connector"/>
<delete file="${dist}/${jar.name}.jar"/> <delete file="${jar.file}"/>
<delete dir="${doc.dir}/pig-connector"/> <delete dir="${doc.dir}/pig-connector"/>
</target> </target>


<target depends="init" name="compile">
<target name="requirehadoopdir">
<fail message="Property &quot;hadoop.dir&quot; needs to be set to a valid directory">
<condition>
<or>
<equals arg1="${hadoop.dir}" arg2=""/>
<not><isset property="hadoop.dir"/></not>
<not><available file="${hadoop.dir}" type="dir"/></not>
</or>
</condition>
</fail>
</target>

<target name="requirepigjar">
<fail message="Property &quot;pig.jar&quot; needs to be set to a valid jar file">
<condition>
<or>
<equals arg1="${pig.jar}" arg2=""/>
<not><isset property="pig.jar"/></not>
<not><available file="${pig.jar}" type="file"/></not>
</or>
</condition>
</fail>
</target>

<target depends="requirehadoopdir, requirepigjar, init" name="compile">
<fail unless="hadoop.dir">Property hadoop.dir must be set.</fail>
<fail unless="pig.jar">Property pig.jar must be set.</fail>
<echo>hadoop.dir : ${hadoop.dir}</echo>
<echo>pig.jar : ${pig.jar}</echo>
<echo>hadoop-connector.jar: ${hadoop-connector.jar}</echo>
<echo></echo>
<mkdir dir="${build.classes}"/> <mkdir dir="${build.classes}"/>
<echo message="${ant.project.name}: ${ant.file}"/> <echo message="${ant.project.name}: ${ant.file}"/>
<javac debug="true" debuglevel="${debuglevel}" destdir="${build.classes}" <javac debug="true" debuglevel="${debuglevel}" destdir="${build.classes}"
Expand Down Expand Up @@ -78,7 +108,7 @@
</tstamp> </tstamp>
<exec executable="svnversion" outputproperty="svnversion"/> <exec executable="svnversion" outputproperty="svnversion"/>
<exec executable="uname" outputproperty="buildsystem"><arg value="-a"/></exec> <exec executable="uname" outputproperty="buildsystem"><arg value="-a"/></exec>
<jar jarfile="${dist}/${jar.name}.jar" basedir="${build.classes}"> <jar jarfile="${jar.file}" basedir="${build.classes}">
<zipfileset src="${hadoop-connector.jar}"/> <zipfileset src="${hadoop-connector.jar}"/>
<manifest> <manifest>
<attribute name="Built-By" value="${user.name}"/> <attribute name="Built-By" value="${user.name}"/>
Expand Down
38 changes: 32 additions & 6 deletions squeal/build.xml
View file
Expand Up @@ -11,10 +11,8 @@
<property name="vertica.jar" value = "" /> <property name="vertica.jar" value = "" />
<property name="hadoop-connector.jar" value = "" /> <property name="hadoop-connector.jar" value = "" />
<property name="pig-connector.jar" value = "" /> <property name="pig-connector.jar" value = "" />
<property name="hadoop.dir" value="" />
<property name="pig.jar" value="" /> <property name="pig.jar" value="" />
<property name="dist" value=""/>

<property name="jar.name" value="squeal" /> <property name="jar.name" value="squeal" />
<property name="debuglevel" value="source,lines,vars"/> <property name="debuglevel" value="source,lines,vars"/>
<property name="target" value="1.6"/> <property name="target" value="1.6"/>
Expand All @@ -25,6 +23,8 @@


<property name="build.dir" location="${basedir}/build" /> <property name="build.dir" location="${basedir}/build" />
<property name="build.classes" location="${build.dir}/squeal/classes"/> <property name="build.classes" location="${build.dir}/squeal/classes"/>
<property name="dist" value="${build.dir}/squeal/jar"/>
<property name="jar.file" location="${dist}/${jar.name}.jar" />


<!-- Lesson: You can add location of jar files here --> <!-- Lesson: You can add location of jar files here -->
<path id="compile.classpath"> <path id="compile.classpath">
Expand Down Expand Up @@ -58,11 +58,37 @@


<target name="clean"> <target name="clean">
<delete dir="${build.dir}/squeal"/> <delete dir="${build.dir}/squeal"/>
<delete file="${dist}/${dest.jar}"/> <delete file="${jar.file}"/>
<delete dir="${doc.dir}/squeal"/> <delete dir="${doc.dir}/squeal"/>
</target> </target>


<target depends="init" name="compile"> <target name="requirehadoopdir">
<fail message="Property &quot;hadoop.dir&quot; needs to be set to a value">
<condition>
<or>
<equals arg1="${hadoop.dir}" arg2=""/>
<not><isset property="hadoop.dir"/></not>
<not><available file="${hadoop.dir}" type="dir"/></not>
</or>
</condition>
</fail>
</target>

<target name="requirepigjar">
<fail message="Property &quot;pig.jar&quot; needs to be set to a valid jar file">
<condition>
<or>
<equals arg1="${pig.jar}" arg2=""/>
<not><isset property="pig.jar"/></not>
<not><available file="${pig.jar}" type="file"/></not>
</or>
</condition>
</fail>
</target>

<target depends="requirehadoopdir,requirepigjar,init" name="compile">
<echo>hadoop.dir : ${hadoop.dir}</echo>
<echo>pig.jar : ${pig.jar}</echo>
<mkdir dir="${build.classes}"/> <mkdir dir="${build.classes}"/>
<echo message="${ant.project.name}: ${ant.file}"/> <echo message="${ant.project.name}: ${ant.file}"/>
<javac debug="true" debuglevel="${debuglevel}" destdir="${build.classes}" source="${source}" target="${target}"> <javac debug="true" debuglevel="${debuglevel}" destdir="${build.classes}" source="${source}" target="${target}">
Expand All @@ -87,7 +113,7 @@
</tstamp> </tstamp>
<exec executable="svnversion" outputproperty="svnversion"/> <exec executable="svnversion" outputproperty="svnversion"/>
<exec executable="uname" outputproperty="buildsystem"><arg value="-a"/></exec> <exec executable="uname" outputproperty="buildsystem"><arg value="-a"/></exec>
<jar jarfile="${dist}/${jar.name}.jar" basedir="${build.classes}"> <jar jarfile="${jar.file}" basedir="${build.classes}">
<zipfileset src="${hadoop-connector.jar}"/> <zipfileset src="${hadoop-connector.jar}"/>
<zipfileset src="${pig-connector.jar}"/> <zipfileset src="${pig-connector.jar}"/>
<zipfileset src="${pig.jar}"/> <zipfileset src="${pig.jar}"/>
Expand Down

0 comments on commit 3db42d2

Please sign in to comment.