Commit d07044de authored by Robert Schmidt's avatar Robert Schmidt

Merge remote-tracking branch 'origin/websrv-small-regression' into integration_2024_w42 (!2997)

parents eafca88d a6576db5
...@@ -62,7 +62,7 @@ add_library(websrv MODULE ...@@ -62,7 +62,7 @@ add_library(websrv MODULE
websrv_utils.c websrv_utils.c
../../../openair1/PHY/TOOLS/nr_phy_scope.c ../../../openair1/PHY/TOOLS/nr_phy_scope.c
) )
target_link_libraries(websrv PRIVATE ulfius jansson) target_link_libraries(websrv PRIVATE ulfius jansson asn1_nr_rrc_hdrs)
target_compile_definitions(websrv PUBLIC WEBSRVSCOPE) target_compile_definitions(websrv PUBLIC WEBSRVSCOPE)
# put websrv into build root and not under build/common/utils/websrv/ # put websrv into build root and not under build/common/utils/websrv/
set_target_properties(websrv PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../../..) set_target_properties(websrv PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../../..)
......
...@@ -38,6 +38,20 @@ $ sudo dnf install -y jansson-devel npm curl wget ...@@ -38,6 +38,20 @@ $ sudo dnf install -y jansson-devel npm curl wget
ulfius has to be installed as explained [here](https://github.com/babelouest/ulfius/blob/master/INSTALL.md#pre-compiled-packages). ulfius has to be installed as explained [here](https://github.com/babelouest/ulfius/blob/master/INSTALL.md#pre-compiled-packages).
## Install from source if needed
```bash
sudo dnf install -y jansson-devel npm curl wget libmicrohttpd-devel curl curlpp-devel systemd-devel
git clone https://github.com/babelouest/orcania.git
cd orcania; mkdir build; cd build; cmake ..; sudo make install
cd
git clone https://github.com/babelouest/yder.git
cd yder ; mkdir build; cd build; cmake ..; sudo make install
git clone https://github.com/babelouest/ulfius.git
cd ulfius
mkdir build; cd build; cmake ..; sudo make install
```
## Additional dependencies for the frontend ## Additional dependencies for the frontend
Currently the web server frontend can run with nodejs 18, you can check the Currently the web server frontend can run with nodejs 18, you can check the
...@@ -54,6 +68,16 @@ beyond this doc. ...@@ -54,6 +68,16 @@ beyond this doc.
For example, to install a specific nodeJS version, you can run the below For example, to install a specific nodeJS version, you can run the below
command, with the typical output printed below for your convenience: command, with the typical output printed below for your convenience:
install method by nvm
```bash
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash
source ~/.bashrc
nvm install 18
nvm use 18
```
install by apt-get
```bash ```bash
$ curl -s https://deb.nodesource.com/setup_18.x | sudo bash $ curl -s https://deb.nodesource.com/setup_18.x | sudo bash
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment