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 su...@apache.org on 2012/10/19 04:22:26 UTC
svn commit: r1399949 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:
CHANGES.txt pom.xml
Author: suresh
Date: Fri Oct 19 02:22:24 2012
New Revision: 1399949
URL: http://svn.apache.org/viewvc?rev=1399949&view=rev
Log:
HDFS-8887 reverting commit r1399904 due to build failure and other issues
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1399949&r1=1399948&r2=1399949&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Fri Oct 19 02:22:24 2012
@@ -58,8 +58,6 @@ Release 2.0.3-alpha - Unreleased
HADOOP-8925. Remove the packaging. (eli)
- HADOOP-8887. Use a Maven plugin to build the native code using CMake. (cmccabe via tucu)
-
OPTIMIZATIONS
HADOOP-8866. SampleQuantiles#query is O(N^2) instead of O(N). (Andrew Wang
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml?rev=1399949&r1=1399948&r2=1399949&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml Fri Oct 19 02:22:24 2012
@@ -491,34 +491,37 @@
</execution>
</executions>
</plugin>
-
<plugin>
- <groupId>org.apache.hadoop.cmake.maven.ng</groupId>
- <artifactId>cmake-ng</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>cmake-compile</id>
- <goals><goal>compile</goal></goals>
+ <id>make</id>
+ <phase>compile</phase>
+ <goals><goal>run</goal></goals>
<configuration>
- <target>all</target>
- <source>${basedir}/src</source>
- <vars>
- <GENERATED_JAVAH>${project.build.directory}/native/javah</GENERATED_JAVAH>
- <JVM_ARCH_DATA_MODEL>${sun.arch.data.model}</JVM_ARCH_DATA_MODEL>
- <REQUIRE_SNAPPY>${require.snappy}</REQUIRE_SNAPPY>
- <CUSTOM_SNAPPY_PREFIX>${snappy.prefix}</CUSTOM_SNAPPY_PREFIX>
- <CUSTOM_SNAPPY_LIB>${snappy.lib}</CUSTOM_SNAPPY_LIB>
- <CUSTOM_SNAPPY_INCLUDE>${snappy.include}</CUSTOM_SNAPPY_INCLUDE>
- </vars>
+ <target>
+ <exec executable="cmake" dir="${project.build.directory}/native" failonerror="true">
+ <arg line="${basedir}/src/ -DGENERATED_JAVAH=${project.build.directory}/native/javah -DJVM_ARCH_DATA_MODEL=${sun.arch.data.model} -DREQUIRE_SNAPPY=${require.snappy} -DCUSTOM_SNAPPY_PREFIX=${snappy.prefix} -DCUSTOM_SNAPPY_LIB=${snappy.lib} -DCUSTOM_SNAPPY_INCLUDE=${snappy.include}"/>
+ </exec>
+ <exec executable="make" dir="${project.build.directory}/native" failonerror="true">
+ <arg line="VERBOSE=1"/>
+ </exec>
+ </target>
</configuration>
</execution>
<execution>
- <id>test_bulk_crc32</id>
- <goals><goal>test</goal></goals>
+ <id>native_tests</id>
+ <phase>test</phase>
+ <goals><goal>run</goal></goals>
<configuration>
- <binary>${project.build.directory}/native/test_bulk_crc32</binary>
- <timeout>300</timeout>
- <results>${project.build.directory}/results</results>
+ <target>
+ <exec executable="sh" failonerror="true" dir="${project.build.directory}/native">
+ <arg value="-c"/>
+ <arg value="[ x$SKIPTESTS = xtrue ] || ${project.build.directory}/native/test_bulk_crc32"/>
+ <env key="SKIPTESTS" value="${skipTests}"/>
+ </exec>
+ </target>
</configuration>
</execution>
</executions>