Skip to content

Commit f97bc61

Browse files
authored
Remove all code related to FAST CDR v1 (#882)
* Refs #21325: fastcdr/config.h is generated with version 2 Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21325: Define FASTDDS_DOCS_BUILD when calling swig CLI Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21325: Apply Ricardo's suggestion Signed-off-by: eduponz <eduardoponz@eprosima.com> --------- Signed-off-by: eduponz <eduardoponz@eprosima.com>
1 parent 93305ed commit f97bc61

1 file changed

Lines changed: 16 additions & 14 deletions

File tree

docs/conf.py

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -279,10 +279,6 @@ def configure_doxyfile(
279279
os.makedirs(os.path.dirname(output_dir), exist_ok=True)
280280
os.makedirs(os.path.dirname(doxygen_html), exist_ok=True)
281281

282-
os.makedirs("{}/include/fastcdr".format(fastdds_repo_name), exist_ok=True)
283-
with open("{}/include/fastcdr/config.h".format(fastdds_repo_name), "w") as config_file:
284-
config_file.write("#define FASTCDR_VERSION_MAJOR 1")
285-
286282
# Configure Doxyfile
287283
configure_doxyfile(
288284
doxyfile_in,
@@ -299,16 +295,22 @@ def configure_doxyfile(
299295
sys.exit(doxygen_ret)
300296

301297
# Generate SWIG code.
302-
swig_ret = subprocess.call('swig -python -doxygen -I{}/include \
303-
-outdir {}/fastdds_python/src/swig -c++ -interface \
304-
_fastdds_python -o \
305-
{}/fastdds_python/src/swig/fastddsPYTHON_wrap.cxx \
306-
{}/fastdds_python/src/swig/fastdds.i'.format(
307-
fastdds_repo_name,
308-
fastdds_python_repo_name,
309-
fastdds_python_repo_name,
310-
fastdds_python_repo_name
311-
), shell=True)
298+
swig_ret = subprocess.call('swig \
299+
-python \
300+
-doxygen \
301+
-I{}/include \
302+
-DFASTDDS_DOCS_BUILD \
303+
-outdir {}/fastdds_python/src/swig \
304+
-c++ \
305+
-interface _fastdds_python \
306+
-o {}/fastdds_python/src/swig/fastddsPYTHON_wrap.cxx \
307+
{}/fastdds_python/src/swig/fastdds.i'.format(
308+
fastdds_repo_name,
309+
fastdds_python_repo_name,
310+
fastdds_python_repo_name,
311+
fastdds_python_repo_name
312+
), shell=True)
313+
312314
if swig_ret != 0:
313315
print('SWIG failed with return code {}'.format(swig_ret))
314316
sys.exit(swig_ret)

0 commit comments

Comments
 (0)