Return-Path: 
 <common-commits-return-22290-apmail-hadoop-common-commits-archive=hadoop.apache.org@hadoop.apache.org>
X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org
Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id C58E010DD0
	for <apmail-hadoop-common-commits-archive@www.apache.org>;
 Sun, 11 Aug 2013 05:52:07 +0000 (UTC)
Received: (qmail 6416 invoked by uid 500); 11 Aug 2013 05:52:05 -0000
Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org
Received: (qmail 6355 invoked by uid 500); 11 Aug 2013 05:52:00 -0000
Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:common-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:common-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:common-commits@hadoop.apache.org>
List-Id: <common-commits.hadoop.apache.org>
Reply-To: common-dev@hadoop.apache.org
Delivered-To: mailing list common-commits@hadoop.apache.org
Received: (qmail 6347 invoked by uid 99); 11 Aug 2013 05:51:57 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Aug 2013 05:51:57 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Aug 2013 05:51:55 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id CB15823889ED
	for <common-commits@hadoop.apache.org>; Sun, 11 Aug 2013 05:51:35 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1512872 - in /hadoop/common/trunk:
 hadoop-project-dist/pom.xml
 hadoop-project/pom.xml
Date: Sun, 11 Aug 2013 05:51:35 -0000
To: common-commits@hadoop.apache.org
From: cnauroth@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20130811055135.CB15823889ED@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: cnauroth
Date: Sun Aug 11 05:51:34 2013
New Revision: 1512872

URL: http://svn.apache.org/r1512872
Log:
HADOOP-9802. Support Snappy codec on Windows. Contributed by Chris Nauroth.

Modified:
    hadoop/common/trunk/hadoop-project-dist/pom.xml
    hadoop/common/trunk/hadoop-project/pom.xml

Modified: hadoop/common/trunk/hadoop-project-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-project-dist/pom.xml?rev=1512872&r1=1512871&r2=1512872&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-project-dist/pom.xml (original)
+++ hadoop/common/trunk/hadoop-project-dist/pom.xml Sun Aug 11 05:51:34 2013
@@ -40,6 +40,7 @@
 
     <hadoop.component>UNDEF</hadoop.component>
     <bundle.snappy>false</bundle.snappy>
+    <bundle.snappy.in.bin>false</bundle.snappy.in.bin>
   </properties>
   
   <dependencies>
@@ -355,6 +356,12 @@
                         mkdir -p $${TARGET_BIN_DIR}
                         cd $${BIN_DIR}
                         $$TAR * | (cd $${TARGET_BIN_DIR}/; $$UNTAR)
+                        if [ "${bundle.snappy.in.bin}" = "true" ] ; then
+                          if [ "${bundle.snappy}" = "true" ] ; then
+                            cd ${snappy.lib}
+                            $$TAR *snappy* | (cd $${TARGET_BIN_DIR}/; $$UNTAR)
+                          fi
+                        fi
                       fi
                     </echo>
                     <exec executable="sh" dir="${project.build.directory}" failonerror="true">

Modified: hadoop/common/trunk/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-project/pom.xml?rev=1512872&r1=1512871&r2=1512872&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-project/pom.xml (original)
+++ hadoop/common/trunk/hadoop-project/pom.xml Sun Aug 11 05:51:34 2013
@@ -892,6 +892,7 @@
         <!-- will use a native entropy provider.  This will not really -->
         <!-- attempt to open a file at this path. -->
         <java.security.egd>file:/dev/urandom</java.security.egd>
+        <bundle.snappy.in.bin>true</bundle.snappy.in.bin>
       </properties>
       <build>
         <plugins>
@@ -901,7 +902,7 @@
             <configuration>
               <environmentVariables>
                 <!-- Specify where to look for the native DLL on Windows -->
-                <PATH>${env.PATH};${hadoop.common.build.dir}/bin</PATH>
+                <PATH>${env.PATH};${hadoop.common.build.dir}/bin;${snappy.lib}</PATH>
               </environmentVariables>
             </configuration>
           </plugin>