hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acmur...@apache.org
Subject svn commit: r732388 [1/2] - in /hadoop/core/branches/branch-0.20: ./ CHANGES.txt build.xml src/native/Makefile.am src/native/aclocal.m4
Date Wed, 07 Jan 2009 16:34:20 GMT
Author: acmurthy
Date: Wed Jan  7 08:34:19 2009
New Revision: 732388

URL: http://svn.apache.org/viewvc?rev=732388&view=rev
Log:
Revert HADOOP-4949.

Modified:
    hadoop/core/branches/branch-0.20/   (props changed)
    hadoop/core/branches/branch-0.20/CHANGES.txt   (contents, props changed)
    hadoop/core/branches/branch-0.20/build.xml
    hadoop/core/branches/branch-0.20/src/native/Makefile.am
    hadoop/core/branches/branch-0.20/src/native/aclocal.m4

Propchange: hadoop/core/branches/branch-0.20/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  7 08:34:19 2009
@@ -1,2 +1,2 @@
 /hadoop/core/branches/branch-0.19:713112
-/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,730794
+/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987

Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=732388&r1=732387&r2=732388&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Wed Jan  7 08:34:19 2009
@@ -503,8 +503,6 @@
     HADOOP-4956. Creates TaskStatus for failed tasks with an empty Counters 
     object instead of null. (ddas)
 
-    HADOOP-4949. Fix native compilation. (Chris Douglas via rangadi)
-
     HADOOP-4979. Fix capacity scheduler to block cluster for failed high
     RAM requirements across task types. (Vivek Ratan via yhemanth)
 

Propchange: hadoop/core/branches/branch-0.20/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  7 08:34:19 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226
 /hadoop/core/branches/branch-0.19/CHANGES.txt:713112
-/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,730794
+/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987

Modified: hadoop/core/branches/branch-0.20/build.xml
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/build.xml?rev=732388&r1=732387&r2=732388&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/build.xml (original)
+++ hadoop/core/branches/branch-0.20/build.xml Wed Jan  7 08:34:19 2009
@@ -456,6 +456,7 @@
   	
     <mkdir dir="${build.native}/lib"/>
     <mkdir dir="${build.native}/src/org/apache/hadoop/io/compress/zlib"/>
+    <mkdir dir="${build.native}/src/org/apache/hadoop/io/compress/lzo"/>
 
   	<javah
   	  classpath="${build.classes}"
@@ -467,6 +468,16 @@
       <class name="org.apache.hadoop.io.compress.zlib.ZlibDecompressor" />
   	</javah>
 
+  	<javah
+  	  classpath="${build.classes}"
+  	  destdir="${build.native}/src/org/apache/hadoop/io/compress/lzo"
+      force="yes"
+  	  verbose="yes"
+  	  >
+  	  <class name="org.apache.hadoop.io.compress.lzo.LzoCompressor" />
+      <class name="org.apache.hadoop.io.compress.lzo.LzoDecompressor" />
+  	</javah>
+
 	<exec dir="${build.native}" executable="sh" failonerror="true">
 	  <env key="OS_NAME" value="${os.name}"/>
 	  <env key="OS_ARCH" value="${os.arch}"/>

Modified: hadoop/core/branches/branch-0.20/src/native/Makefile.am
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/native/Makefile.am?rev=732388&r1=732387&r2=732388&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/src/native/Makefile.am (original)
+++ hadoop/core/branches/branch-0.20/src/native/Makefile.am Wed Jan  7 08:34:19 2009
@@ -36,7 +36,7 @@
 export PLATFORM = $(shell echo $$OS_NAME | tr [A-Z] [a-z])
 
 # List the sub-directories here
-SUBDIRS = src/org/apache/hadoop/io/compress/zlib lib 
+SUBDIRS = src/org/apache/hadoop/io/compress/zlib
 
 # The following export is needed to build libhadoop.so in the 'lib' directory
 export SUBDIRS



Mime
View raw message