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 tu...@apache.org on 2012/10/19 00:49:08 UTC
svn commit: r1399904 - in /hadoop/common/branches/branch-2: ./ dev-support/
dev-support/cmake-maven-ng-plugin/
dev-support/cmake-maven-ng-plugin/dev-support/
dev-support/cmake-maven-ng-plugin/src/
dev-support/cmake-maven-ng-plugin/src/main/ dev-support...
Author: tucu
Date: Thu Oct 18 22:49:07 2012
New Revision: 1399904
URL: http://svn.apache.org/viewvc?rev=1399904&view=rev
Log:
HADOOP-8887. Use a Maven plugin to build the native code using CMake. (cmccabe via tucu)
Added:
hadoop/common/branches/branch-2/dev-support/cmake-maven-ng-plugin/ (props changed)
- copied from r1399898, hadoop/common/trunk/dev-support/cmake-maven-ng-plugin/
hadoop/common/branches/branch-2/dev-support/cmake-maven-ng-plugin/dev-support/
- copied from r1399898, hadoop/common/trunk/dev-support/cmake-maven-ng-plugin/dev-support/
hadoop/common/branches/branch-2/dev-support/cmake-maven-ng-plugin/dev-support/findbugsExcludeFile.xml
- copied unchanged from r1399898, hadoop/common/trunk/dev-support/cmake-maven-ng-plugin/dev-support/findbugsExcludeFile.xml
hadoop/common/branches/branch-2/dev-support/cmake-maven-ng-plugin/pom.xml
- copied unchanged from r1399898, hadoop/common/trunk/dev-support/cmake-maven-ng-plugin/pom.xml
hadoop/common/branches/branch-2/dev-support/cmake-maven-ng-plugin/src/
- copied from r1399898, hadoop/common/trunk/dev-support/cmake-maven-ng-plugin/src/
hadoop/common/branches/branch-2/dev-support/cmake-maven-ng-plugin/src/main/
- copied from r1399898, hadoop/common/trunk/dev-support/cmake-maven-ng-plugin/src/main/
hadoop/common/branches/branch-2/dev-support/cmake-maven-ng-plugin/src/main/java/
- copied from r1399898, hadoop/common/trunk/dev-support/cmake-maven-ng-plugin/src/main/java/
hadoop/common/branches/branch-2/dev-support/cmake-maven-ng-plugin/src/main/java/org/
- copied from r1399898, hadoop/common/trunk/dev-support/cmake-maven-ng-plugin/src/main/java/org/
hadoop/common/branches/branch-2/dev-support/cmake-maven-ng-plugin/src/main/java/org/apache/
- copied from r1399898, hadoop/common/trunk/dev-support/cmake-maven-ng-plugin/src/main/java/org/apache/
hadoop/common/branches/branch-2/dev-support/cmake-maven-ng-plugin/src/main/java/org/apache/hadoop/
- copied from r1399898, hadoop/common/trunk/dev-support/cmake-maven-ng-plugin/src/main/java/org/apache/hadoop/
hadoop/common/branches/branch-2/dev-support/cmake-maven-ng-plugin/src/main/java/org/apache/hadoop/cmake/
- copied from r1399898, hadoop/common/trunk/dev-support/cmake-maven-ng-plugin/src/main/java/org/apache/hadoop/cmake/
hadoop/common/branches/branch-2/dev-support/cmake-maven-ng-plugin/src/main/java/org/apache/hadoop/cmake/maven/
- copied from r1399898, hadoop/common/trunk/dev-support/cmake-maven-ng-plugin/src/main/java/org/apache/hadoop/cmake/maven/
hadoop/common/branches/branch-2/dev-support/cmake-maven-ng-plugin/src/main/java/org/apache/hadoop/cmake/maven/ng/
- copied from r1399898, hadoop/common/trunk/dev-support/cmake-maven-ng-plugin/src/main/java/org/apache/hadoop/cmake/maven/ng/
hadoop/common/branches/branch-2/dev-support/cmake-maven-ng-plugin/src/main/java/org/apache/hadoop/cmake/maven/ng/CompileMojo.java
- copied unchanged from r1399898, hadoop/common/trunk/dev-support/cmake-maven-ng-plugin/src/main/java/org/apache/hadoop/cmake/maven/ng/CompileMojo.java
hadoop/common/branches/branch-2/dev-support/cmake-maven-ng-plugin/src/main/java/org/apache/hadoop/cmake/maven/ng/TestMojo.java
- copied unchanged from r1399898, hadoop/common/trunk/dev-support/cmake-maven-ng-plugin/src/main/java/org/apache/hadoop/cmake/maven/ng/TestMojo.java
hadoop/common/branches/branch-2/dev-support/cmake-maven-ng-plugin/src/main/java/org/apache/hadoop/cmake/maven/ng/Utils.java
- copied unchanged from r1399898, hadoop/common/trunk/dev-support/cmake-maven-ng-plugin/src/main/java/org/apache/hadoop/cmake/maven/ng/Utils.java
hadoop/common/branches/branch-2/dev-support/pom.xml
- copied unchanged from r1399898, hadoop/common/trunk/dev-support/pom.xml
Modified:
hadoop/common/branches/branch-2/dev-support/ (props changed)
hadoop/common/branches/branch-2/dev-support/test-patch.sh
hadoop/common/branches/branch-2/hadoop-project/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-pipes/pom.xml
hadoop/common/branches/branch-2/pom.xml
Propchange: hadoop/common/branches/branch-2/dev-support/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Oct 18 22:49:07 2012
@@ -0,0 +1 @@
+target
Propchange: hadoop/common/branches/branch-2/dev-support/cmake-maven-ng-plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Oct 18 22:49:07 2012
@@ -0,0 +1 @@
+target
Modified: hadoop/common/branches/branch-2/dev-support/test-patch.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/dev-support/test-patch.sh?rev=1399904&r1=1399903&r2=1399904&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/dev-support/test-patch.sh (original)
+++ hadoop/common/branches/branch-2/dev-support/test-patch.sh Thu Oct 18 22:49:07 2012
@@ -395,6 +395,9 @@ checkJavadocWarnings () {
echo ""
echo "There appear to be $javadocWarnings javadoc warnings generated by the patched build."
+ # There are 14 warnings that are caused by things that are caused by using sun
+ # internal APIs, and using Maven plugin annotations in comments.
+ OK_JAVADOC_WARNINGS=14;
### if current warnings greater than OK_JAVADOC_WARNINGS
if [[ $javadocWarnings -gt $OK_JAVADOC_WARNINGS ]] ; then
JIRA_COMMENT="$JIRA_COMMENT
Modified: hadoop/common/branches/branch-2/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/pom.xml?rev=1399904&r1=1399903&r2=1399904&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project/pom.xml Thu Oct 18 22:49:07 2012
@@ -702,6 +702,11 @@
<version>2.3.1</version>
</plugin>
<plugin>
+ <groupId>org.apache.hadoop.cmake.maven.ng</groupId>
+ <artifactId>cmake-ng</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-pipes/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-pipes/pom.xml?rev=1399904&r1=1399903&r2=1399904&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-pipes/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-pipes/pom.xml Thu Oct 18 22:49:07 2012
@@ -40,38 +40,23 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
+ <groupId>org.apache.hadoop.cmake.maven.ng</groupId>
+ <artifactId>cmake-ng</artifactId>
<executions>
<execution>
- <id>make</id>
- <phase>compile</phase>
- <goals><goal>run</goal></goals>
+ <id>cmake-compile</id>
+ <goals><goal>compile</goal></goals>
<configuration>
- <target>
- <mkdir dir="${project.build.directory}/native"/>
- <exec executable="cmake" dir="${project.build.directory}/native"
- failonerror="true">
- <arg line="${basedir}/src/ -DJVM_ARCH_DATA_MODEL=${sun.arch.data.model}"/>
- </exec>
- <exec executable="make" dir="${project.build.directory}/native" failonerror="true">
- <arg line="VERBOSE=1"/>
- </exec>
- </target>
+ <target>all</target>
+ <source>${basedir}/src</source>
+ <vars>
+ <JVM_ARCH_DATA_MODEL>${sun.arch.data.model}</JVM_ARCH_DATA_MODEL>
+ </vars>
+ <env>
+ <CFLAGS>${container-executor.additional_cflags}</CFLAGS>
+ </env>
</configuration>
</execution>
- <!-- TODO wire here native testcases
- <execution>
- <id>test</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <destDir>${project.build.directory}/native/target</destDir>
- </configuration>
- </execution>
- -->
</executions>
</plugin>
</plugins>
Modified: hadoop/common/branches/branch-2/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/pom.xml?rev=1399904&r1=1399903&r2=1399904&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/pom.xml (original)
+++ hadoop/common/branches/branch-2/pom.xml Thu Oct 18 22:49:07 2012
@@ -84,6 +84,7 @@ xsi:schemaLocation="http://maven.apache.
</properties>
<modules>
+ <module>dev-support</module>
<module>hadoop-project</module>
<module>hadoop-project-dist</module>
<module>hadoop-assemblies</module>