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 at...@apache.org on 2011/12/15 21:05:39 UTC
svn commit: r1214944 - in
/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common:
CHANGES.txt pom.xml src/main/docs/ src/main/java/ src/test/core/
Author: atm
Date: Thu Dec 15 20:05:38 2011
New Revision: 1214944
URL: http://svn.apache.org/viewvc?rev=1214944&view=rev
Log:
Merge trunk into HA branch.
Modified:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed)
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/pom.xml
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/docs/ (props changed)
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/ (props changed)
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/core/ (props changed)
Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1214944&r1=1214943&r2=1214944&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt Thu Dec 15 20:05:38 2011
@@ -145,6 +145,8 @@ Trunk (unreleased changes)
HADOOP-7761. Improve the performance of raw comparisons. (todd)
+ HADOOP_7917. compilation of protobuf files fails in windows/cygwin. (tucu)
+
Release 0.23.1 - Unreleased
INCOMPATIBLE CHANGES
Propchange: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 15 20:05:38 2011
@@ -1,5 +1,5 @@
/hadoop/common/branches/yahoo-merge/CHANGES.txt:1079157,1079163-1079164,1079167
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:1161333-1214510
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:1161333-1214939
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278
Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/pom.xml?rev=1214944&r1=1214943&r2=1214944&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/pom.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/pom.xml Thu Dec 15 20:05:38 2011
@@ -296,17 +296,29 @@
</goals>
<configuration>
<target>
- <echo file="${project.build.directory}/compile-proto.sh">
- PROTO_DIR=${basedir}/src/main/proto
- ls $PROTO_DIR &> /dev/null
- if [ $? = 0 ]; then
- JAVA_DIR=${project.build.directory}/generated-sources/java
- mkdir -p $JAVA_DIR
- ls $PROTO_DIR/*.proto | xargs -n 1 protoc -I$PROTO_DIR --java_out=$JAVA_DIR
- fi
+ <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="${project.build.directory}" failonerror="true">
- <arg line="./compile-proto.sh"/>
+ <exec executable="sh" dir="${basedir}" failonerror="true">
+ <arg line="target/compile-proto.sh"/>
</exec>
</target>
</configuration>
@@ -319,17 +331,29 @@
</goals>
<configuration>
<target>
- <echo file="${project.build.directory}/compile-test-proto.sh">
- PROTO_DIR=${basedir}/src/test/proto
- ls $PROTO_DIR &> /dev/null
- if [ $? = 0 ]; then
- JAVA_DIR=${project.build.directory}/generated-test-sources/java
- mkdir -p $JAVA_DIR
- ls $PROTO_DIR/*.proto | xargs -n 1 protoc -I$PROTO_DIR --java_out=$JAVA_DIR
- fi
+ <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="${project.build.directory}" failonerror="true">
- <arg line="./compile-test-proto.sh"/>
+ <exec executable="sh" dir="${basedir}" failonerror="true">
+ <arg line="target/compile-test-proto.sh"/>
</exec>
</target>
</configuration>
Propchange: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 15 20:05:38 2011
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:1152502-1214510
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:1152502-1214939
/hadoop/core/branches/branch-0.19/src/docs:713112
Propchange: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 15 20:05:38 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:1152502-1214510
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:1152502-1214939
/hadoop/core/branches/branch-0.19/core/src/java:713112
/hadoop/core/trunk/src/core:776175-785643,785929-786278
Propchange: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 15 20:05:38 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:1152502-1214510
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:1152502-1214939
/hadoop/core/branches/branch-0.19/core/src/test/core:713112
/hadoop/core/trunk/src/test/core:776175-785643,785929-786278