Merge pull request #5775 from dachary/wip-do-autogen

tools: fix do_autogen.sh -R
ceph · Sep 2, 2015 · 8b62083 · 8b62083
2 parents f161257 + 6d80ff1
commit 8b62083
Showing 1 changed file with 20 additions and 35 deletions.
diff --git a/do_autogen.sh b/do_autogen.sh
@@ -4,23 +4,24 @@ usage() {
     cat <<EOF
 do_autogen.sh: make a ceph build by running autogen, etc.
 
--h:                              this help message
+-C <parameter>                   add parameters to configure
+-c                               use cryptopp
 -d <level>                       debug build
                                  level 0: no debug
                                  level 1: -g
                                  level 3: -Wextra
                                  level 4: even more...
--T                               --without-tcmalloc
 -e <path>                        dump encoded objects to <path>
--P                               profiling build
--p                               google profiler
--O <level>                       optimize
--c                               use cryptopp
--C <parameter>                   add parameters to configure
+-h                               this help message
 -j                               with java
--R                               without rocksdb
 -J				 --with-jemalloc
 -L				 --without-lttng
+-O <level>                       optimize
+-p                               google profiler
+-P                               profiling build
+-R                               without rocksdb
+-T                               --without-tcmalloc
+-v                               verbose output
 
 EOF
 }
@@ -35,41 +36,25 @@ verbose=0
 profile=0
 rocksdb=1
 CONFIGURE_FLAGS="--disable-static --with-lttng"
-while getopts  "d:e:hHrTPJLjpcvO:C:" flag
+while getopts  "C:cd:e:hjJLO:pPRTv" flag
 do
     case $flag in
+    C) CONFIGURE_FLAGS="$CONFIGURE_FLAGS $OPTARG";;
+    c) CONFIGURE_FLAGS="$CONFIGURE_FLAGS --with-cryptopp --without-nss";;
     d) debug_level=$OPTARG;;
-
+    e) encode_dump=$OPTARG;;
+    h) usage ; exit 0;;
+    j) CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-cephfs-java";;
+    J) CONFIGURE_FLAGS="$CONFIGURE_FLAGS --with-jemalloc";;
+    L) CONFIGURE_FLAGS="$CONFIGURE_FLAGS --without-lttng";;
     O) CFLAGS="${CFLAGS} -O$OPTARG";;
-
-    c) CONFIGURE_FLAGS="$CONFIGURE_FLAGS --with-cryptopp --without-nss";;
-
-    C) CONFIGURE_FLAGS="$CONFIGURE_FLAGS $OPTARG";;
-
-    P) profile=1;;
     p) with_profiler="--with-profiler" ;;
-
-    h) usage
-        exit 0;;
-
-    T) CONFIGURE_FLAGS="$CONFIGURE_FLAGS --without-tcmalloc";;
-
-    j) CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-cephfs-java";;
-
+    P) profile=1;;
     R) rocksdb=0;;
-
+    T) CONFIGURE_FLAGS="$CONFIGURE_FLAGS --without-tcmalloc";;
     v) verbose=1;;
 
-    e) encode_dump=$OPTARG;;
-
-    J) CONFIGURE_FLAGS="$CONFIGURE_FLAGS --with-jemalloc";;
-
-    L) CONFIGURE_FLAGS="$CONFIGURE_FLAGS --without-lttng";;
-
-    *)
-        echo
-        usage
-        exit 1;;
+    *) echo ; usage ; exit 1;;
     esac
 done