Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
B
brpc
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
brpc
Commits
6a2be8b0
Commit
6a2be8b0
authored
Dec 05, 2019
by
zhujiashun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix_missing_brpc_version_in_release
parent
30ff183a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
2 deletions
+11
-2
CMakeLists.txt
CMakeLists.txt
+1
-1
Makefile
Makefile
+1
-1
get_brpc_version.sh
tools/get_brpc_version.sh
+9
-0
No files found.
CMakeLists.txt
View file @
6a2be8b0
...
...
@@ -91,7 +91,7 @@ include_directories(
)
execute_process
(
COMMAND bash -c
"
git rev-parse --short HEAD
| tr -d '
\n
'"
COMMAND bash -c
"
bash
${
PROJECT_SOURCE_DIR
}
/tools/get_brpc_version.sh
${
PROJECT_SOURCE_DIR
}
| tr -d '
\n
'"
OUTPUT_VARIABLE BRPC_REVISION
)
...
...
Makefile
View file @
6a2be8b0
...
...
@@ -23,7 +23,7 @@ include config.mk
# 2. Added -D__const__= : Avoid over-optimizations of TLS variables by GCC>=4.8
# 3. Removed -Werror: Not block compilation for non-vital warnings, especially when the
# code is tested on newer systems. If the code is used in production, add -Werror back
CPPFLAGS
+=
-DBTHREAD_USE_FAST_PTHREAD_MUTEX
-D__const__
=
-D_GNU_SOURCE
-DUSE_SYMBOLIZE
-DNO_TCMALLOC
-D__STDC_FORMAT_MACROS
-D__STDC_LIMIT_MACROS
-D__STDC_CONSTANT_MACROS
-DNDEBUG
-DBRPC_REVISION
=
\"
$(
shell
git rev-parse
--short
HEAD
)
\"
CPPFLAGS
+=
-DBTHREAD_USE_FAST_PTHREAD_MUTEX
-D__const__
=
-D_GNU_SOURCE
-DUSE_SYMBOLIZE
-DNO_TCMALLOC
-D__STDC_FORMAT_MACROS
-D__STDC_LIMIT_MACROS
-D__STDC_CONSTANT_MACROS
-DNDEBUG
-DBRPC_REVISION
=
\"
$(
shell
bash tools/get_brpc_version.sh .
)
\"
CXXFLAGS
=
$(CPPFLAGS)
-O2
-pipe
-Wall
-W
-fPIC
-fstrict-aliasing
-Wno-invalid-offsetof
-Wno-unused-parameter
-fno-omit-frame-pointer
-std
=
c++0x
CFLAGS
=
$(CPPFLAGS)
-O2
-pipe
-Wall
-W
-fPIC
-fstrict-aliasing
-Wno-unused-parameter
-fno-omit-frame-pointer
DEBUG_CXXFLAGS
=
$
(
filter-out
-DNDEBUG
,
$(CXXFLAGS)
)
-DUNIT_TEST
-DBVAR_NOT_LINK_DEFAULT_VARIABLES
...
...
tools/get_brpc_version.sh
0 → 100644
View file @
6a2be8b0
#!/bin/bash
v
=
$(
git rev-parse
--short
HEAD 2> /dev/null
)
if
[
$?
-eq
0
]
then
echo
$v
else
cat
$1
/RELEASE_VERSION
fi
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment