You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by el...@apache.org on 2011/02/01 00:56:50 UTC
svn commit: r1065869 - in /hadoop/common/branches/branch-0.22: ./ src/docs/
src/java/ src/native/ src/native/config/ src/native/lib/
src/native/src/org/apache/hadoop/io/compress/zlib/ src/test/core/
src/test/core/org/apache/hadoop/io/
Author: eli
Date: Mon Jan 31 23:56:49 2011
New Revision: 1065869
URL: http://svn.apache.org/viewvc?rev=1065869&view=rev
Log:
HADOOP-6436. svn merge -c 1065858 from trunk
Removed:
hadoop/common/branches/branch-0.22/src/native/INSTALL
hadoop/common/branches/branch-0.22/src/native/Makefile.in
hadoop/common/branches/branch-0.22/src/native/aclocal.m4
hadoop/common/branches/branch-0.22/src/native/config.h.in
hadoop/common/branches/branch-0.22/src/native/config/config.guess
hadoop/common/branches/branch-0.22/src/native/config/config.sub
hadoop/common/branches/branch-0.22/src/native/config/depcomp
hadoop/common/branches/branch-0.22/src/native/config/install-sh
hadoop/common/branches/branch-0.22/src/native/config/ltmain.sh
hadoop/common/branches/branch-0.22/src/native/config/missing
hadoop/common/branches/branch-0.22/src/native/configure
hadoop/common/branches/branch-0.22/src/native/lib/Makefile.in
hadoop/common/branches/branch-0.22/src/native/src/org/apache/hadoop/io/compress/zlib/Makefile.in
Modified:
hadoop/common/branches/branch-0.22/ (props changed)
hadoop/common/branches/branch-0.22/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.22/build.xml
hadoop/common/branches/branch-0.22/src/docs/ (props changed)
hadoop/common/branches/branch-0.22/src/java/ (props changed)
hadoop/common/branches/branch-0.22/src/native/Makefile.am
hadoop/common/branches/branch-0.22/src/native/configure.ac
hadoop/common/branches/branch-0.22/src/test/core/ (props changed)
hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/io/TestSequenceFile.java (props changed)
Propchange: hadoop/common/branches/branch-0.22/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:56:49 2011
@@ -1,2 +1,2 @@
-/hadoop/common/trunk:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881
+/hadoop/common/trunk:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858
/hadoop/core/branches/branch-0.19/core:713112
Modified: hadoop/common/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/CHANGES.txt?rev=1065869&r1=1065868&r2=1065869&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/CHANGES.txt Mon Jan 31 23:56:49 2011
@@ -214,6 +214,8 @@ Release 0.22.0 - Unreleased
mapreduce.task.io.sort.factor, mapreduce.task.io.sort.mb
(Chris Douglas via shv)
+ HADOOP-6436. Remove auto-generated native build files. (rvs via eli)
+
OPTIMIZATIONS
HADOOP-6884. Add LOG.isDebugEnabled() guard for each LOG.debug(..).
Propchange: hadoop/common/branches/branch-0.22/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:56:49 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/CHANGES.txt:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881
+/hadoop/common/trunk/CHANGES.txt:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278
Modified: hadoop/common/branches/branch-0.22/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/build.xml?rev=1065869&r1=1065868&r2=1065869&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/build.xml (original)
+++ hadoop/common/branches/branch-0.22/build.xml Mon Jan 31 23:56:49 2011
@@ -361,7 +361,42 @@
</antcall>
</target>
- <target name="compile-core-native" depends="compile-core-classes"
+ <target name="check-native-configure" if="compile.native">
+ <condition property="need.native.configure">
+ <not> <available file="${native.src.dir}/configure"/> </not>
+ </condition>
+ </target>
+
+ <target name="create-native-configure" depends="check-native-configure" if="need.native.configure">
+ <mkdir dir="${native.src.dir}/config"/>
+ <mkdir dir="${native.src.dir}/m4"/>
+ <exec executable="autoreconf" dir="${native.src.dir}"
+ searchpath="yes" failonerror="yes">
+ <arg value="-i"/>
+ <arg value="-f"/>
+ </exec>
+ </target>
+
+ <target name="check-native-makefile" if="compile.native">
+ <condition property="need.native.makefile">
+ <not> <available file="${native.src.dir}/Makefile"/> </not>
+ </condition>
+ </target>
+
+ <target name="create-native-makefile" depends="check-native-makefile" if="need.native.makefile">
+ <antcall target="create-native-configure"/>
+ <mkdir dir="${build.native}"/>
+ <exec dir="${build.native}" executable="sh" failonerror="true">
+ <env key="OS_NAME" value="${os.name}"/>
+ <env key="OS_ARCH" value="${os.arch}"/>
+ <env key="JVM_DATA_MODEL" value="${sun.arch.data.model}"/>
+ <env key="HADOOP_NATIVE_SRCDIR" value="${native.src.dir}"/>
+ <arg line="${native.src.dir}/configure"/>
+ </exec>
+ </target>
+
+
+ <target name="compile-core-native" depends="compile-core-classes,create-native-makefile"
if="compile.native">
<mkdir dir="${build.native}/lib"/>
@@ -396,14 +431,6 @@
<class name="org.apache.hadoop.io.nativeio.NativeIO" />
</javah>
- <exec dir="${build.native}" executable="sh" failonerror="true">
- <env key="OS_NAME" value="${os.name}"/>
- <env key="OS_ARCH" value="${os.arch}"/>
- <env key="JVM_DATA_MODEL" value="${sun.arch.data.model}"/>
- <env key="HADOOP_NATIVE_SRCDIR" value="${native.src.dir}"/>
- <arg line="${native.src.dir}/configure"/>
- </exec>
-
<exec dir="${build.native}" executable="${make.cmd}" failonerror="true">
<env key="OS_NAME" value="${os.name}"/>
<env key="OS_ARCH" value="${os.arch}"/>
@@ -1047,7 +1074,7 @@
<!-- ================================================================== -->
<!-- -->
<!-- ================================================================== -->
- <target name="package" depends="compile, jar, javadoc, docs, api-report, jar-test"
+ <target name="package" depends="compile, jar, javadoc, docs, api-report, create-native-configure, jar-test"
description="Build distribution">
<mkdir dir="${dist.dir}"/>
<mkdir dir="${dist.dir}/lib"/>
@@ -1398,6 +1425,7 @@
<exclude name="lib/jdiff/"/>
<exclude name="**/native/*"/>
<exclude name="**/native/config/*"/>
+ <exclude name="**/native/m4/*"/>
<exclude name="**/VERSION"/>
<exclude name="**/*.json"/>
<exclude name="**/hod/*.txt"/>
Propchange: hadoop/common/branches/branch-0.22/src/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:56:49 2011
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/src/docs:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881
+/hadoop/common/trunk/src/docs:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858
/hadoop/core/branches/branch-0.19/src/docs:713112
Propchange: hadoop/common/branches/branch-0.22/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:56:49 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881
+/hadoop/common/trunk/src/java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858
/hadoop/core/branches/branch-0.19/core/src/java:713112
/hadoop/core/trunk/src/core:776175-785643,785929-786278
Modified: hadoop/common/branches/branch-0.22/src/native/Makefile.am
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/native/Makefile.am?rev=1065869&r1=1065868&r2=1065869&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/src/native/Makefile.am (original)
+++ hadoop/common/branches/branch-0.22/src/native/Makefile.am Mon Jan 31 23:56:49 2011
@@ -31,6 +31,7 @@
# Export $(PLATFORM) to prevent proliferation of sub-shells
export PLATFORM = $(shell echo $$OS_NAME | tr [A-Z] [a-z])
+ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS = @JNI_CPPFLAGS@ -I$(HADOOP_NATIVE_SRCDIR)/src \
-Isrc/org/apache/hadoop/io/compress/zlib \
-Isrc/org/apache/hadoop/security \
Modified: hadoop/common/branches/branch-0.22/src/native/configure.ac
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/native/configure.ac?rev=1065869&r1=1065868&r2=1065869&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/src/native/configure.ac (original)
+++ hadoop/common/branches/branch-0.22/src/native/configure.ac Mon Jan 31 23:56:49 2011
@@ -36,7 +36,8 @@
AC_PREREQ(2.59)
AC_INIT(src/org_apache_hadoop.h)
AC_CONFIG_SRCDIR([src/org_apache_hadoop.h])
-AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADER([config.h])
AC_SYS_LARGEFILE
Propchange: hadoop/common/branches/branch-0.22/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:56:49 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881
+/hadoop/common/trunk/src/test/core:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858
/hadoop/core/branches/branch-0.19/core/src/test/core:713112
/hadoop/core/trunk/src/test/core:776175-785643,785929-786278
Propchange: hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/io/TestSequenceFile.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:56:49 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core/org/apache/hadoop/io/TestSequenceFile.java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881
+/hadoop/common/trunk/src/test/core/org/apache/hadoop/io/TestSequenceFile.java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/io/TestSequenceFile.java:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFile.java:776175-785643