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 2011/12/15 15:47:23 UTC
svn commit: r1214792 - in
/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common:
CHANGES.txt pom.xml
Author: tucu
Date: Thu Dec 15 14:47:22 2011
New Revision: 1214792
URL: http://svn.apache.org/viewvc?rev=1214792&view=rev
Log:
Merge -r 1214789:1214790 from trunk to branch. FIXES: HADOOP-7917
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml
Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1214792&r1=1214791&r2=1214792&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Thu Dec 15 14:47:22 2011
@@ -91,6 +91,8 @@ Release 0.23.1 - Unreleased
HADOOP-7810 move hadoop archive to core from tools. (tucu)
+ HADOOP_7917. compilation of protobuf files fails in windows/cygwin. (tucu)
+
Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml?rev=1214792&r1=1214791&r2=1214792&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml Thu Dec 15 14:47:22 2011
@@ -295,6 +295,76 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
+ <id>compile-proto</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <echo file="target/compile-proto.sh">
+ PROTO_DIR=src/main/proto
+ JAVA_DIR=target/generated-sources/java
+ which cygpath 2> /dev/null
+ if [ $? = 1 ]; then
+ IS_WIN=false
+ else
+ IS_WIN=true
+ WIN_PROTO_DIR=`cygpath --windows $PROTO_DIR`
+ WIN_JAVA_DIR=`cygpath --windows $JAVA_DIR`
+ fi
+ mkdir -p $JAVA_DIR 2> /dev/null
+ for PROTO_FILE in `ls $PROTO_DIR/*.proto 2> /dev/null`
+ do
+ if [ "$IS_WIN" = "true" ]; then
+ protoc -I$WIN_PROTO_DIR --java_out=$WIN_JAVA_DIR $PROTO_FILE
+ else
+ protoc -I$PROTO_DIR --java_out=$JAVA_DIR $PROTO_FILE
+ fi
+ done
+ </echo>
+ <exec executable="sh" dir="${basedir}" failonerror="true">
+ <arg line="target/compile-proto.sh"/>
+ </exec>
+ </target>
+ </configuration>
+ </execution>
+ <execution>
+ <id>compile-test-proto</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <echo file="target/compile-test-proto.sh">
+ PROTO_DIR=src/test/proto
+ JAVA_DIR=target/generated-test-sources/java
+ which cygpath 2> /dev/null
+ if [ $? = 1 ]; then
+ IS_WIN=false
+ else
+ IS_WIN=true
+ WIN_PROTO_DIR=`cygpath --windows $PROTO_DIR`
+ WIN_JAVA_DIR=`cygpath --windows $JAVA_DIR`
+ fi
+ mkdir -p $JAVA_DIR 2> /dev/null
+ for PROTO_FILE in `ls $PROTO_DIR/*.proto 2> /dev/null`
+ do
+ if [ "$IS_WIN" = "true" ]; then
+ protoc -I$WIN_PROTO_DIR --java_out=$WIN_JAVA_DIR $PROTO_FILE
+ else
+ protoc -I$PROTO_DIR --java_out=$JAVA_DIR $PROTO_FILE
+ fi
+ done
+ </echo>
+ <exec executable="sh" dir="${basedir}" failonerror="true">
+ <arg line="target/compile-test-proto.sh"/>
+ </exec>
+ </target>
+ </configuration>
+ </execution>
+ <execution>
<id>save-version</id>
<phase>generate-sources</phase>
<goals>