hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cnaur...@apache.org
Subject svn commit: r1512875 - in /hadoop/common/branches/branch-2.1-beta: hadoop-project-dist/pom.xml hadoop-project/pom.xml
Date Sun, 11 Aug 2013 06:17:00 GMT
Author: cnauroth
Date: Sun Aug 11 06:16:59 2013
New Revision: 1512875

URL: http://svn.apache.org/r1512875
Log:
HADOOP-9802. Merging change r1512874 from branch-2 to branch-2.1-beta.

Modified:
    hadoop/common/branches/branch-2.1-beta/hadoop-project-dist/pom.xml
    hadoop/common/branches/branch-2.1-beta/hadoop-project/pom.xml

Modified: hadoop/common/branches/branch-2.1-beta/hadoop-project-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-project-dist/pom.xml?rev=1512875&r1=1512874&r2=1512875&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-project-dist/pom.xml (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-project-dist/pom.xml Sun Aug 11 06:16:59
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/branches/branch-2.1-beta/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-project/pom.xml?rev=1512875&r1=1512874&r2=1512875&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-project/pom.xml Sun Aug 11 06:16:59 2013
@@ -929,6 +929,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>
@@ -938,7 +939,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>



Mime
View raw message