You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pegasus.apache.org by wu...@apache.org on 2020/09/19 02:34:49 UTC
[incubator-pegasus] branch v2.1 updated (4f8db17 -> e512590)
This is an automated email from the ASF dual-hosted git repository.
wutao pushed a change to branch v2.1
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git.
from 4f8db17 Release pegasus 2.1.0-RC1
new 604a290 build: remove restrict to build from non-git-repo (#602)
new e512590 Release pegasus 2.1.0-RC2
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
rdsn | 2 +-
scripts/bump_version.sh | 9 +++++----
src/build.sh | 45 +++++++++----------------------------------
src/include/pegasus/version.h | 2 +-
src/server/main.cpp | 2 --
5 files changed, 16 insertions(+), 44 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pegasus.apache.org
For additional commands, e-mail: commits-help@pegasus.apache.org
[incubator-pegasus] 01/02: build: remove restrict to build from
non-git-repo (#602)
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wutao pushed a commit to branch v2.1
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
commit 604a290010bf2ad2f44648574ebd8230cf3cebab
Author: Wu Tao <wu...@163.com>
AuthorDate: Fri Sep 18 19:10:09 2020 +0800
build: remove restrict to build from non-git-repo (#602)
---
scripts/bump_version.sh | 9 +++++----
src/build.sh | 45 +++++++++------------------------------------
src/server/main.cpp | 2 --
3 files changed, 14 insertions(+), 42 deletions(-)
diff --git a/scripts/bump_version.sh b/scripts/bump_version.sh
index 39ca5e4..9770964 100755
--- a/scripts/bump_version.sh
+++ b/scripts/bump_version.sh
@@ -1,16 +1,17 @@
#!/bin/bash
+set -e
+
if [ $# -ne 1 ]; then
echo "USAGE: $0 <version>"
exit 1
fi
-pwd="$( cd "$( dirname "$0" )" && pwd )"
-shell_dir="$( cd $pwd/.. && pwd )"
-cd $shell_dir
+pwd="$(cd "$(dirname "$0")" && pwd)"
+shell_dir="$(cd "$pwd"/.. && pwd)"
+cd "$shell_dir" || exit 1
VERSION=$1
sed -i "s/^#define PEGASUS_VERSION .*/#define PEGASUS_VERSION \"$VERSION\"/" src/include/pegasus/version.h
echo "Files modified successfully, version bumped to $VERSION"
-
diff --git a/src/build.sh b/src/build.sh
index 9e441fa..3b8dd80 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -10,7 +10,6 @@
# RUN_VERBOSE YES|NO
# WARNING_ALL YES|NO
# ENABLE_GCOV YES|NO
-# BOOST_DIR <dir>|""
# TEST_MODULE "<module1> <module2> ..."
#
# CMake options:
@@ -19,7 +18,6 @@
# [-DCMAKE_BUILD_TYPE=Debug]
# [-DWARNING_ALL=TRUE]
# [-DENABLE_GCOV=TRUE]
-# [-DBoost_NO_BOOST_CMAKE=ON -DBOOST_ROOT=$BOOST_DIR -DBoost_NO_SYSTEM_PATHS=ON]
ROOT=`pwd`
BUILD_DIR="$ROOT/builder"
@@ -97,27 +95,7 @@ else
echo "DISABLE_GPERF=NO"
fi
-# You can specify customized boost by defining BOOST_DIR.
-# Install boost like this:
-# wget http://downloads.sourceforge.net/project/boost/boost/1.54.0/boost_1_54_0.zip?r=&ts=1442891144&use_mirror=jaist
-# unzip -q boost_1_54_0.zip
-# cd boost_1_54_0
-# ./bootstrap.sh --with-libraries=system,filesystem --with-toolset=gcc
-# ./b2 toolset=gcc cxxflags="-std=c++11 -fPIC" -j8 -d0
-# ./b2 install --prefix=$DSN_ROOT -d0
-# And set BOOST_DIR as:
-# export BOOST_DIR=/path/to/boost_1_54_0/output
-if [ -n "$BOOST_DIR" ]
-then
- echo "Use customized boost: $BOOST_DIR"
- CMAKE_OPTIONS="$CMAKE_OPTIONS -DBoost_NO_BOOST_CMAKE=ON -DBOOST_ROOT=$BOOST_DIR -DBoost_NO_SYSTEM_PATHS=ON"
- # for makefile
- export BOOST_ROOT=$BOOST_DIR
-else
- echo "Use system boost"
-fi
-
-echo "CMAKE_OPTIONS=$CMAKE_OPTIONS"
+CMAKE_OPTIONS="$CMAKE_OPTIONS -DBoost_NO_BOOST_CMAKE=ON -DBOOST_ROOT=${ROOT}/rdsn/thirdparty/output -DBoost_NO_SYSTEM_PATHS=ON"
echo "#############################################################################"
@@ -152,21 +130,16 @@ then
cd ..
fi
-cd $ROOT
-PEGASUS_GIT_COMMIT=`git log | head -n 1 | awk '{print $2}'`
-if [ $? -ne 0 ] || [ -z "$PEGASUS_GIT_COMMIT" ]
-then
- echo "ERROR: get PEGASUS_GIT_COMMIT failed"
- echo "HINT: check if pegasus is a git repo"
- exit 1
+cd "$ROOT" || exit 1
+PEGASUS_GIT_COMMIT="non-git-repo"
+if git rev-parse HEAD; then # this is a git repo
+ PEGASUS_GIT_COMMIT=$(git rev-parse HEAD)
fi
+echo "PEGASUS_GIT_COMMIT=${PEGASUS_GIT_COMMIT}"
GIT_COMMIT_FILE=include/pegasus/git_commit.h
-if [ ! -f $GIT_COMMIT_FILE ] || ! grep $PEGASUS_GIT_COMMIT $GIT_COMMIT_FILE
-then
- echo "Generating $GIT_COMMIT_FILE..."
- echo "#pragma once" >$GIT_COMMIT_FILE
- echo "#define PEGASUS_GIT_COMMIT \"$PEGASUS_GIT_COMMIT\"" >>$GIT_COMMIT_FILE
-fi
+echo "Generating $GIT_COMMIT_FILE..."
+echo "#pragma once" >$GIT_COMMIT_FILE
+echo "#define PEGASUS_GIT_COMMIT \"$PEGASUS_GIT_COMMIT\"" >>$GIT_COMMIT_FILE
cd $BUILD_DIR
echo "Building..."
diff --git a/src/server/main.cpp b/src/server/main.cpp
index f12cf1a..ab7b8e5 100644
--- a/src/server/main.cpp
+++ b/src/server/main.cpp
@@ -7,7 +7,6 @@
#include "info_collector_app.h"
#include "brief_stat.h"
-#include <dsn/git_commit.h>
#include <pegasus/version.h>
#include <pegasus/git_commit.h>
@@ -37,7 +36,6 @@ static char const rcsid[] =
#if defined(DSN_BUILD_TYPE)
" " STR(DSN_BUILD_TYPE)
#endif
- ", built with rDSN (" DSN_GIT_COMMIT ")"
", built by gcc " STR(__GNUC__) "." STR(__GNUC_MINOR__) "." STR(__GNUC_PATCHLEVEL__)
#if defined(DSN_BUILD_HOSTNAME)
", built on " STR(DSN_BUILD_HOSTNAME)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pegasus.apache.org
For additional commands, e-mail: commits-help@pegasus.apache.org
[incubator-pegasus] 02/02: Release pegasus 2.1.0-RC2
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wutao pushed a commit to branch v2.1
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
commit e5125902a4a33c2c9976f2563aee3e6f1f2e430a
Author: neverchanje <wu...@gmail.com>
AuthorDate: Sat Sep 19 10:34:21 2020 +0800
Release pegasus 2.1.0-RC2
---
rdsn | 2 +-
src/include/pegasus/version.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rdsn b/rdsn
index 2158aeb..0bd8f36 160000
--- a/rdsn
+++ b/rdsn
@@ -1 +1 @@
-Subproject commit 2158aeb5022a9881c18bbad3addd02c68eb93323
+Subproject commit 0bd8f3685d99dbe4bfc0ee0f70776cb0a43e33aa
diff --git a/src/include/pegasus/version.h b/src/include/pegasus/version.h
index d2814e0..037695d 100644
--- a/src/include/pegasus/version.h
+++ b/src/include/pegasus/version.h
@@ -3,4 +3,4 @@
// can be found in the LICENSE file in the root directory of this source tree.
#pragma once
-#define PEGASUS_VERSION "2.1.0-RC1"
+#define PEGASUS_VERSION "2.1.0-RC2"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pegasus.apache.org
For additional commands, e-mail: commits-help@pegasus.apache.org