Author: cutting
Date: Mon Nov 20 15:57:23 2006
New Revision: 477416
URL: http://svn.apache.org/viewvc?view=rev&rev=477416
Log:
HADOOP-724. Fix some issues related to HADOOP-538. Contributed by Arun.
Modified:
lucene/hadoop/trunk/CHANGES.txt
lucene/hadoop/trunk/bin/hadoop
lucene/hadoop/trunk/build.xml
Modified: lucene/hadoop/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=477416&r1=477415&r2=477416
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Mon Nov 20 15:57:23 2006
@@ -100,7 +100,6 @@
30. HADOOP-447. In DFS, fix getBlockSize(Path) to work with relative
paths. (Raghu Angadi via cutting)
-
Release 0.8.0 - 2006-11-03
1. HADOOP-477. Extend contrib/streaming to scan the PATH environment
Modified: lucene/hadoop/trunk/bin/hadoop
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/bin/hadoop?view=diff&rev=477416&r1=477415&r2=477416
==============================================================================
--- lucene/hadoop/trunk/bin/hadoop (original)
+++ lucene/hadoop/trunk/bin/hadoop Mon Nov 20 15:57:23 2006
@@ -107,14 +107,20 @@
CLASSPATH=${CLASSPATH}:$f;
done
-# setup 'java.library.path' for native-hadoop code
-JAVA_PLATFORM=`CLASSPATH=${CLASSPATH} java org.apache.hadoop.util.PlatformName`
+# setup 'java.library.path' for native-hadoop code if necessary
JAVA_LIBRARY_PATH=''
-if [ -d "$HADOOP_HOME/build/classes" ]; then
- JAVA_LIBRARY_PATH=${HADOOP_HOME}/build/native/${JAVA_PLATFORM}/lib
-fi
-JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:${HADOOP_HOME}/lib/native/${JAVA_PLATFORM}
+if [ -d "${HADOOP_HOME}/build/native" -o -d "${HADOOP_HOME}/lib/native" ]; then
+ JAVA_PLATFORM=`CLASSPATH=${CLASSPATH} ${JAVA}
org.apache.hadoop.util.PlatformName`
+
+ if [ -d "$HADOOP_HOME/build/native" ]; then
+ JAVA_LIBRARY_PATH=${HADOOP_HOME}/build/native/${JAVA_PLATFORM}/lib
+ fi
+ if [ -d "${HADOOP_HOME}/lib/native" ]; then
+
JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:${HADOOP_HOME}/lib/native/${JAVA_PLATFORM}
+ fi
+fi
+
# restore ordinary behaviour
unset IFS
@@ -165,7 +171,9 @@
HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.home.dir=$HADOOP_HOME"
HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.id.str=$HADOOP_IDENT_STRING"
HADOOP_OPTS="$HADOOP_OPTS
-Dhadoop.root.logger=${HADOOP_ROOT_LOGGER:-INFO,console}"
-HADOOP_OPTS="$HADOOP_OPTS -Djava.library.path=$JAVA_LIBRARY_PATH"
+if [ "x$JAVA_LIBRARY_PATH" != "x" ]; then
+ HADOOP_OPTS="$HADOOP_OPTS -Djava.library.path=$JAVA_LIBRARY_PATH"
+fi
# run it
exec "$JAVA" $JAVA_HEAP_MAX $HADOOP_OPTS -classpath "$CLASSPATH" $CLASS "$@"
Modified: lucene/hadoop/trunk/build.xml
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/build.xml?view=diff&rev=477416&r1=477415&r2=477416
==============================================================================
--- lucene/hadoop/trunk/build.xml (original)
+++ lucene/hadoop/trunk/build.xml Mon Nov 20 15:57:23 2006
@@ -459,7 +459,6 @@
</fileset>
</copy>
- <mkdir dir="${dist.dir}/lib/native"/>
<exec dir="${dist.dir}" executable="sh" failonerror="true">
<env key="BASE_NATIVE_LIB_DIR" value="${lib.dir}/native"/>
<env key="BUILD_NATIVE_DIR" value="${build.dir}/native"/>
