Add custom target install-all/storage (#224)

* Add custom target install-all/storage

* print option

* fix arch name

* address comments

CMakeLists.txt

@@ -35,10 +35,6 @@ option(ENABLE_PACK_ONE "Whether to package into one" ON)
 option(ENABLE_BUILD_STORAGE "Whether to build storage" OFF)
 option(ENABLE_MODULE_UPDATE "Automatically update module" OFF)
 
-message(STATUS "ENABLE_PACK_ONE         : ${ENABLE_PACK_ONE}")
-message(STATUS "ENABLE_BUILD_STORAGE    : ${ENABLE_BUILD_STORAGE}")
-message(STATUS "ENABLE_MODULE_UPDATE    : ${ENABLE_MODULE_UPDATE}")
-
 add_definitions(-DNEBULA_HOME=${CMAKE_SOURCE_DIR})
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
@@ -103,6 +99,7 @@ config_nebula_common(
     SOURCE_DIR ${nebula_common_source_dir}
     BUILD_DIR ${nebula_common_build_dir}
 )
+
 if(ENABLE_BUILD_STORAGE)
     include(ConfigNebulaStorage)
     nebula_fetch_module(
@@ -127,10 +124,21 @@ add_custom_target(
     clean-modules
     DEPENDS clean-common
 )
+
 if(TARGET clean-storage)
     add_dependencies(clean-modules clean-storage)
 endif()
 
+add_custom_target(
+    install-all
+    COMMAND $(MAKE) install
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+)
+
+if(TARGET install-storage)
+    add_dependencies(install-all install-storage)
+endif()
+
 
 if (ENABLE_NATIVE)
     message(STATUS "ENABLE_NATIVE is ${ENABLE_NATIVE}")

cmake/ConfigNebulaStorage.cmake

@@ -25,6 +25,7 @@ macro(config_nebula_storage)
                 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
                 -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
                 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+                -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
                 -DNEBULA_THIRDPARTY_ROOT=${NEBULA_THIRDPARTY_ROOT}
                 -DNEBULA_OTHER_ROOT=${NEBULA_OTHER_ROOT}
                 -DENABLE_JEMALLOC=${ENABLE_JEMALLOC}
@@ -51,6 +52,11 @@ macro(config_nebula_storage)
         storage_project ALL
         COMMAND +${CMAKE_COMMAND} --build ${storage_build_dir}
     )
+    add_custom_target(
+        install-storage
+        COMMAND $(MAKE) install
+        WORKING_DIRECTORY ${storage_build_dir}
+    )
     add_custom_target(
         clean-storage
         COMMAND $(MAKE) clean

package/package.sh

@@ -129,10 +129,10 @@ function package {
         sys_name=`cat /etc/redhat-release | cut -d ' ' -f1`
         if [[ ${sys_name} == "CentOS" ]]; then
             sys_ver=`cat /etc/redhat-release | tr -dc '0-9.' | cut -d \. -f1`
-            sys_ver=.el${sys_ver}.x86
+            sys_ver=.el${sys_ver}.x86_64
         elif [[ ${sys_name} == "Fedora" ]]; then
             sys_ver=`cat /etc/redhat-release | cut -d ' ' -f3`
-            sys_ver=.fc${sys_ver}.x86
+            sys_ver=.fc${sys_ver}.x86_64
         fi
         pType="RPM"
     elif [[ -f "/etc/lsb-release" ]]; then