Author: cutting
Date: Wed Nov 15 09:55:01 2006
New Revision: 475331
URL: http://svn.apache.org/viewvc?view=rev&rev=475331
Log:
HADOOP-722. Fix some issues with HADOOP-538, setting scripts to be executable,
and fixing the package target when lib directories don't exist. Contributed by
Arun.
Modified:
lucene/hadoop/trunk/src/native/config/config.guess (props changed)
lucene/hadoop/trunk/src/native/config/config.sub (props changed)
lucene/hadoop/trunk/src/native/config/depcomp (props changed)
lucene/hadoop/trunk/src/native/config/install-sh (props changed)
lucene/hadoop/trunk/src/native/config/missing (props changed)
lucene/hadoop/trunk/src/native/configure (props changed)
lucene/hadoop/trunk/src/native/packageNativeHadoop.sh (contents, props
changed)
Propchange: lucene/hadoop/trunk/src/native/config/config.guess
------------------------------------------------------------------------------
svn:executable = *
Propchange: lucene/hadoop/trunk/src/native/config/config.sub
------------------------------------------------------------------------------
svn:executable = *
Propchange: lucene/hadoop/trunk/src/native/config/depcomp
------------------------------------------------------------------------------
svn:executable = *
Propchange: lucene/hadoop/trunk/src/native/config/install-sh
------------------------------------------------------------------------------
svn:executable = *
Propchange: lucene/hadoop/trunk/src/native/config/missing
------------------------------------------------------------------------------
svn:executable = *
Propchange: lucene/hadoop/trunk/src/native/configure
------------------------------------------------------------------------------
svn:executable = *
Modified: lucene/hadoop/trunk/src/native/packageNativeHadoop.sh
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/native/packageNativeHadoop.sh?view=diff&rev=475331&r1=475330&r2=475331
==============================================================================
--- lucene/hadoop/trunk/src/native/packageNativeHadoop.sh (original)
+++ lucene/hadoop/trunk/src/native/packageNativeHadoop.sh Wed Nov 15 09:55:01
2006
@@ -16,29 +16,36 @@
TAR='tar -c'
UNTAR='tar -x'
-# Copy the pre-built libraries in $BASE_NATIVE_LIB_DIR
-for platform in `ls $BASE_NATIVE_LIB_DIR`
-do
- if test ! -e $DIST_LIB_DIR/$platform
- then
- mkdir -p $DIST_LIB_DIR/$platform
- echo "Created $DIST_LIB_DIR/$platform"
- fi
- echo "Copying libraries in $BASE_NATIVE_LIB_DIR/$platform to
$DIST_LIB_DIR/$platform/"
- cd $BASE_NATIVE_LIB_DIR/$platform/
- $TAR *hadoop* | $UNTAR -C $DIST_LIB_DIR/$platform/
-done
+# Copy the pre-built libraries in $BASE_NATIVE_LIB_DIR
+if test -e $BASE_NATIVE_LIB_DIR
+then
+ for platform in `ls $BASE_NATIVE_LIB_DIR`
+ do
+ if test ! -e $DIST_LIB_DIR/$platform
+ then
+ mkdir -p $DIST_LIB_DIR/$platform
+ echo "Created $DIST_LIB_DIR/$platform"
+ fi
+ echo "Copying libraries in $BASE_NATIVE_LIB_DIR/$platform to
$DIST_LIB_DIR/$platform/"
+ cd $BASE_NATIVE_LIB_DIR/$platform/
+ $TAR *hadoop* | $UNTAR -C $DIST_LIB_DIR/$platform/
+ done
+fi
# Copy the custom-built libraries in $BUILD_DIR
-for platform in `ls $BUILD_NATIVE_DIR`
-do
- if test ! -e $DIST_LIB_DIR/$platform
- then
- mkdir -p $DIST_LIB_DIR/$platform
- echo "Created $DIST_LIB_DIR/$platform"
- fi
- echo "Copying libraries in $BUILD_NATIVE_DIR/$platform/lib to
$DIST_LIB_DIR/$platform/"
- cd $BUILD_NATIVE_DIR/$platform/lib
- $TAR *hadoop* | $UNTAR -C $DIST_LIB_DIR/$platform/
-done
+if test -e $BUILD_NATIVE_DIR
+then
+ for platform in `ls $BUILD_NATIVE_DIR`
+ do
+ if test ! -e $DIST_LIB_DIR/$platform
+ then
+ mkdir -p $DIST_LIB_DIR/$platform
+ echo "Created $DIST_LIB_DIR/$platform"
+ fi
+ echo "Copying libraries in $BUILD_NATIVE_DIR/$platform/lib to
$DIST_LIB_DIR/$platform/"
+ cd $BUILD_NATIVE_DIR/$platform/lib
+ $TAR *hadoop* | $UNTAR -C $DIST_LIB_DIR/$platform/
+ done
+fi
+#vim: ts=2: sw=2: et
Propchange: lucene/hadoop/trunk/src/native/packageNativeHadoop.sh
------------------------------------------------------------------------------
svn:executable = *
