hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1065858 - in /hadoop/common/trunk: ./ src/native/ src/native/config/ src/native/lib/ src/native/src/org/apache/hadoop/io/compress/zlib/
Date Mon, 31 Jan 2011 23:43:38 GMT
Author: eli
Date: Mon Jan 31 23:43:37 2011
New Revision: 1065858

URL: http://svn.apache.org/viewvc?rev=1065858&view=rev
Log:
HADOOP-6436. Remove auto-generated native build files. Contributed by Roman Shaposhnik


Removed:
    hadoop/common/trunk/src/native/INSTALL
    hadoop/common/trunk/src/native/Makefile.in
    hadoop/common/trunk/src/native/aclocal.m4
    hadoop/common/trunk/src/native/config.h.in
    hadoop/common/trunk/src/native/config/config.guess
    hadoop/common/trunk/src/native/config/config.sub
    hadoop/common/trunk/src/native/config/depcomp
    hadoop/common/trunk/src/native/config/install-sh
    hadoop/common/trunk/src/native/config/ltmain.sh
    hadoop/common/trunk/src/native/config/missing
    hadoop/common/trunk/src/native/configure
    hadoop/common/trunk/src/native/lib/Makefile.in
    hadoop/common/trunk/src/native/src/org/apache/hadoop/io/compress/zlib/Makefile.in
Modified:
    hadoop/common/trunk/CHANGES.txt
    hadoop/common/trunk/build.xml
    hadoop/common/trunk/src/native/Makefile.am
    hadoop/common/trunk/src/native/configure.ac

Modified: hadoop/common/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=1065858&r1=1065857&r2=1065858&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Mon Jan 31 23:43:37 2011
@@ -275,6 +275,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(..).

Modified: hadoop/common/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/build.xml?rev=1065858&r1=1065857&r2=1065858&view=diff
==============================================================================
--- hadoop/common/trunk/build.xml (original)
+++ hadoop/common/trunk/build.xml Mon Jan 31 23:43:37 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"/>
@@ -405,14 +440,6 @@
   	  <class name="org.apache.hadoop.security.JniBasedUnixGroupsNetgroupMapping" />
   	</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}"/>
@@ -1060,7 +1087,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"/>
@@ -1411,6 +1438,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"/>

Modified: hadoop/common/trunk/src/native/Makefile.am
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/native/Makefile.am?rev=1065858&r1=1065857&r2=1065858&view=diff
==============================================================================
--- hadoop/common/trunk/src/native/Makefile.am (original)
+++ hadoop/common/trunk/src/native/Makefile.am Mon Jan 31 23:43:37 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/trunk/src/native/configure.ac
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/native/configure.ac?rev=1065858&r1=1065857&r2=1065858&view=diff
==============================================================================
--- hadoop/common/trunk/src/native/configure.ac (original)
+++ hadoop/common/trunk/src/native/configure.ac Mon Jan 31 23:43:37 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
 



Mime
View raw message