Fix package script (vesoft-inc#2502)

* Fix package script

* nightly build

* Fix cmake module path

Author: yixinglu

README.md

@@ -4,8 +4,8 @@
   <br>A distributed, scalable, lightning-fast graph database<br>
 </p>
 <p align="center">
-  <a href="https://github.com/vesoft-inc/nebula/actions?workflow=docker">
-    <img src="https://github.com/vesoft-inc/nebula/workflows/docker/badge.svg" alt="build docker image workflow"/>
+  <a href="https://github.com/vesoft-inc/nebula/actions?workflow=nightly">
+    <img src="https://github.com/vesoft-inc/nebula/workflows/nightly/badge.svg" alt="nightly build"/>
   </a>
   <a href="http://githubbadges.com/star.svg?user=vesoft-inc&repo=nebula&style=default">
     <img src="http://githubbadges.com/star.svg?user=vesoft-inc&repo=nebula&style=default" alt="nebula star"/>

cmake/ThriftGenerate.cmake

@@ -121,12 +121,6 @@ set_target_properties(
 
 target_compile_options(${file_name}_thrift_obj PRIVATE "-Wno-pedantic")
 target_compile_options(${file_name}_thrift_obj PRIVATE "-Wno-extra")
-export(
-  TARGETS "${file_name}_thrift_obj"
-  NAMESPACE "common_"
-  APPEND
-  FILE ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}-config.cmake
-)
 
 if(NOT "${file_name}" STREQUAL "common")
     add_dependencies(

package/CMakeLists.txt

@@ -18,9 +18,7 @@ cmake_minimum_required(VERSION 3.5.0)
 # Set the project name
 project("Nebula Package")
 
-OPTION(ENABLE_PACKAGE_STORAGE "Whether package storage." ON)
-
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_BINARY_DIR}/../cmake")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
 
 message(STATUS "CMAKE_MODULE_PATH = ${CMAKE_MODULE_PATH}")
 
@@ -35,8 +33,6 @@ endif()
 message(STATUS "NEBULA_SOURCE_DIR         : ${NEBULA_SOURCE_DIR}")
 message(STATUS "NEBULA_BINARY_DIR         : ${NEBULA_BINARY_DIR}")
 
-if(ENABLE_PACKAGE_STORAGE)
-
 install(
     FILES
         ${NEBULA_BINARY_DIR}/bin/nebula-storaged
@@ -63,8 +59,6 @@ install(
         meta
 )
 
-endif()
-
 install(
     FILES
         ${NEBULA_BINARY_DIR}/bin/nebula-graphd
@@ -78,8 +72,6 @@ install(
         graph
 )
 
-if(ENABLE_PACKAGE_STORAGE)
-
 install(
     FILES
         ${NEBULA_BINARY_DIR}/bin/db_dump
@@ -148,8 +140,6 @@ install(
         meta
 )
 
-endif()
-
 install(
     FILES
         ${NEBULA_SOURCE_DIR}/conf/nebula-graphd.conf.default
@@ -164,8 +154,6 @@ install(
         graph
 )
 
-if(ENABLE_PACKAGE_STORAGE)
-
 install(
     FILES
         ${NEBULA_SOURCE_DIR}/scripts/nebula-storaged.service
@@ -192,8 +180,6 @@ install(
         meta
 )
 
-endif()
-
 install(
     FILES
         ${NEBULA_SOURCE_DIR}/scripts/nebula-graphd.service

package/package.sh

@@ -4,25 +4,23 @@
 #
 # introduce the args
 #   -v: The version of package, the version should be match tag name, default value is the `commitId`
-#   -n: Package to one or multi packages, `ON` means one package, `OFF` means multi packages, default value is `ON`
+#   -n: Package to one or multi-packages, `ON` means one package, `OFF` means multi packages, default value is `ON`
 #   -s: Whether to strip the package, default value is `FALSE`
-#   -g: Whether build storage, default is ON
+#   -b: Branch, default master
+#   -d: Whether to enable sanitizer, default OFF
+#   -t: Build type, default Release
 #
-# usage: ./package.sh -v <version> -n <ON/OFF> -s <TRUE/FALSE> -b <BRANCH> -g <ON/OFF>
+# usage: ./package.sh -v <version> -n <ON/OFF> -s <TRUE/FALSE> -b <BRANCH>
 #
 
 set -e
 
 version=""
-build_storage=ON
 package_one=ON
 strip_enable="FALSE"
 usage="Usage: ${0} -v <version> -n <ON/OFF> -s <TRUE/FALSE> -b <BRANCH> -g <ON/OFF>"
 project_dir="$(cd "$(dirname "$0")" && pwd)/.."
 build_dir=${project_dir}/pkg-build
-modules_dir=${project_dir}/modules
-storage_dir=${modules_dir}/storage
-storage_build_dir=${build_dir}/modules/storage
 enablesanitizer="OFF"
 static_sanitizer="OFF"
 build_type="Release"
@@ -54,9 +52,6 @@ do
         t)
             build_type=$OPTARG
             ;;
-        g)
-            build_storage=$OPTARG
-            ;;
         ?)
             echo "Invalid option, use default arguments"
             ;;
@@ -83,31 +78,6 @@ fi
 
 echo "current version is [ $version ], strip enable is [$strip_enable], enablesanitizer is [$enablesanitizer], static_sanitizer is [$static_sanitizer]"
 
-function _build_storage {
-    if [[ ! -d ${storage_dir} && ! -L ${storage_dir} ]]; then
-        git clone --single-branch --branch ${branch} https://github.com/vesoft-inc/nebula-storage.git ${storage_dir}
-    fi
-
-    pushd ${storage_build_dir}
-    cmake -DCMAKE_BUILD_TYPE=${build_type} \
-          -DNEBULA_BUILD_VERSION=${version} \
-          -DENABLE_ASAN=${san} \
-          -DENABLE_UBSAN=${san} \
-          -DENABLE_STATIC_ASAN=${ssan} \
-          -DENABLE_STATIC_UBSAN=${ssan} \
-          -DCMAKE_INSTALL_PREFIX=/usr/local/nebula \
-          -DENABLE_TESTING=OFF \
-          -DENABLE_PACK_ONE=${package_one} \
-          ${storage_dir}
-
-    if ! ( make -j ${jobs} ); then
-        echo ">>> build nebula storage failed <<<"
-        exit 1
-    fi
-    popd
-    echo ">>> build nebula storage successfully <<<"
-}
-
 function _build_graph {
     pushd ${build_dir}
     cmake -DCMAKE_BUILD_TYPE=${build_type} \
@@ -139,10 +109,6 @@ function build {
 
     rm -rf ${build_dir} && mkdir -p ${build_dir}
 
-    if [[ "$build_storage" == "ON" ]]; then
-        mkdir -p ${storage_build_dir}
-        _build_storage
-    fi
     _build_graph
 }
 
@@ -160,7 +126,6 @@ function package {
         -DNEBULA_BUILD_VERSION=${version} \
         -DENABLE_PACK_ONE=${package_one} \
         -DCMAKE_INSTALL_PREFIX=/usr/local/nebula \
-        -DENABLE_PACKAGE_STORAGE=${build_storage} \
         ${project_dir}/package/
 
     strip_enable=$1