do_freebsd*.sh: rename do_freebsd-cmake.sh to do_freebsd.sh

as autotools is dropped. and remove trailing spaces.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/do_freebsd-cmake.sh b/do_freebsd-cmake.sh
deleted file mode 100755 (executable)
index f1babfc..0000000
--- a/do_freebsd-cmake.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh -xve
-NPROC=`sysctl -n hw.ncpu`
-
-if [ x"$1"x = x"--deps"x ]; then
-    # we need bash first otherwise almost nothing will work
-    sudo pkg install bash
-    if [ ! -L /bin/bash ]; then
-        echo linking /bin/bash to /usr/local/bin/bash
-        ln -s /usr/local/bin/bash /bin/bash
-    fi
-    sudo ./install-deps.sh
-fi
-rm -rf build && ./do_cmake.sh "$*" \
-       -D CMAKE_BUILD_TYPE=Debug \
-       -D CMAKE_CXX_FLAGS_DEBUG="-O0 -g" \
-       -D ENABLE_GIT_VERSION=OFF \
-       -D WITH_BLKID=OFF \
-       -D WITH_FUSE=OFF \
-       -D WITH_RBD=OFF \
-       -D WITH_XFS=OFF \
-       -D WITH_KVS=OFF \
-       -D WITH_MANPAGE=OFF \
-       -D WITH_LIBCEPHFS=OFF \
-       -D WITH_CEPHFS=OFF \
-       -D WITH_RADOSGW=OFF \
-       2>&1 | tee cmake.log 
-
-cd build 
-gmake -j$NPROC V=1 VERBOSE=1 | tee build.log 2>&1
-gmake -j$NPROC check CEPH_BUFFER_NO_BENCH=yes | tee check.log 2>&1
-

diff --git a/do_freebsd.sh b/do_freebsd.sh
index eb093624cffbf00cfbd6569e45172706e7337177..56c1dc2b1144a098c81e71bf93c659b58ce91d4e 100755 (executable)
--- a/do_freebsd.sh
+++ b/do_freebsd.sh
@@ -10,10 +10,22 @@ if [ x"$1"x = x"--deps"x ]; then
     fi
     sudo ./install-deps.sh
 fi
-. ./autogen_freebsd.sh
-./autogen.sh
-./configure ${CONFIGURE_FLAGS}
-( cd src/gmock/gtest; patch < /usr/ports/devel/googletest/files/patch-bsd-defines )
-gmake -j$NPROC ENABLE_GIT_VERSION=OFF
-gmake -j$NPROC check ENABLE_GIT_VERSION=OFF CEPH_BUFFER_NO_BENCH=yes
+rm -rf build && ./do_cmake.sh "$*" \
+       -D CMAKE_BUILD_TYPE=Debug \
+       -D CMAKE_CXX_FLAGS_DEBUG="-O0 -g" \
+       -D ENABLE_GIT_VERSION=OFF \
+       -D WITH_BLKID=OFF \
+       -D WITH_FUSE=OFF \
+       -D WITH_RBD=OFF \
+       -D WITH_XFS=OFF \
+       -D WITH_KVS=OFF \
+       -D WITH_MANPAGE=OFF \
+       -D WITH_LIBCEPHFS=OFF \
+       -D WITH_CEPHFS=OFF \
+       -D WITH_RADOSGW=OFF \
+       2>&1 | tee cmake.log
+
+cd build
+gmake -j$NPROC V=1 VERBOSE=1 | tee build.log 2>&1
+gmake -j$NPROC check CEPH_BUFFER_NO_BENCH=yes | tee check.log 2>&1