Author: tomwhite
Date: Tue Aug 9 18:03:00 2011
New Revision: 1155448
URL: http://svn.apache.org/viewvc?rev=1155448&view=rev
Log:
HADOOP-7528. Maven build fails in Windows. Contributed by Alejandro Abdelnur.
Modified:
hadoop/common/trunk/hadoop-assemblies/pom.xml
hadoop/common/trunk/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common/pom.xml
hadoop/common/trunk/hadoop-project/pom.xml
hadoop/common/trunk/pom.xml
Modified: hadoop/common/trunk/hadoop-assemblies/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-assemblies/pom.xml?rev=1155448&r1=1155447&r2=1155448&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-assemblies/pom.xml (original)
+++ hadoop/common/trunk/hadoop-assemblies/pom.xml Tue Aug 9 18:03:00 2011
@@ -67,9 +67,6 @@
<requireJavaVersion>
<version>1.6</version>
</requireJavaVersion>
- <requireOS>
- <family>unix</family>
- </requireOS>
</rules>
</configuration>
<executions>
Modified: hadoop/common/trunk/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common/CHANGES.txt?rev=1155448&r1=1155447&r2=1155448&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-common/CHANGES.txt Tue Aug 9 18:03:00 2011
@@ -464,6 +464,9 @@ Trunk (unreleased changes)
HADOOP-7523. Test org.apache.hadoop.fs.TestFilterFileSystem fails due to
java.lang.NoSuchMethodException. (John Lee via tomwhite)
+ HADOOP-7528. Maven build fails in Windows. (Alejandro Abdelnur via
+ tomwhite)
+
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/hadoop-common/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common/pom.xml?rev=1155448&r1=1155447&r2=1155448&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common/pom.xml (original)
+++ hadoop/common/trunk/hadoop-common/pom.xml Tue Aug 9 18:03:00 2011
@@ -853,11 +853,17 @@
<!-- Using Unix script to preserve symlinks -->
<echo
file="${project.build.directory}/tar-copynativelibs.sh">
+ which cygpath 2> /dev/null
+ if [ $? = 1 ]; then
+ BUILD_DIR="${project.build.directory}"
+ else
+ BUILD_DIR=`cygpath --unix '${project.build.directory}'`
+ fi
TAR='tar cf -'
UNTAR='tar xfBp -'
-
LIB_DIR="${project.build.directory}/native/target/usr/local/lib"
+ LIB_DIR="${BUILD_DIR}/native/target/usr/local/lib"
if [ -d $${LIB_DIR} ] ; then
-
TARGET_DIR="${project.build.directory}/${project.artifactId}-${project.version}/lib/native/${build.platform}"
+
TARGET_DIR="${BUILD_DIR}/${project.artifactId}-${project.version}/lib/native/${build.platform}"
mkdir -p $${TARGET_DIR}
cd $${LIB_DIR}
$$TAR *hadoop* | (cd $${TARGET_DIR}/; $$UNTAR)
@@ -881,11 +887,20 @@
</goals>
<configuration>
<target>
- <!-- Using Unix tar to preserve symlinks -->
- <exec executable="tar" dir="${project.build.directory}"
failonerror="yes">
- <arg value="czf"/>
- <arg
value="${project.build.directory}/${project.artifactId}-${project.version}.tar.gz"/>
- <arg value="${project.artifactId}-${project.version}"/>
+ <!-- Using Unix script to preserve symlinks -->
+ <echo file="${project.build.directory}/tar-maketar.sh">
+
+ which cygpath 2> /dev/null
+ if [ $? = 1 ]; then
+ BUILD_DIR="${project.build.directory}"
+ else
+ BUILD_DIR=`cygpath --unix '${project.build.directory}'`
+ fi
+ cd ${BUILD_DIR}
+ tar czf ${project.artifactId}-${project.version}.tar.gz
${project.artifactId}-${project.version}
+ </echo>
+ <exec executable="sh" dir="${project.build.directory}"
failonerror="true">
+ <arg line="./tar-maketar.sh"/>
</exec>
</target>
</configuration>
@@ -946,11 +961,17 @@
<!-- Using Unix script to preserve symlinks -->
<echo
file="${project.build.directory}/bintar-copynativelibs.sh">
+ which cygpath 2> /dev/null
+ if [ $? = 1 ]; then
+ BUILD_DIR="${project.build.directory}"
+ else
+ BUILD_DIR=`cygpath --unix '${project.build.directory}'`
+ fi
TAR='tar cf -'
UNTAR='tar xfBp -'
-
LIB_DIR="${project.build.directory}/native/target/usr/local/lib"
+ LIB_DIR="${BUILD_DIR}/native/target/usr/local/lib"
if [ -d $${LIB_DIR} ] ; then
-
TARGET_DIR="${project.build.directory}/${project.artifactId}-${project.version}-bin/lib"
+
TARGET_DIR="${BUILD_DIR}/${project.artifactId}-${project.version}-bin/lib"
mkdir -p $${TARGET_DIR}
cd $${LIB_DIR}
$$TAR *hadoop* | (cd $${TARGET_DIR}/; $$UNTAR)
@@ -974,11 +995,20 @@
</goals>
<configuration>
<target>
- <!-- Using Unix tar to preserve symlinks -->
- <exec executable="tar" dir="${project.build.directory}"
failonerror="yes">
- <arg value="czf"/>
- <arg
value="${project.build.directory}/${project.artifactId}-${project.version}-bin.tar.gz"/>
- <arg
value="${project.artifactId}-${project.version}-bin"/>
+ <!-- Using Unix script to preserve symlinks -->
+ <echo file="${project.build.directory}/bintar-maketar.sh">
+
+ which cygpath 2> /dev/null
+ if [ $? = 1 ]; then
+ BUILD_DIR="${project.build.directory}"
+ else
+ BUILD_DIR=`cygpath --unix '${project.build.directory}'`
+ fi
+ cd ${BUILD_DIR}
+ tar czf
${project.artifactId}-${project.version}-bin.tar.gz
${project.artifactId}-${project.version}-bin
+ </echo>
+ <exec executable="sh" dir="${project.build.directory}"
failonerror="true">
+ <arg line="./bintar-maketar.sh"/>
</exec>
</target>
</configuration>
Modified: hadoop/common/trunk/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-project/pom.xml?rev=1155448&r1=1155447&r2=1155448&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-project/pom.xml (original)
+++ hadoop/common/trunk/hadoop-project/pom.xml Tue Aug 9 18:03:00 2011
@@ -462,9 +462,6 @@
<requireJavaVersion>
<version>1.6</version>
</requireJavaVersion>
- <requireOS>
- <family>unix</family>
- </requireOS>
</rules>
</configuration>
<executions>
@@ -507,7 +504,7 @@
<id>os.linux</id>
<activation>
<os>
- <family>Linux</family>
+ <family>!Mac</family>
</os>
</activation>
<properties>
Modified: hadoop/common/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/pom.xml?rev=1155448&r1=1155447&r2=1155448&view=diff
==============================================================================
--- hadoop/common/trunk/pom.xml (original)
+++ hadoop/common/trunk/pom.xml Tue Aug 9 18:03:00 2011
@@ -79,9 +79,6 @@
<requireJavaVersion>
<version>1.6</version>
</requireJavaVersion>
- <requireOS>
- <family>unix</family>
- </requireOS>
</rules>
</configuration>
<executions>
