瀏覽代碼

HDFS-2322. the build fails in Windows because commons-daemon TAR cannot be fetched. (tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1180094 13f79535-47bb-0310-9956-ffa450edef68
Alejandro Abdelnur 13 年之前
父節點
當前提交
2b157c6b12
共有 2 個文件被更改,包括 15 次插入1 次删除
  1. 2 0
      hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
  2. 13 1
      hadoop-hdfs-project/hadoop-hdfs/pom.xml

+ 2 - 0
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -65,6 +65,8 @@ Trunk (unreleased changes)
 
     HDFS-2294. Download of commons-daemon TAR should not be under target (tucu)
 
+    HDFS-2322. the build fails in Windows because commons-daemon TAR cannot be fetched. (tucu)
+
   BUG FIXES
     HDFS-2287. TestParallelRead has a small off-by-one bug. (todd)
 

+ 13 - 1
hadoop-hdfs-project/hadoop-hdfs/pom.xml

@@ -310,7 +310,7 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <target>
+              <target unless="windows.build">
                 <condition property="commons.daemon.os.name" value="darwin">
                     <os name="Mac OS X"/>
                 </condition>
@@ -352,6 +352,18 @@
   </build>
 
   <profiles>
+    <profile>
+      <id>windows</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+        <os>
+          <family>windows</family>
+        </os>
+      </activation>
+      <properties>
+        <windows.build>true</windows.build>
+      </properties>
+    </profile>
     <profile>
       <id>native</id>
       <activation>