prpl/prplMesh
1
0
Fork 0
mirror of https://gitlab.com/prpl-foundation/prplmesh/prplMesh.git synced 2025-12-20 01:21:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

prplmesh: ci: addapt the generation of documentation

Browse Source 
Since the odl file are generated at build time we need to wait
build finish and start generate documentation.

Signed-off-by: Marouan MCHARFI <marouan.mcharfi_ext@softathome.com>
This commit is contained in:
Marouan MCHARFI
2022-12-07 18:52:03 +01:00
parent 0353e20445
commit be8089fdd8
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci.yml
View File

@@ -148,6 +148,8 @@ nbapi-docgen:
paths: paths:
- build/html - build/html
when: always when: always
needs:
- job: build-in-docker
# Updates gitlab pages with the NBAPI documentation: # Updates gitlab pages with the NBAPI documentation:
# https://prpl-foundation.gitlab.io/prplmesh/prplMesh/ # https://prpl-foundation.gitlab.io/prplmesh/prplMesh/
@@ -211,6 +213,7 @@ clang-format:
artifacts: artifacts:
paths: paths:
- build/install - build/install
- build/controller
pytest: pytest:
extends: .build-in-docker extends: .build-in-docker

2
CMakeLists.txt
View File

@@ -9,7 +9,7 @@ if(NOT DEFINED TARGET_PLATFORM)
set(TARGET_PLATFORM "linux") set(TARGET_PLATFORM "linux")
endif() endif()
set (CONTROLLER_ROOT_DM "Device.WiFi.DataModel") set (CONTROLLER_ROOT_DM "Device.WiFi.DataElements")
string(REPLACE "." "\\." CONTROLLER_ROOT_DM_literal ${CONTROLLER_ROOT_DM}) string(REPLACE "." "\\." CONTROLLER_ROOT_DM_literal ${CONTROLLER_ROOT_DM})
set(CONTROLLER_ROOT_DM_Header "") set(CONTROLLER_ROOT_DM_Header "")

2
tools/nbapi-docgen/parse_api.sh
View File

@@ -6,7 +6,7 @@ rootdir="${scriptdir%/*/*}"
[ -z "$VERSION" ] && VERSION="custom-$(date -Iminutes)" [ -z "$VERSION" ] && VERSION="custom-$(date -Iminutes)"
mkdir -p "${rootdir}/build" && pushd "${rootdir}/build" || exit 1 mkdir -p "${rootdir}/build" && pushd "${rootdir}/build" || exit 1
amxo-cg -G xml "${rootdir}/controller/nbapi/odl/controller.odl.in" amxo-cg -G xml "${rootdir}/build/controller/nbapi/odl/controller.odl"
popd || exit 1 popd || exit 1
if [ ! -r "${rootdir}/build/controller.odl.xml" ]; then if [ ! -r "${rootdir}/build/controller.odl.xml" ]; then
echo -e "\\033[1;31mXML generation failed -- ODL syntax issue?\\033[0m" echo -e "\\033[1;31mXML generation failed -- ODL syntax issue?\\033[0m"

4
version Executable file
View File

@@ -0,0 +1,4 @@
prplmesh_version=@prplmesh_VERSION@
prplmesh_revision=@PRPLMESH_REVISION@
prplmesh_build_date=@BUILD_DATE@