Browse Source

HADOOP-9353. Activate native-win maven profile by default on Windows. Contributed by Arpit Agarwal

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1460086 13f79535-47bb-0310-9956-ffa450edef68
Tsz-wo Sze 12 years ago
parent
commit
0f4cad57b8

+ 8 - 18
BUILDING.txt

@@ -107,7 +107,7 @@ When you import the project to eclipse, install hadoop-maven-plugins at first.
   $ cd hadoop-maven-plugins
   $ cd hadoop-maven-plugins
   $ mvn install
   $ mvn install
 
 
-Then, generate ecplise project files.
+Then, generate eclipse project files.
 
 
   $ mvn eclipse:eclipse -DskipTests
   $ mvn eclipse:eclipse -DskipTests
 
 
@@ -147,10 +147,10 @@ Requirements:
 * Windows System
 * Windows System
 * JDK 1.6
 * JDK 1.6
 * Maven 3.0
 * Maven 3.0
-* Findbugs 1.3.9 (if running findbugs)
+* Windows SDK or Visual Studio 2010 Professional
 * ProtocolBuffer 2.4.1+ (for MapReduce and HDFS)
 * ProtocolBuffer 2.4.1+ (for MapReduce and HDFS)
+* Findbugs 1.3.9 (if running findbugs)
 * Unix command-line tools from GnuWin32 or Cygwin: sh, mkdir, rm, cp, tar, gzip
 * Unix command-line tools from GnuWin32 or Cygwin: sh, mkdir, rm, cp, tar, gzip
-* Windows SDK or Visual Studio 2010 Professional
 * Internet connection for first build (to fetch all Maven and Hadoop dependencies)
 * Internet connection for first build (to fetch all Maven and Hadoop dependencies)
 
 
 If using Visual Studio, it must be Visual Studio 2010 Professional (not 2012).
 If using Visual Studio, it must be Visual Studio 2010 Professional (not 2012).
@@ -185,23 +185,13 @@ set Platform=Win32 (when building on a 32-bit system)
 Several tests require that the user must have the Create Symbolic Links
 Several tests require that the user must have the Create Symbolic Links
 privilege.
 privilege.
 
 
-All Maven goals are the same as described above, with the addition of profile
--Pnative-win to trigger building Windows native components.  The native
-components are required (not optional) on Windows.  For example:
-
- * Run tests                 : mvn -Pnative-win test
+All Maven goals are the same as described above with the exception that
+native code is built by enabling the 'native-win' Maven profile. -Pnative-win 
+is enabled by default when building on Windows since the native components 
+are required (not optional) on Windows.
 
 
 ----------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------
 Building distributions:
 Building distributions:
 
 
-Create binary distribution with native code and with documentation:
-
-  $ mvn package -Pdist,native-win,docs -DskipTests -Dtar
-
-Create source distribution:
-
-  $ mvn package -Pnative-win,src -DskipTests
-
-Create source and binary distributions with native code and documentation:
+ * Build distribution with native code    : mvn package [-Pdist][-Pdocs][-Psrc][-Dtar]
 
 
-  $ mvn package -Pdist,native-win,docs,src -DskipTests -Dtar

+ 3 - 0
hadoop-common-project/hadoop-common/CHANGES.txt

@@ -490,6 +490,9 @@ Trunk (Unreleased)
 
 
     HADOOP-9387. Fix DF so that it won't execute a shell command on Windows
     HADOOP-9387. Fix DF so that it won't execute a shell command on Windows
     to compute the file system/mount point.  (Ivan Mitic via szetszwo)
     to compute the file system/mount point.  (Ivan Mitic via szetszwo)
+
+    HADOOP-9353. Activate native-win maven profile by default on Windows.
+    (Arpit Agarwal via szetszwo)
     
     
 Release 2.0.5-beta - UNRELEASED
 Release 2.0.5-beta - UNRELEASED
 
 

+ 3 - 1
hadoop-common-project/hadoop-common/pom.xml

@@ -573,7 +573,9 @@
     <profile>
     <profile>
       <id>native-win</id>
       <id>native-win</id>
       <activation>
       <activation>
-        <activeByDefault>false</activeByDefault>
+        <os>
+          <family>Windows</family>
+        </os>
       </activation>
       </activation>
       <build>
       <build>
         <plugins>
         <plugins>