Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
lizhongxiao
OpenXG UE
Commits
4294a156
Commit
4294a156
authored
Jan 24, 2022
by
Laurent THOMAS
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove separate dir from phy_simulators binaries and compile options
parent
e7b3bbd4
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
15 additions
and
39 deletions
+15
-39
ci-scripts/cls_physim.py
ci-scripts/cls_physim.py
+1
-1
cmake_targets/build_oai
cmake_targets/build_oai
+7
-10
cmake_targets/install_external_packages.ubuntu20
cmake_targets/install_external_packages.ubuntu20
+0
-1
cmake_targets/phy_simulators
cmake_targets/phy_simulators
+1
-0
cmake_targets/phy_simulators/CMakeLists.txt
cmake_targets/phy_simulators/CMakeLists.txt
+0
-21
cmake_targets/tools/build_helper
cmake_targets/tools/build_helper
+1
-1
doc/BUILD.md
doc/BUILD.md
+1
-1
docker/Dockerfile.phySim.rhel8.2
docker/Dockerfile.phySim.rhel8.2
+4
-4
No files found.
ci-scripts/cls_physim.py
View file @
4294a156
...
...
@@ -183,7 +183,7 @@ class PhySim:
mySSH
.
open
(
self
.
eNBIpAddr
,
self
.
eNBUserName
,
self
.
eNBPassWord
)
mySSH
.
command
(
'cd '
+
self
.
__workSpacePath
,
'\$'
,
5
)
#run and redirect the results to a log file
mySSH
.
command
(
self
.
__workSpacePath
+
'
phy_simulators
/build/ldpctest '
+
self
.
runargs
+
' >> '
+
self
.
__runLogFile
,
'\$'
,
30
)
mySSH
.
command
(
self
.
__workSpacePath
+
'
ran_build
/build/ldpctest '
+
self
.
runargs
+
' >> '
+
self
.
__runLogFile
,
'\$'
,
30
)
mySSH
.
close
()
#return updated HTML to main
lHTML
=
html
.
HTMLManagement
()
...
...
cmake_targets/build_oai
View file @
4294a156
...
...
@@ -57,7 +57,7 @@ BUILD_DOXYGEN=0
BUILD_COVERITY_SCAN
=
0
T_TRACER
=
"True"
DISABLE_HARDWARE_DEPENDENCY
=
"False"
CMAKE_BUILD_TYPE
=
""
CMAKE_BUILD_TYPE
=
"
RelWithDebInfo
"
CMAKE_CMD
=
"
$CMAKE
"
UE_AUTOTEST_TRACE
=
"False"
UE_DEBUG_TRACE
=
"False"
...
...
@@ -585,15 +585,12 @@ function main() {
echo_info
"3. building the compilation directives ..."
DIR
=
$OPENAIR_DIR
/cmake_targets
if
[
"
$SIMUS_PHY
"
=
"1"
-o
"
$SIMUS_CORE
"
=
"1"
]
;
then
build_dir
=
phy_simulators
else
if
[
"
$T_TRACER
"
=
"False"
]
;
then
build_dir
=
ran_build_noLOG
else
build_dir
=
ran_build
fi
fi
[
"
$CLEAN
"
=
"1"
]
&&
rm
-rf
$DIR
/
$build_dir
/build
mkdir
-p
$DIR
/
$build_dir
/build
...
...
@@ -742,11 +739,11 @@ function main() {
# simlist="ldpctest"
for
f
in
$simlist
;
do
compilations
\
phy_simulators
$f
\
ran_build
$f
\
$f
$dbin
/
$f
.
$REL
done
compilations
\
phy_simulators
coding
\
ran_build
coding
\
libcoding.so
$dbin
/libcoding.so
# compilations \
# lte-simulators $config_libconfig_shlib \
...
...
@@ -761,7 +758,7 @@ function main() {
simlist
=
"secu_knas_encrypt_eia1 secu_kenb aes128_ctr_encrypt aes128_ctr_decrypt secu_knas_encrypt_eea2 secu_knas secu_knas_encrypt_eea1 kdf aes128_cmac_encrypt secu_knas_encrypt_eia2"
for
f
in
$simlist
;
do
compilations
\
phy_simulators
test_
$f
\
ran_build
test_
$f
\
test_
$f
$dbin
/test_
$f
.
$REL
done
fi
...
...
cmake_targets/install_external_packages.ubuntu20
View file @
4294a156
...
...
@@ -134,7 +134,6 @@ clean_all_files() {
rm
-rf
"
$dir
"
/ran_build/build
rm
-rf
"
$dir
"
/ran_build_noLOG/build
rm
-rf
"
$dir
"
/lte-simulators/build
rm
-rf
"
$dir
"
/phy_simulators/build
rm
-rf
"
$dir
"
/nas_sim_tools/build
rm
-rf
"
$dir
"
/oaisim_build_oai/build
rm
-rf
"
$dir
"
/oaisim_build_oai/CMakeLists.txt
...
...
cmake_targets/phy_simulators
0 → 120000
View file @
4294a156
ran_build/
\ No newline at end of file
cmake_targets/phy_simulators/CMakeLists.txt
deleted
100755 → 0
View file @
e7b3bbd4
cmake_minimum_required
(
VERSION 2.8
)
project
(
OpenAirInterface
)
set
(
CMAKE_BUILD_TYPE
)
set
(
CFLAGS_PROCESSOR_USER
""
)
set
(
UE_EXPANSION False
)
set
(
PRE_SCD_THREAD False
)
set
(
ENABLE_VCD_FIFO False
)
set
(
RF_BOARD
"None"
)
set
(
TRANSP_PRO
"None"
)
set
(
PACKAGE_NAME
""
)
set
(
DEADLINE_SCHEDULER
"False"
)
set
(
CPU_AFFINITY
"False"
)
set
(
T_TRACER True
)
set
(
UE_AUTOTEST_TRACE False
)
set
(
UE_DEBUG_TRACE False
)
set
(
UE_TIMING_TRACE False
)
set
(
USRP_REC_PLAY False
)
set
(
SKIP_SHARED_LIB_FLAG False
)
set
(
PHYSIM True
)
set
(
RU 0
)
include
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/../CMakeLists.txt
)
cmake_targets/tools/build_helper
View file @
4294a156
...
...
@@ -168,7 +168,7 @@ clean_all_files() {
rm -rf $dir/log $OPENAIR_DIR/targets/bin/*
rm -rf $dir/ran_build $dir/ran_build_noLOG
rm -rf $dir/lte-simulators/build
rm -rf $dir/
phy_simulators/build $dir/
nas_sim_tools/build
rm -rf $dir/nas_sim_tools/build
rm -rf $dir/oaisim_build_oai/build $dir/oaisim_build_oai/CMakeLists.txt
rm -rf $dir/autotests/bin $dir/autotests/log $dir/autotests/*/build
}
...
...
doc/BUILD.md
View file @
4294a156
...
...
@@ -60,7 +60,7 @@ cd cmake_targets/
./build_oai -I --phy_simulators
```
After completing the build, the binaries are available in the cmake_targets/
phy_simulators
/build directory.
After completing the build, the binaries are available in the cmake_targets/
ran_build
/build directory.
A copy is also available in the target/bin directory, with all binaries suffixed by the 3GPP release number, today
**.Rel15**
.
...
...
docker/Dockerfile.phySim.rhel8.2
View file @
4294a156
...
...
@@ -85,10 +85,10 @@ COPY --from=phy-sim-build \
/lib64/liblapack.so.3 \
/lib64/libexslt.so.0 \
/lib64/libxslt.so.1 \
/oai-ran/cmake_targets/
phy_simulators
/build/libdfts.so \
/oai-ran/cmake_targets/
phy_simulators
/build/libSIMU.so \
/oai-ran/cmake_targets/
phy_simulators
/build/libldpc.so \
/oai-ran/cmake_targets/
phy_simulators
/build/libldpc_orig.so \
/oai-ran/cmake_targets/
ran_build
/build/libdfts.so \
/oai-ran/cmake_targets/
ran_build
/build/libSIMU.so \
/oai-ran/cmake_targets/
ran_build
/build/libldpc.so \
/oai-ran/cmake_targets/
ran_build
/build/libldpc_orig.so \
/usr/local/lib/
RUN ldconfig
...
...
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