You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by dh...@apache.org on 2008/06/04 20:02:05 UTC
svn commit: r663330 - in /hadoop/core/trunk: CHANGES.txt
src/contrib/fuse-dfs/acinclude.m4 src/contrib/fuse-dfs/configure.ac
Author: dhruba
Date: Wed Jun 4 11:02:05 2008
New Revision: 663330
URL: http://svn.apache.org/viewvc?rev=663330&view=rev
Log:
HADOOP-3476. Code cleanup in fuse-dfs.
(Peter Wyckoff via dhruba)
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/contrib/fuse-dfs/acinclude.m4
hadoop/core/trunk/src/contrib/fuse-dfs/configure.ac
Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=663330&r1=663329&r2=663330&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Wed Jun 4 11:02:05 2008
@@ -433,6 +433,9 @@
HADOOP-3472 MapFile.Reader getClosest() function returns incorrect results
when before is true (Todd Lipcon via Stack)
+ HADOOP-3476. Code cleanup in fuse-dfs.
+ (Peter Wyckoff via dhruba)
+
Release 0.17.0 - 2008-05-18
INCOMPATIBLE CHANGES
Modified: hadoop/core/trunk/src/contrib/fuse-dfs/acinclude.m4
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/fuse-dfs/acinclude.m4?rev=663330&r1=663329&r2=663330&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/fuse-dfs/acinclude.m4 (original)
+++ hadoop/core/trunk/src/contrib/fuse-dfs/acinclude.m4 Wed Jun 4 11:02:05 2008
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-AC_DEFUN([FB_INITIALIZE],
+AC_DEFUN([FUSE_DFS_INITIALIZE],
[
AM_INIT_AUTOMAKE([ foreign 1.9.5 no-define ])
if test "x$1" = "xlocalinstall"; then
@@ -35,12 +35,12 @@
PRODUCT_MK=""
])
-AC_DEFUN([FB_WITH_EXTERNAL_PATH],
+AC_DEFUN([FUSE_DFS_WITH_EXTERNAL_PATH],
[
cdir=`pwd`
AC_MSG_CHECKING([Checking EXTERNAL_PATH set to])
AC_ARG_WITH([externalpath],
- [ --with-externalpath=DIR User specified path to external facebook components.],
+ [ --with-externalpath=DIR User specified path to external fuse dfs components.],
[
if test "x${EXTERNAL_PATH}" != "x"; then
echo ""
@@ -77,7 +77,7 @@
])
# Set option to enable shared mode. Set DEBUG and OPT for use in Makefile.am.
-AC_DEFUN([FB_ENABLE_DEFAULT_OPT_BUILD],
+AC_DEFUN([FUSE_DFS_ENABLE_DEFAULT_OPT_BUILD],
[
AC_MSG_CHECKING([whether to enable optimized build])
AC_ARG_ENABLE([opt],
@@ -103,7 +103,7 @@
])
# Set option to enable debug mode. Set DEBUG and OPT for use in Makefile.am.
-AC_DEFUN([FB_ENABLE_DEFAULT_DEBUG_BUILD],
+AC_DEFUN([FUSE_DFS_ENABLE_DEFAULT_DEBUG_BUILD],
[
AC_MSG_CHECKING([whether to enable debug build])
AC_ARG_ENABLE([debug],
@@ -129,7 +129,7 @@
])
# Set option to enable static libs.
-AC_DEFUN([FB_ENABLE_DEFAULT_STATIC],
+AC_DEFUN([FUSE_DFS_ENABLE_DEFAULT_STATIC],
[
SHARED=""
STATIC=""
@@ -162,7 +162,7 @@
])
# Set option to enable shared libs.
-AC_DEFUN([FB_ENABLE_DEFAULT_SHARED],
+AC_DEFUN([FUSE_DFS_ENABLE_DEFAULT_SHARED],
[
SHARED=""
STATIC=""
@@ -196,7 +196,7 @@
# Generates define flags and conditionals as specified by user.
# This gets enabled *only* if user selects --enable-<FEATURE> otion.
-AC_DEFUN([FB_ENABLE_FEATURE],
+AC_DEFUN([FUSE_DFS_ENABLE_FEATURE],
[
ENABLE=""
flag="$1"
@@ -226,7 +226,7 @@
# can also use eval $2=$withval;AC_SUBST($2)
-AC_DEFUN([FB_WITH_PATH],
+AC_DEFUN([FUSE_DFS_WITH_PATH],
[
USRFLAG=""
USRFLAG=$1
@@ -246,7 +246,7 @@
AC_MSG_RESULT($LOC)
])
-AC_DEFUN([FB_SET_FLAG_VALUE],
+AC_DEFUN([FUSE_DFS_SET_FLAG_VALUE],
[
SETFLAG=""
AC_MSG_CHECKING([Checking $1 set to])
Modified: hadoop/core/trunk/src/contrib/fuse-dfs/configure.ac
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/fuse-dfs/configure.ac?rev=663330&r1=663329&r2=663330&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/fuse-dfs/configure.ac (original)
+++ hadoop/core/trunk/src/contrib/fuse-dfs/configure.ac Wed Jun 4 11:02:05 2008
@@ -15,10 +15,7 @@
#
# Autoconf input file
# $Id$
-
# AC - autoconf
-# FB - facebook
-
#########################################################################
# Section 1:
# DO NOT TOUCH EXCEPT TO CHANGE Product-Name and Rev# IN AC_INIT
@@ -28,7 +25,7 @@
#AC_CONFIG_AUX_DIR([/usr/share/automake-1.9])
# To install locally
AC_CANONICAL_TARGET()
-FB_INITIALIZE([localinstall])
+FUSE_DFS_INITIALIZE([localinstall])
AC_PREFIX_DEFAULT([`pwd`])
@@ -49,51 +46,19 @@
# User can include custom makefile rules. Uncomment and update only <name> in PRODUCT_MK.
# Include where appropriate in any Makefile.am as @PRODUCT_MK@
-# Default path to external Facebook components and shared build tools I.e fb303 etc.
+# Default path to external components and shared build tools
# To point to other locations set environment variable EXTERNAL_PATH.
# DO NOT change default. Changing default value requires changing bootstrap.sh.
-FB_WITH_EXTERNAL_PATH([`pwd`])
+FUSE_DFS_WITH_EXTERNAL_PATH([`pwd`])
# Pre-defined macro to set optimized build mode. Configure with --disable-opt option to turn off optimization. Default CXXFLAGS set to '-Wall -O3'. In debug mode CXXFLAGS is '-Wall -g'
-# FB_ENABLE_DEFAULT_DEBUG_BUILD
-FB_ENABLE_DEFAULT_OPT_BUILD
+# FUSE_DFSENABLE_DEFAULT_DEBUG_BUILD
+FUSE_DFS_ENABLE_DEFAULT_OPT_BUILD
# Predefined macro to set static library mode. Configure with --disable-static option to turn off static lib mode.
-# FB_ENABLE_DEFAULT_SHARED
-FB_ENABLE_DEFAULT_STATIC
-
-##########################################################################
-# Section 3:
-# User Configurable
-
-# Personalized FLAG setting macro. Sets FLAG to user specifed value overriding any default.
-# $(FLAG) can be used in Makefile.am and global mk's.
-# FB_SET_FLAG_VALUE([<FLAGNAME>], [<value>])
-# FB_SET_FLAG_VALUE([CXXFLAGS], [-g -O3])
-
-# Personalized feature generator. Creates defines/conditionals and --enable --disable command line options. Doesn't enable until configured with --enable-<feature> option.
-# FB_ENABLE_FEATURE([FEATURE], [feature]) OR FB_ENABLE_FEATURE([FEATURE], [feature], [\"<value>\"])
-# Example: Macro supplies -DFACEBOOK at compile time and "if FACEBOOK endif" capabilities.
-
-# FB_ENABLE_FEATURE([FACEBOOK], [facebook])
-#FB_ENABLE_FEATURE([HDFS], [hdfs])
-
-# Personalized path generator Sets default paths. Provides --with-xx=DIR options.
-# FB_WITH_PATH([<var>_home], [<var>path], [<default location>]
-# Example: sets $(thrift_dir) variable with default path.
-#FB_WITH_PATH([HADOOP_HOME], [hadooppath], [/usr/local/share/hadoop/])
-#FB_WITH_PATH([external_home], [externalpath], [${EXTERNAL_PATH}/external])
-#FB_WITH_PATH([FUSE_HOME], [fusehome], [/usr/local])
-#FB_WITH_PATH([JAVA_HOME], [jdkhome], [/usr/local/jdk])
-#FB_WITH_PATH([PROTECTED_PATHS], [protectedpaths], [/,/Trash,/user])
-
-# Set default location of "php-config". User can also use "--with-php-config=<path>" to point to another location.
-# Run "./configure --help" to see --with options.
-# PHPCONFIGLIBS and PHPCONFIGINCS are generated.
-# FB_SET_PHP([PHPCONFIGDIR], [/usr/local/bin])
+# FUSE_DFS_ENABLE_DEFAULT_SHARED
+FUSE_DFS_ENABLE_DEFAULT_STATIC
-# Generates Makefile from Makefile.am. Modify when new subdirs are added.
-# Change Makefile.am also to add subdirectly.
AC_CONFIG_FILES(Makefile src/Makefile)
@@ -103,33 +68,3 @@
AC_SUBST(PRODUCT_MK)
AC_OUTPUT
-
-#############################################################################
-######### FINISH ############################################################
-
-echo "EXTERNAL_PATH $EXTERNAL_PATH"
-
-
-#
-# NOTES FOR USER
-# Short cut to create conditional flags.
-#enable_facebook="yes"
-#AM_CONDITIONAL([FACEBOOK], [test "$enable_facebook" = yes])
-#enable_hdfs="yes"
-#AM_CONDITIONAL([HDFS], [test "$enable_hdfs" = yes])
-
-# Enable options with --enable and --disable configurable.
-#AC_MSG_CHECKING([whether to enable FACEBOOK])
-#FACEBOOK=""
-#AC_ARG_ENABLE([facebook],
-# [ --enable-facebook Enable facebook.],
-# [
-# ENABLE_FACEBOOK=$enableval
-# ],
-# [
-# ENABLE_FACEBOOK="no"
-# ]
-#)
-#AM_CONDITIONAL([FACEBOOK], [test "$ENABLE_FACEBOOK" = yes])
-#AC_MSG_RESULT($ENABLE_FACEBOOK)
-