Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zzha zzha
OpenXG-RAN
Commits
560170a0
Commit
560170a0
authored
Aug 29, 2016
by
Navid Nikaein
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update cmakefile to support split messages and scripts to manage the protobuf
parent
349f77ab
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
85 additions
and
0 deletions
+85
-0
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+53
-0
cmake_targets/tools/build_helper
cmake_targets/tools/build_helper
+32
-0
No files found.
cmake_targets/CMakeLists.txt
View file @
560170a0
...
@@ -635,6 +635,9 @@ add_boolean_option(MESSAGE_CHART_GENERATOR_PHY False "trace some PHY exchang
...
@@ -635,6 +635,9 @@ add_boolean_option(MESSAGE_CHART_GENERATOR_PHY False "trace some PHY exchang
add_boolean_option
(
ENB_AGENT True
"enable eNB agent to inteface with a SDN contrller"
)
add_boolean_option
(
ENB_AGENT True
"enable eNB agent to inteface with a SDN contrller"
)
# temporary FLAG
add_boolean_option
(
PDCP_SPLIT True
"enable PDCP split"
)
########################
########################
# Include order
# Include order
##########################
##########################
...
@@ -849,6 +852,56 @@ include_directories("${OPENAIR_DIR}")
...
@@ -849,6 +852,56 @@ include_directories("${OPENAIR_DIR}")
# Utilities Library
# Utilities Library
################
################
if
(
PDCP_SPLIT
)
# set the version of protobuf messages, V3 not supported yet
add_list1_option
(
FSPT_VERSION V2
"PRPT MSG protobuf grammar version"
V2 V3
)
if
(
${
FSPT_VERSION
}
STREQUAL
"V2"
)
set
(
FSPTDIR V2
)
elseif
(
${
FSPT_VERSION
}
STREQUAL
"V3"
)
set
(
FSPTDIR V3
)
endif
(
${
FSPT_VERSION
}
STREQUAL
"V2"
)
set
(
FSPT_MSG_DIR
${
OPENAIR_DIR
}
/targets/COMMON/MESSAGES/
${
FSPTDIR
}
)
set
(
FSPT_MSG_FILES
${
FSPT_MSG_DIR
}
/header.proto
${
FSPT_MSG_DIR
}
/flexsplit.proto
)
set
(
FSPT_C_DIR
${
protobuf_generated_dir
}
/
${
FSPTDIR
}
)
message
(
"calling protoc_call=
${
protoc_call
}
FSPT_C_DIR=
${
FSPT_C_DIR
}
FSPT_MSG_FILES=
${
FSPT_MSG_FILES
}
"
)
execute_process
(
COMMAND
${
protoc_call
}
${
FSPT_C_DIR
}
${
FSPT_MSG_DIR
}
${
FSPT_MSG_FILES
}
)
file
(
GLOB PRPT_source
${
FSPT_C_DIR
}
/*.c
)
set
(
FSPT_OAI_generated
${
FSPT_C_DIR
}
/header.pb-c.c
${
FSPT_C_DIR
}
/flexsplit.pb-c.c
)
file
(
GLOB fspt_h
${
FSPT_C_DIR
}
/*.h
)
set
(
fspt_h
${
fspt_h
}
)
add_library
(
FSPT_MSG
${
FSPT_OAI_generated
}
${
FSPT_source
}
)
set
(
FSPT_MSG_LIB FSPT_MSG
)
message
(
"fspt c dir is :
${
FSPT_C_DIR
}
"
)
include_directories
(
${
FSPT_C_DIR
}
)
add_library
(
ASYNC_IF
${
OPENAIR2_DIR
}
/UTIL/ASYNC_IF/socket_link.c
${
OPENAIR2_DIR
}
/UTIL/ASYNC_IF/link_manager.c
${
OPENAIR2_DIR
}
/UTIL/ASYNC_IF/message_queue.c
${
OPENAIR2_DIR
}
/UTIL/ASYNC_IF/ringbuffer_queue.c
)
set
(
ASYNC_IF_LIB ASYNC_IF
)
include_directories
(
${
OPENAIR2_DIR
}
/UTIL/ASYNC_IF
)
set
(
PROTOBUF_LIB
"protobuf-c"
)
#set(PROTOBUF_LIB "protobuf") #for Cpp
endif
()
add_library
(
HASHTABLE
add_library
(
HASHTABLE
${
OPENAIR_DIR
}
/common/utils/collection/hashtable/hashtable.c
${
OPENAIR_DIR
}
/common/utils/collection/hashtable/hashtable.c
${
OPENAIR_DIR
}
/common/utils/collection/hashtable/obj_hashtable.c
${
OPENAIR_DIR
}
/common/utils/collection/hashtable/obj_hashtable.c
...
...
cmake_targets/tools/build_helper
View file @
560170a0
...
@@ -221,6 +221,35 @@ install_gnutls_from_source(){
...
@@ -221,6 +221,35 @@ install_gnutls_from_source(){
)>& $gnutls_install_log
)>& $gnutls_install_log
}
}
install_protobuf_from_source(){
cd /tmp
echo "Downloading protobuf"
rm -rf /tmp/protobuf-2.6.1.tar.gz* /tmp/protobuf-2.6.1
wget https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz
tar -xzvf protobuf-2.6.1.tar.gz
cd protobuf-2.6.1/
./configure
echo "Compiling protobuf"
make -j`nproc`
$SUDO make install
rm -rf /tmp/protobuf-2.6.1.tar.gz /tmp/protobuf-2.6.1
$SUDO ldconfig
}
install_protobuf_c_from_source(){
cd /tmp
echo "Downloading protobuf-c"
rm -rf /tmp/protobuf-c
git clone https://github.com/protobuf-c/protobuf-c.git
cd protobuf-c
./autogen.sh
./configure
echo "Compiling protobuf-c"
make -j`nproc`
$SUDO make install
rm -rf /tmp/protobuf-c
$SUDO ldconfig
}
check_install_usrp_uhd_driver(){
check_install_usrp_uhd_driver(){
...
@@ -392,6 +421,9 @@ check_install_oai_software() {
...
@@ -392,6 +421,9 @@ check_install_oai_software() {
install_gnutls_from_source
install_gnutls_from_source
install_asn1c_from_source
install_asn1c_from_source
install_protobuf_from_source
install_protobuf_c_from_source
}
}
install_asn1c_from_source(){
install_asn1c_from_source(){
...
...
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