Author: nigel
Date: Thu Nov 13 15:55:55 2008
New Revision: 713870
URL: http://svn.apache.org/viewvc?rev=713870&view=rev
Log:
HADOOP-4150: merged to branch-0.18
Modified:
hadoop/core/branches/branch-0.18/ (props changed)
hadoop/core/branches/branch-0.18/CHANGES.txt
hadoop/core/branches/branch-0.18/build.xml
hadoop/core/branches/branch-0.18/docs/jdiff/hadoop_0.18.2.xml
hadoop/core/branches/branch-0.18/src/c++/librecordio/Makefile
hadoop/core/branches/branch-0.18/src/c++/librecordio/test/Makefile
Propchange: hadoop/core/branches/branch-0.18/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 13 15:55:55 2008
@@ -1 +1,2 @@
-/hadoop/core/trunk:699517,700163,704701,705420,705430,707258,709040
+/hadoop/core/branches/branch-0.19:704733
+/hadoop/core/trunk:699517,700163,704701,704732,705420,705430,707258,709040
Modified: hadoop/core/branches/branch-0.18/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=713870&r1=713869&r2=713870&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Thu Nov 13 15:55:55 2008
@@ -2,6 +2,11 @@
Release 0.18.3 - Unreleased
+ IMPROVEMENTS
+
+ HADOOP-4150. Include librecordio in hadoop releases. (Giridharan Kesavan
+ via acmurthy)
+
BUG FIXES
HADOOP-4499. DFSClient should invoke checksumOk only once. (Raghu Angadi)
Modified: hadoop/core/branches/branch-0.18/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/build.xml?rev=713870&r1=713869&r2=713870&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/build.xml (original)
+++ hadoop/core/branches/branch-0.18/build.xml Thu Nov 13 15:55:55 2008
@@ -49,8 +49,10 @@
<property name="c++.pipes.src" value="${c++.src}/pipes"/>
<property name="c++.examples.pipes.src" value="${examples.dir}/pipes"/>
<property name="libhdfs.src" value="${c++.src}/libhdfs"/>
+ <property name="librecordio.src" value="${c++.src}/librecordio"/>
<property name="tools.src" value="${basedir}/src/tools"/>
+ <property name="xercescroot" value=""/>
<property name="build.dir" value="${basedir}/build"/>
<property name="build.classes" value="${build.dir}/classes"/>
<property name="build.src" value="${build.dir}/src"/>
@@ -59,6 +61,7 @@
<property name="build.examples" value="${build.dir}/examples"/>
<property name="build.anttasks" value="${build.dir}/ant"/>
<property name="build.libhdfs" value="${build.dir}/libhdfs"/>
+ <property name="build.librecordio" value="${build.dir}/librecordio"/>
<!-- convert spaces to _ so that mac os doesn't break things -->
<exec executable="sed" inputstring="${os.name}"
outputproperty="nonspace.os">
@@ -100,6 +103,7 @@
<property name="libhdfs.test.conf.dir" value="${libhdfs.src}/tests/conf"/>
<property name="libhdfs.test.dir" value="${test.build.dir}/libhdfs"/>
+ <property name="librecordio.test.dir" value="${test.build.dir}/librecordio"/>
<property name="web.src.dir" value="${basedir}/src/web"/>
<property name="src.webapps" value="${basedir}/src/webapps"/>
@@ -863,7 +867,7 @@
<!-- ================================================================== -->
<!-- -->
<!-- ================================================================== -->
- <target name="package" depends="compile, jar, javadoc, examples, tools-jar,
jar-test, ant-tasks, package-libhdfs"
+ <target name="package" depends="compile, jar, javadoc, examples, tools-jar,
jar-test, ant-tasks, package-libhdfs, package-librecordio"
description="Build distribution">
<mkdir dir="${dist.dir}"/>
<mkdir dir="${dist.dir}/lib"/>
@@ -1069,7 +1073,44 @@
<arg line="-sf libhdfs.so.${libhdfs.version} libhdfs.so"/>
</exec>
</target>
-
+<!-- ================================================================== -->
+<!-- librecordio targets. -->
+<!-- ================================================================== -->
+
+ <target name="compile-librecordio" depends="init" if="librecordio" >
+ <mkdir dir="${build.librecordio}"/>
+ <exec dir="${librecordio.src}" executable="${make.cmd}"
failonerror="true">
+ <env key="XERCESCROOT" value="${xercescroot}"/>
+ <env key="LIBRECORDIO_BUILD_DIR" value="${build.librecordio}"/>
+ </exec>
+ </target>
+
+ <target name="test-librecordio" depends="compile-librecordio, compile-core"
if="librecordio">
+ <delete dir="${librecordio.test.dir}"/>
+ <mkdir dir="${librecordio.test.dir}"/>
+ <exec dir="${librecordio.src}/test" executable="${make.cmd}"
failonerror="true">
+ <env key="HADOOP_HOME" value="${basedir}"/>
+ <env key="XERCESCROOT" value="${xercescroot}"/>
+ <env key="LIBRECORDIO_BUILD_DIR" value="${build.librecordio}"/>
+ <env key="LIBRECORDIO_TEST_DIR" value="${librecordio.test.dir}"/>
+ <arg value="all"/>
+ </exec>
+ </target>
+
+ <target name="package-librecordio" depends="compile-librecordio"
if="librecordio">
+ <mkdir dir="${dist.dir}/librecordio"/>
+ <copy todir="${dist.dir}/librecordio">
+ <fileset dir="${build.librecordio}" casesensitive="yes"
followsymlinks="false">
+ <exclude name="**/tests/**"/>
+ <exclude name="*.so"/>
+ <exclude name="*.o"/>
+ </fileset>
+ </copy>
+ <chmod perm="ugo+x" type="file">
+ <fileset dir="${dist.dir}/librecordio"/>
+ </chmod>
+ </target>
+
<target name="create-c++-configure" depends="init" if="compile.c++">
<exec executable="autoreconf" dir="${c++.utils.src}" searchpath="yes"
failonerror="yes">
Modified: hadoop/core/branches/branch-0.18/docs/jdiff/hadoop_0.18.2.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/docs/jdiff/hadoop_0.18.2.xml?rev=713870&r1=713869&r2=713870&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/docs/jdiff/hadoop_0.18.2.xml (original)
+++ hadoop/core/branches/branch-0.18/docs/jdiff/hadoop_0.18.2.xml Thu Nov 13
15:55:55 2008
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
<!-- Generated by the JDiff Javadoc doclet -->
<!-- (http://www.jdiff.org) -->
-<!-- on Tue Nov 04 18:17:16 UTC 2008 -->
+<!-- on Thu Nov 13 23:47:14 UTC 2008 -->
<api
xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
@@ -9,7 +9,7 @@
name="hadoop 0.18.2"
jdversion="1.1.1">
-<!-- Command line arguments = -doclet jdiff.JDiff -docletpath
/home/ndaley/tools/jdiff/latest/jdiff.jar:/home/ndaley/tools/jdiff/latest/xerces.jar
-classpath
/home/ndaley/hadoop/branch-0.18/build/classes:/home/ndaley/hadoop/branch-0.18/lib/commons-cli-2.0-SNAPSHOT.jar:/home/ndaley/hadoop/branch-0.18/lib/commons-codec-1.3.jar:/home/ndaley/hadoop/branch-0.18/lib/commons-httpclient-3.0.1.jar:/home/ndaley/hadoop/branch-0.18/lib/commons-logging-1.0.4.jar:/home/ndaley/hadoop/branch-0.18/lib/commons-logging-api-1.0.4.jar:/home/ndaley/hadoop/branch-0.18/lib/commons-net-1.4.1.jar:/home/ndaley/hadoop/branch-0.18/lib/jets3t-0.6.0.jar:/home/ndaley/hadoop/branch-0.18/lib/jetty-5.1.4.jar:/home/ndaley/hadoop/branch-0.18/lib/jetty-ext/commons-el.jar:/home/ndaley/hadoop/branch-0.18/lib/jetty-ext/jasper-compiler.jar:/home/ndaley/hadoop/branch-0.18/lib/jetty-ext/jasper-runtime.jar:/home/ndaley/hadoop/branch-0.18/lib/jetty-ext/jsp-api.jar:/home/ndaley/hadoop/branch-0.18/lib/junit-3.8.1.jar:/h
ome/ndaley/hadoop/branch-0.18/lib/kfs-0.1.3.jar:/home/ndaley/hadoop/branch-0.18/lib/log4j-1.2.15.jar:/home/ndaley/hadoop/branch-0.18/lib/oro-2.0.8.jar:/home/ndaley/hadoop/branch-0.18/lib/servlet-api.jar:/home/ndaley/hadoop/branch-0.18/lib/slf4j-api-1.4.3.jar:/home/ndaley/hadoop/branch-0.18/lib/slf4j-log4j12-1.4.3.jar:/home/ndaley/hadoop/branch-0.18/lib/xmlenc-0.52.jar:/home/ndaley/hadoop/branch-0.18/conf:/home/ndaley/tools/ant/latest/lib/ant-launcher.jar:/home/ndaley/tools/ant/latest/lib/ant-antlr.jar:/home/ndaley/tools/ant/latest/lib/ant-apache-bcel.jar:/home/ndaley/tools/ant/latest/lib/ant-apache-bsf.jar:/home/ndaley/tools/ant/latest/lib/ant-apache-log4j.jar:/home/ndaley/tools/ant/latest/lib/ant-apache-oro.jar:/home/ndaley/tools/ant/latest/lib/ant-apache-regexp.jar:/home/ndaley/tools/ant/latest/lib/ant-apache-resolver.jar:/home/ndaley/tools/ant/latest/lib/ant-commons-logging.jar:/home/ndaley/tools/ant/latest/lib/ant-commons-net.jar:/home/ndaley/tools/ant/latest/lib/ant-jai
.jar:/home/ndaley/tools/ant/latest/lib/ant-javamail.jar:/home/ndaley/tools/ant/latest/lib/ant-jdepend.jar:/home/ndaley/tools/ant/latest/lib/ant-jmf.jar:/home/ndaley/tools/ant/latest/lib/ant-jsch.jar:/home/ndaley/tools/ant/latest/lib/ant-junit.jar:/home/ndaley/tools/ant/latest/lib/ant-netrexx.jar:/home/ndaley/tools/ant/latest/lib/ant-nodeps.jar:/home/ndaley/tools/ant/latest/lib/ant-starteam.jar:/home/ndaley/tools/ant/latest/lib/ant-stylebook.jar:/home/ndaley/tools/ant/latest/lib/ant-swing.jar:/home/ndaley/tools/ant/latest/lib/ant-testutil.jar:/home/ndaley/tools/ant/latest/lib/ant-trax.jar:/home/ndaley/tools/ant/latest/lib/ant-weblogic.jar:/home/ndaley/tools/ant/latest/lib/ant.jar:/home/ndaley/tools/ant/latest/lib/xercesImpl.jar:/home/ndaley/tools/ant/latest/lib/xml-apis.jar:/home/hadoopqa/tools/java/jdk1.5.0_11-32bit/lib/tools.jar
-sourcepath
/home/ndaley/hadoop/branch-0.18/src/core:/home/ndaley/hadoop/branch-0.18/src/mapred:/home/ndaley/hadoop/branch-0.18/src/tools
-apidir /
home/ndaley/hadoop/branch-0.18/docs/jdiff -apiname hadoop 0.18.2 -->
+<!-- Command line arguments = -doclet jdiff.JDiff -docletpath
/home/hadoopqa/tools/jdiff/latest/jdiff.jar:/home/hadoopqa/tools/jdiff/latest/xerces.jar
-classpath
/home/ndaley/hadoop/branch-0.18/build/classes:/home/ndaley/hadoop/branch-0.18/lib/commons-cli-2.0-SNAPSHOT.jar:/home/ndaley/hadoop/branch-0.18/lib/commons-codec-1.3.jar:/home/ndaley/hadoop/branch-0.18/lib/commons-httpclient-3.0.1.jar:/home/ndaley/hadoop/branch-0.18/lib/commons-logging-1.0.4.jar:/home/ndaley/hadoop/branch-0.18/lib/commons-logging-api-1.0.4.jar:/home/ndaley/hadoop/branch-0.18/lib/commons-net-1.4.1.jar:/home/ndaley/hadoop/branch-0.18/lib/jets3t-0.6.0.jar:/home/ndaley/hadoop/branch-0.18/lib/jetty-5.1.4.jar:/home/ndaley/hadoop/branch-0.18/lib/jetty-ext/commons-el.jar:/home/ndaley/hadoop/branch-0.18/lib/jetty-ext/jasper-compiler.jar:/home/ndaley/hadoop/branch-0.18/lib/jetty-ext/jasper-runtime.jar:/home/ndaley/hadoop/branch-0.18/lib/jetty-ext/jsp-api.jar:/home/ndaley/hadoop/branch-0.18/lib/junit-3.8.1.ja
r:/home/ndaley/hadoop/branch-0.18/lib/kfs-0.1.3.jar:/home/ndaley/hadoop/branch-0.18/lib/log4j-1.2.15.jar:/home/ndaley/hadoop/branch-0.18/lib/oro-2.0.8.jar:/home/ndaley/hadoop/branch-0.18/lib/servlet-api.jar:/home/ndaley/hadoop/branch-0.18/lib/slf4j-api-1.4.3.jar:/home/ndaley/hadoop/branch-0.18/lib/slf4j-log4j12-1.4.3.jar:/home/ndaley/hadoop/branch-0.18/lib/xmlenc-0.52.jar:/home/ndaley/hadoop/branch-0.18/conf:/home/ndaley/tools/ant/latest/lib/ant-launcher.jar:/home/ndaley/tools/ant/latest/lib/ant-antlr.jar:/home/ndaley/tools/ant/latest/lib/ant-apache-bcel.jar:/home/ndaley/tools/ant/latest/lib/ant-apache-bsf.jar:/home/ndaley/tools/ant/latest/lib/ant-apache-log4j.jar:/home/ndaley/tools/ant/latest/lib/ant-apache-oro.jar:/home/ndaley/tools/ant/latest/lib/ant-apache-regexp.jar:/home/ndaley/tools/ant/latest/lib/ant-apache-resolver.jar:/home/ndaley/tools/ant/latest/lib/ant-commons-logging.jar:/home/ndaley/tools/ant/latest/lib/ant-commons-net.jar:/home/ndaley/tools/ant/latest/lib/ant
-jai.jar:/home/ndaley/tools/ant/latest/lib/ant-javamail.jar:/home/ndaley/tools/ant/latest/lib/ant-jdepend.jar:/home/ndaley/tools/ant/latest/lib/ant-jmf.jar:/home/ndaley/tools/ant/latest/lib/ant-jsch.jar:/home/ndaley/tools/ant/latest/lib/ant-junit.jar:/home/ndaley/tools/ant/latest/lib/ant-netrexx.jar:/home/ndaley/tools/ant/latest/lib/ant-nodeps.jar:/home/ndaley/tools/ant/latest/lib/ant-starteam.jar:/home/ndaley/tools/ant/latest/lib/ant-stylebook.jar:/home/ndaley/tools/ant/latest/lib/ant-swing.jar:/home/ndaley/tools/ant/latest/lib/ant-testutil.jar:/home/ndaley/tools/ant/latest/lib/ant-trax.jar:/home/ndaley/tools/ant/latest/lib/ant-weblogic.jar:/home/ndaley/tools/ant/latest/lib/ant.jar:/home/ndaley/tools/ant/latest/lib/xercesImpl.jar:/home/ndaley/tools/ant/latest/lib/xml-apis.jar:/home/hadoopqa/tools/java/jdk1.6.0_07-32bit/lib/tools.jar
-sourcepath
/home/ndaley/hadoop/branch-0.18/src/core:/home/ndaley/hadoop/branch-0.18/src/mapred:/home/ndaley/hadoop/branch-0.18/src/tools
-apid
ir /home/ndaley/hadoop/branch-0.18/docs/jdiff -apiname hadoop 0.18.2 -->
<package name="org.apache.hadoop">
<!-- start class org.apache.hadoop.HadoopVersionAnnotation -->
<class name="HadoopVersionAnnotation" abstract="true"
@@ -6476,7 +6476,7 @@
deprecated="not deprecated">
<method name="values" return="org.apache.hadoop.fs.permission.FsAction[]"
abstract="false" native="false" synchronized="false"
- static="true" final="true" visibility="public"
+ static="true" final="false" visibility="public"
deprecated="not deprecated">
</method>
<method name="valueOf" return="org.apache.hadoop.fs.permission.FsAction"
@@ -10960,7 +10960,7 @@
deprecated="not deprecated">
<method name="values"
return="org.apache.hadoop.io.SequenceFile.CompressionType[]"
abstract="false" native="false" synchronized="false"
- static="true" final="true" visibility="public"
+ static="true" final="false" visibility="public"
deprecated="not deprecated">
</method>
<method name="valueOf"
return="org.apache.hadoop.io.SequenceFile.CompressionType"
@@ -14979,7 +14979,7 @@
deprecated="not deprecated">
<method name="values"
return="org.apache.hadoop.io.compress.lzo.LzoCompressor.CompressionStrategy[]"
abstract="false" native="false" synchronized="false"
- static="true" final="true" visibility="public"
+ static="true" final="false" visibility="public"
deprecated="not deprecated">
</method>
<method name="valueOf"
return="org.apache.hadoop.io.compress.lzo.LzoCompressor.CompressionStrategy"
@@ -15095,7 +15095,7 @@
deprecated="not deprecated">
<method name="values"
return="org.apache.hadoop.io.compress.lzo.LzoDecompressor.CompressionStrategy[]"
abstract="false" native="false" synchronized="false"
- static="true" final="true" visibility="public"
+ static="true" final="false" visibility="public"
deprecated="not deprecated">
</method>
<method name="valueOf"
return="org.apache.hadoop.io.compress.lzo.LzoDecompressor.CompressionStrategy"
@@ -15281,7 +15281,7 @@
deprecated="not deprecated">
<method name="values"
return="org.apache.hadoop.io.compress.zlib.ZlibCompressor.CompressionHeader[]"
abstract="false" native="false" synchronized="false"
- static="true" final="true" visibility="public"
+ static="true" final="false" visibility="public"
deprecated="not deprecated">
</method>
<method name="valueOf"
return="org.apache.hadoop.io.compress.zlib.ZlibCompressor.CompressionHeader"
@@ -15307,7 +15307,7 @@
deprecated="not deprecated">
<method name="values"
return="org.apache.hadoop.io.compress.zlib.ZlibCompressor.CompressionLevel[]"
abstract="false" native="false" synchronized="false"
- static="true" final="true" visibility="public"
+ static="true" final="false" visibility="public"
deprecated="not deprecated">
</method>
<method name="valueOf"
return="org.apache.hadoop.io.compress.zlib.ZlibCompressor.CompressionLevel"
@@ -15328,7 +15328,7 @@
deprecated="not deprecated">
<method name="values"
return="org.apache.hadoop.io.compress.zlib.ZlibCompressor.CompressionStrategy[]"
abstract="false" native="false" synchronized="false"
- static="true" final="true" visibility="public"
+ static="true" final="false" visibility="public"
deprecated="not deprecated">
</method>
<method name="valueOf"
return="org.apache.hadoop.io.compress.zlib.ZlibCompressor.CompressionStrategy"
@@ -15448,7 +15448,7 @@
deprecated="not deprecated">
<method name="values"
return="org.apache.hadoop.io.compress.zlib.ZlibDecompressor.CompressionHeader[]"
abstract="false" native="false" synchronized="false"
- static="true" final="true" visibility="public"
+ static="true" final="false" visibility="public"
deprecated="not deprecated">
</method>
<method name="valueOf"
return="org.apache.hadoop.io.compress.zlib.ZlibDecompressor.CompressionHeader"
@@ -18689,7 +18689,7 @@
deprecated="not deprecated">
<method name="values"
return="org.apache.hadoop.mapred.JobClient.TaskStatusFilter[]"
abstract="false" native="false" synchronized="false"
- static="true" final="true" visibility="public"
+ static="true" final="false" visibility="public"
deprecated="not deprecated">
</method>
<method name="valueOf"
return="org.apache.hadoop.mapred.JobClient.TaskStatusFilter"
@@ -20446,7 +20446,7 @@
deprecated="not deprecated">
<method name="values" return="org.apache.hadoop.mapred.JobHistory.Keys[]"
abstract="false" native="false" synchronized="false"
- static="true" final="true" visibility="public"
+ static="true" final="false" visibility="public"
deprecated="not deprecated">
</method>
<method name="valueOf" return="org.apache.hadoop.mapred.JobHistory.Keys"
@@ -20609,7 +20609,7 @@
deprecated="not deprecated">
<method name="values"
return="org.apache.hadoop.mapred.JobHistory.RecordTypes[]"
abstract="false" native="false" synchronized="false"
- static="true" final="true" visibility="public"
+ static="true" final="false" visibility="public"
deprecated="not deprecated">
</method>
<method name="valueOf"
return="org.apache.hadoop.mapred.JobHistory.RecordTypes"
@@ -20867,7 +20867,7 @@
deprecated="not deprecated">
<method name="values" return="org.apache.hadoop.mapred.JobHistory.Values[]"
abstract="false" native="false" synchronized="false"
- static="true" final="true" visibility="public"
+ static="true" final="false" visibility="public"
deprecated="not deprecated">
</method>
<method name="valueOf" return="org.apache.hadoop.mapred.JobHistory.Values"
@@ -21009,7 +21009,7 @@
deprecated="not deprecated">
<method name="values" return="org.apache.hadoop.mapred.JobPriority[]"
abstract="false" native="false" synchronized="false"
- static="true" final="true" visibility="public"
+ static="true" final="false" visibility="public"
deprecated="not deprecated">
</method>
<method name="valueOf" return="org.apache.hadoop.mapred.JobPriority"
@@ -21794,7 +21794,7 @@
deprecated="not deprecated">
<method name="values" return="org.apache.hadoop.mapred.JobTracker.State[]"
abstract="false" native="false" synchronized="false"
- static="true" final="true" visibility="public"
+ static="true" final="false" visibility="public"
deprecated="not deprecated">
</method>
<method name="valueOf" return="org.apache.hadoop.mapred.JobTracker.State"
@@ -24624,7 +24624,7 @@
deprecated="not deprecated">
<method name="values"
return="org.apache.hadoop.mapred.TaskCompletionEvent.Status[]"
abstract="false" native="false" synchronized="false"
- static="true" final="true" visibility="public"
+ static="true" final="false" visibility="public"
deprecated="not deprecated">
</method>
<method name="valueOf"
return="org.apache.hadoop.mapred.TaskCompletionEvent.Status"
@@ -24920,7 +24920,7 @@
deprecated="not deprecated">
<method name="values" return="org.apache.hadoop.mapred.TaskLog.LogName[]"
abstract="false" native="false" synchronized="false"
- static="true" final="true" visibility="public"
+ static="true" final="false" visibility="public"
deprecated="not deprecated">
</method>
<method name="valueOf" return="org.apache.hadoop.mapred.TaskLog.LogName"
@@ -27035,7 +27035,7 @@
deprecated="not deprecated">
<method name="values" return="org.apache.hadoop.mapred.join.Parser.TType[]"
abstract="false" native="false" synchronized="false"
- static="true" final="true" visibility="public"
+ static="true" final="false" visibility="public"
deprecated="not deprecated">
</method>
<method name="valueOf" return="org.apache.hadoop.mapred.join.Parser.TType"
Modified: hadoop/core/branches/branch-0.18/src/c++/librecordio/Makefile
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/c%2B%2B/librecordio/Makefile?rev=713870&r1=713869&r2=713870&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/c++/librecordio/Makefile (original)
+++ hadoop/core/branches/branch-0.18/src/c++/librecordio/Makefile Thu Nov 13
15:55:55 2008
@@ -16,40 +16,43 @@
COPTS=-g3 -O0 -Wall
-all: librecordio.a test
+all: ${LIBRECORDIO_BUILD_DIR}/librecordio.a
-librecordio.a: recordio.o filestream.o binarchive.o csvarchive.o xmlarchive.o \
- exception.o typeIDs.o fieldTypeInfo.o recordTypeInfo.o utils.o
- ar cru librecordio.a recordio.o filestream.o binarchive.o csvarchive.o
xmlarchive.o \
- exception.o typeIDs.o fieldTypeInfo.o recordTypeInfo.o utils.o
-
-recordio.o: recordio.cc recordio.hh archive.hh
- g++ ${COPTS} -c -I${XERCESCROOT}/include -o recordio.o recordio.cc
-
-filestream.o: filestream.cc recordio.hh filestream.hh
- g++ ${COPTS} -c -o filestream.o filestream.cc
-
-binarchive.o: binarchive.cc recordio.hh binarchive.hh archive.hh
- g++ ${COPTS} -c -o binarchive.o binarchive.cc
-
-csvarchive.o: csvarchive.cc recordio.hh csvarchive.hh archive.hh
- g++ ${COPTS} -c -o csvarchive.o csvarchive.cc
-
-xmlarchive.o: xmlarchive.cc recordio.hh xmlarchive.hh archive.hh
- g++ ${COPTS} -c -I${XERCESCROOT}/include -o xmlarchive.o xmlarchive.cc
-
-exception.o: exception.cc exception.hh
- g++ ${COPTS} -c -o exception.o exception.cc
-
-typeIDs.o: typeIDs.cc typeIDs.hh
- g++ ${COPTS} -c -o typeIDs.o typeIDs.cc
-fieldTypeInfo.o: fieldTypeInfo.cc fieldTypeInfo.hh
- g++ ${COPTS} -c -o fieldTypeInfo.o fieldTypeInfo.cc
-recordTypeInfo.o: recordTypeInfo.cc recordTypeInfo.hh
- g++ ${COPTS} -c -o recordTypeInfo.o recordTypeInfo.cc
-utils.o: utils.cc utils.hh
- g++ ${COPTS} -c -o utils.o utils.cc
+COBJS = $(addprefix ${LIBRECORDIO_BUILD_DIR}/, recordio.o filestream.o
binarchive.o csvarchive.o xmlarchive.o \
+ exception.o typeIDs.o fieldTypeInfo.o recordTypeInfo.o utils.o)
+CCMD = $(addprefix ${LIBRECORDIO_BUILD_DIR}/, librecordio.a recordio.o
filestream.o binarchive.o csvarchive.o xmlarchive.o \
+ exception.o typeIDs.o fieldTypeInfo.o recordTypeInfo.o utils.o)
+
+${LIBRECORDIO_BUILD_DIR}/librecordio.a: ${COBJS}
+ ar cru ${CCMD}
+
+${LIBRECORDIO_BUILD_DIR}/recordio.o: recordio.cc recordio.hh archive.hh
+ g++ ${COPTS} -c -I${XERCESCROOT}/include -o
${LIBRECORDIO_BUILD_DIR}/recordio.o recordio.cc
+
+${LIBRECORDIO_BUILD_DIR}/filestream.o: filestream.cc recordio.hh filestream.hh
+ g++ ${COPTS} -c -o ${LIBRECORDIO_BUILD_DIR}/filestream.o filestream.cc
+
+${LIBRECORDIO_BUILD_DIR}/binarchive.o: binarchive.cc recordio.hh binarchive.hh
archive.hh
+ g++ ${COPTS} -c -o ${LIBRECORDIO_BUILD_DIR}/binarchive.o binarchive.cc
+
+${LIBRECORDIO_BUILD_DIR}/csvarchive.o: csvarchive.cc recordio.hh csvarchive.hh
archive.hh
+ g++ ${COPTS} -c -o ${LIBRECORDIO_BUILD_DIR}/csvarchive.o csvarchive.cc
+
+${LIBRECORDIO_BUILD_DIR}/xmlarchive.o: xmlarchive.cc recordio.hh xmlarchive.hh
archive.hh
+ g++ ${COPTS} -c -I${XERCESCROOT}/include -o
${LIBRECORDIO_BUILD_DIR}/xmlarchive.o xmlarchive.cc
+
+${LIBRECORDIO_BUILD_DIR}/exception.o: exception.cc exception.hh
+ g++ ${COPTS} -c -o ${LIBRECORDIO_BUILD_DIR}/exception.o exception.cc
+
+${LIBRECORDIO_BUILD_DIR}/typeIDs.o: typeIDs.cc typeIDs.hh
+ g++ ${COPTS} -c -o ${LIBRECORDIO_BUILD_DIR}/typeIDs.o typeIDs.cc
+${LIBRECORDIO_BUILD_DIR}/fieldTypeInfo.o: fieldTypeInfo.cc fieldTypeInfo.hh
+ g++ ${COPTS} -c -o ${LIBRECORDIO_BUILD_DIR}/fieldTypeInfo.o
fieldTypeInfo.cc
+${LIBRECORDIO_BUILD_DIR}/recordTypeInfo.o: recordTypeInfo.cc recordTypeInfo.hh
+ g++ ${COPTS} -c -o ${LIBRECORDIO_BUILD_DIR}/recordTypeInfo.o
recordTypeInfo.cc
+${LIBRECORDIO_BUILD_DIR}/utils.o: utils.cc utils.hh
+ g++ ${COPTS} -c -o ${LIBRECORDIO_BUILD_DIR}/utils.o utils.cc
recordio.cc: recordio.hh archive.hh exception.hh
filestream.cc: recordio.hh filestream.hh
binarchive.cc: recordio.hh binarchive.hh
@@ -65,5 +68,5 @@
make -C test all
clean:
- rm -f *~ *.o *.a
+ rm -f ${LIBRECORDIO_BUILD_DIR}/*~ ${LIBRECORDIO_BUILD_DIR}/*.o
${LIBRECORDIO_BUILD_DIR}/*.a
make -C test clean
Modified: hadoop/core/branches/branch-0.18/src/c++/librecordio/test/Makefile
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/c%2B%2B/librecordio/test/Makefile?rev=713870&r1=713869&r2=713870&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/c++/librecordio/test/Makefile
(original)
+++ hadoop/core/branches/branch-0.18/src/c++/librecordio/test/Makefile Thu Nov
13 15:55:55 2008
@@ -18,21 +18,22 @@
all: test testFromJava
-test: test.o test.jr.o
- g++ -g3 -O0 -o test test.o test.jr.o -L.. -L${XERCESCROOT}/lib
-lrecordio -lxerces-c
+test: ${LIBRECORDIO_TEST_DIR}/test.o ${LIBRECORDIO_TEST_DIR}/test.jr.o
+ g++ -g3 -O0 -o ${LIBRECORDIO_TEST_DIR}/test
${LIBRECORDIO_TEST_DIR}/test.o \
+ ${LIBRECORDIO_TEST_DIR}/test.jr.o -L${LIBRECORDIO_BUILD_DIR}
-L${XERCESCROOT}/lib -lrecordio -lxerces-c
-test.o: test.cc
- g++ ${COPTS} -c -I.. -o test.o test.cc
+${LIBRECORDIO_TEST_DIR}/test.o: test.cc
+ g++ ${COPTS} -c -I .. -o ${LIBRECORDIO_TEST_DIR}/test.o test.cc
-testFromJava: testFromJava.o test.jr.o
- g++ -g3 -O0 -o testFromJava testFromJava.o test.jr.o -L..
-L${XERCESCROOT}/lib -lrecordio -lxerces-c
+testFromJava: ${LIBRECORDIO_TEST_DIR}/testFromJava.o
${LIBRECORDIO_TEST_DIR}/test.jr.o
+ g++ -g3 -O0 -o ${LIBRECORDIO_TEST_DIR}/testFromJava
${LIBRECORDIO_TEST_DIR}/testFromJava.o ${LIBRECORDIO_TEST_DIR}/test.jr.o \
+ -L${LIBRECORDIO_BUILD_DIR} -L${XERCESCROOT}/lib -lrecordio -lxerces-c
-testFromJava.o: testFromJava.cc
- g++ ${COPTS} -c -I.. -o testFromJava.o testFromJava.cc
+${LIBRECORDIO_TEST_DIR}/testFromJava.o: testFromJava.cc
+ g++ ${COPTS} -c -I.. -o ${LIBRECORDIO_TEST_DIR}/testFromJava.o
testFromJava.cc
-
-test.jr.o: test.jr.cc
- g++ ${COPTS} -c -I.. -o test.jr.o test.jr.cc
+${LIBRECORDIO_TEST_DIR}/test.jr.o: test.jr.cc
+ g++ ${COPTS} -c -I.. -o ${LIBRECORDIO_TEST_DIR}/test.jr.o test.jr.cc
%.jr.cc %.jr.hh: %.jr
${HADOOP_HOME}/bin/rcc --language c++ $<
@@ -44,5 +45,6 @@
test.hh: test.jr.hh ../recordio.hh ../filestream.hh
clean:
- rm -f *~ *.o test testFromJava *.jr.*
+ rm -f ${LIBRECORDIO_TEST_DIR}/*~ ${LIBRECORDIO_TEST_DIR}/*.o
${LIBRECORDIO_TEST_DIR}/test \
+ ${LIBRECORDIO_TEST_DIR}/testFromJava ${LIBRECORDIO_TEST_DIR}/*.jr.*
