From 0888aa9f4d3886b6b0b550bc4375f5aad3411cea Mon Sep 17 00:00:00 2001
From: Gabriel Ferreira <gabrielcarvfer@gmail.com>
Date: Wed, 26 Jan 2022 21:25:15 -0300
Subject: [PATCH] CI: use ns3 for the doxygen job

---
 doc/doxygen.warnings.report.sh | 20 ++++++++++----------
 utils/tests/gitlab-ci-doc.yml  |  6 ++----
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/doc/doxygen.warnings.report.sh b/doc/doxygen.warnings.report.sh
index 63772ef4c..8c429036e 100755
--- a/doc/doxygen.warnings.report.sh
+++ b/doc/doxygen.warnings.report.sh
@@ -65,7 +65,7 @@ function usage
     report all undocumented elements, and to reduce the run time.
     The output of this special run is kept in doc/$WARNINGSLOGFILE.
     To further reduce the run time, the -i option also skips
-    print-introspected-doxygen, so waf doesn\'t have to compile
+    print-introspected-doxygen, so ns3 doesn\'t have to compile
     any modified files at all.
 
     The -f, -l, and -s options skip the doxygen run altogether.
@@ -338,18 +338,18 @@ EOF
 
     intro_h="introspected-doxygen.h"
     if [ $skip_intro -eq 1 ]; then
-        verbose "" "Skipping ./waf build"
+        verbose "" "Skipping ./ns3 build"
         verbose -n "Trying print-introspected-doxygen with doxygen build"
-        (cd "$ROOT" && ./waf --run-no-build print-introspected-doxygen >doc/$intro_h 2>&6 )
-        status_report $? "./waf --run print-introspected-doxygen" noexit
+        (cd "$ROOT" && ./ns3 run print-introspected-doxygen --no-build >doc/$intro_h 2>&6 )
+        status_report $? "./ns3 run print-introspected-doxygen" noexit
     else
         # Run introspection, which may require a build
         verbose -n "Building"
-        (cd "$ROOT" && ./waf build >&6 2>&6 )
-        status_report $? "./waf build"
+        (cd "$ROOT" && ./ns3 build >&6 2>&6 )
+        status_report $? "./ns3 build"
         verbose -n "Running print-introspected-doxygen with doxygen build"
-        (cd "$ROOT" && ./waf --run-no-build print-introspected-doxygen >doc/$intro_h 2>&6 )
-        status_report $? "./waf --run print-introspected-doxygen"
+        (cd "$ROOT" && ./ns3 run print-introspected-doxygen --no-build >doc/$intro_h 2>&6 )
+        status_report $? "./ns3 run print-introspected-doxygen"
     fi
 
     # Waf insists on writing cruft to stdout
@@ -357,8 +357,8 @@ EOF
     rm doc/$intro_h.bak
 
     verbose -n "Rebuilding doxygen docs with full errors"
-    (cd "$ROOT" && ./waf --doxygen-no-build >&6 2>&6 )
-    status_report $? "./waf --doxygen-no-build"
+    (cd "$ROOT" && ./ns3 docs doxygen-no-build >&6 2>&6 )
+    status_report $? "./ns3 docs doxygen-no-build"
 
     # Swap back to original config
     rm -f $conf
diff --git a/utils/tests/gitlab-ci-doc.yml b/utils/tests/gitlab-ci-doc.yml
index 8096d1a9a..c30567da0 100644
--- a/utils/tests/gitlab-ci-doc.yml
+++ b/utils/tests/gitlab-ci-doc.yml
@@ -23,10 +23,8 @@ doxygen:
     - mkdir -p $CCACHE_BASEDIR_VALUE
     - export CCACHE_BASEDIR=${PWD}
     - export CCACHE_DIR=${PWD}/$CCACHE_BASEDIR_VALUE
-    - CXX="ccache $COMPILER" ./waf configure --enable-examples --enable-tests --enable-asserts -d release
-    - ./waf
-#    - ./ns3 configure -d release -GNinja --enable-examples --enable-tests --enable-asserts
-#    - ./ns3 build
+    - CXX=$COMPILER ./ns3 configure --enable-examples --enable-tests --enable-asserts -d release
+    - ./ns3 build
 #    - mkdir -p public/doxygen
     - git remote add ns-3-origin https://gitlab.com/nsnam/ns-3-dev.git || true
     - git fetch ns-3-origin