Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-6172. Fix jar file names in hadoop-config.sh and include ${build.src} as a part of the source list in build.xml. Contributed by Hong Tang 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@799751 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2009-07-31 21:37:23 +00:00
parent 638a211067
commit e5ea0ce4a6
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES.txt
View File

@ -888,7 +888,7 @@ Trunk (unreleased changes)
HADOOP-6137. Fix project specific test-patch requirements HADOOP-6137. Fix project specific test-patch requirements
(Giridharan Kesavan) (Giridharan Kesavan)
HADOOP-6138. Eliminate the depracate warnings introduced by H-5438. HADOOP-6138. Eliminate the deprecated warnings introduced by H-5438.
(He Yongqiang via szetszwo) (He Yongqiang via szetszwo)
HADOOP-6132. RPC client create an extra connection because of incorrect HADOOP-6132. RPC client create an extra connection because of incorrect
@ -897,6 +897,9 @@ Trunk (unreleased changes)
HADOOP-6123. Add missing classpaths in hadoop-config.sh. (Sharad Agarwal HADOOP-6123. Add missing classpaths in hadoop-config.sh. (Sharad Agarwal
via szetszwo) via szetszwo)
HADOOP-6172. Fix jar file names in hadoop-config.sh and include ${build.src}
as a part of the source list in build.xml. (Hong Tang via szetszwo)
Release 0.20.1 - Unreleased Release 0.20.1 - Unreleased
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
bin/hadoop-config.sh
View File

@ -126,7 +126,7 @@ IFS=
if [ -d "$HADOOP_CORE_HOME/webapps" ]; then if [ -d "$HADOOP_CORE_HOME/webapps" ]; then
CLASSPATH=${CLASSPATH}:$HADOOP_CORE_HOME CLASSPATH=${CLASSPATH}:$HADOOP_CORE_HOME
fi fi
for f in $HADOOP_CORE_HOME/hadoop-*-core.jar; do for f in $HADOOP_CORE_HOME/hadoop-core-*.jar; do
CLASSPATH=${CLASSPATH}:$f; CLASSPATH=${CLASSPATH}:$f;
done done

2
build.xml
View File

@ -294,7 +294,7 @@
<!-- Compile Java files (excluding JSPs) checking warnings --> <!-- Compile Java files (excluding JSPs) checking warnings -->
<javac <javac
encoding="${build.encoding}" encoding="${build.encoding}"
srcdir="${core.src.dir}" srcdir="${core.src.dir};${build.src}"
includes="org/apache/hadoop/**/*.java" includes="org/apache/hadoop/**/*.java"
destdir="${build.classes}" destdir="${build.classes}"
debug="${javac.debug}" debug="${javac.debug}"