From 7705d57a78d5f23e23d997c78ba8206c1a949fa3 Mon Sep 17 00:00:00 2001 From: Chris Nauroth Date: Thu, 8 Aug 2013 23:49:11 +0000 Subject: [PATCH] HADOOP-9831. Make checknative shell command accessible on Windows. Contributed by Chris Nauroth. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1512101 13f79535-47bb-0310-9956-ffa450edef68 --- .gitattributes | 1 + hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ .../hadoop-common/src/main/bin/hadoop.cmd | 7 ++++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 851d236df0..af960483d2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -14,5 +14,6 @@ *.sh text eol=lf *.bat text eol=crlf +*.cmd text eol=crlf *.csproj text merge=union eol=crlf *.sln text merge=union eol=crlf diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 08d7ad98b7..e9b4532d78 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -352,6 +352,8 @@ Release 2.1.1-beta - UNRELEASED HADOOP-9527. Add symlink support to LocalFileSystem on Windows. (Arpit Agarwal via cnauroth) + HADOOP-9831. Make checknative shell command accessible on Windows. (cnauroth) + Release 2.1.0-beta - 2013-08-06 INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd b/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd index 90699b1601..63b2945c6e 100644 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd @@ -119,7 +119,7 @@ call :updatepath %HADOOP_BIN_PATH% goto :eof ) - set corecommands=fs version jar distcp daemonlog archive + set corecommands=fs version jar checknative distcp daemonlog archive for %%i in ( %corecommands% ) do ( if %hadoop-command% == %%i set corecommand=true ) @@ -157,6 +157,10 @@ call :updatepath %HADOOP_BIN_PATH% set CLASS=org.apache.hadoop.util.RunJar goto :eof +:checknative + set CLASS=org.apache.hadoop.util.NativeLibraryChecker + goto :eof + :distcp set CLASS=org.apache.hadoop.tools.DistCp set CLASSPATH=%CLASSPATH%;%TOOL_PATH% @@ -222,6 +226,7 @@ call :updatepath %HADOOP_BIN_PATH% @echo fs run a generic filesystem user client @echo version print the version @echo jar ^ run a jar file + @echo checknative [-a^|-h] check native hadoop and compression libraries availability @echo distcp ^ ^ copy file or directories recursively @echo archive -archiveName NAME -p ^ ^* ^ create a hadoop archive @echo classpath prints the class path needed to get the