Skip to content

Commit

Permalink
Remove all code related to FAST CDR v1 (#882)
Browse files Browse the repository at this point in the history
* Refs #21325: fastcdr/config.h is generated with version 2

Signed-off-by: eduponz <[email protected]>

* Refs #21325: Define FASTDDS_DOCS_BUILD when calling swig CLI

Signed-off-by: eduponz <[email protected]>

* Refs #21325: Apply Ricardo's suggestion

Signed-off-by: eduponz <[email protected]>

---------

Signed-off-by: eduponz <[email protected]>
  • Loading branch information
EduPonz authored Jul 24, 2024
1 parent 93305ed commit f97bc61
Showing 1 changed file with 16 additions and 14 deletions.
30 changes: 16 additions & 14 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -279,10 +279,6 @@ def configure_doxyfile(
os.makedirs(os.path.dirname(output_dir), exist_ok=True)
os.makedirs(os.path.dirname(doxygen_html), exist_ok=True)

os.makedirs("{}/include/fastcdr".format(fastdds_repo_name), exist_ok=True)
with open("{}/include/fastcdr/config.h".format(fastdds_repo_name), "w") as config_file:
config_file.write("#define FASTCDR_VERSION_MAJOR 1")

# Configure Doxyfile
configure_doxyfile(
doxyfile_in,
Expand All @@ -299,16 +295,22 @@ def configure_doxyfile(
sys.exit(doxygen_ret)

# Generate SWIG code.
swig_ret = subprocess.call('swig -python -doxygen -I{}/include \
-outdir {}/fastdds_python/src/swig -c++ -interface \
_fastdds_python -o \
{}/fastdds_python/src/swig/fastddsPYTHON_wrap.cxx \
{}/fastdds_python/src/swig/fastdds.i'.format(
fastdds_repo_name,
fastdds_python_repo_name,
fastdds_python_repo_name,
fastdds_python_repo_name
), shell=True)
swig_ret = subprocess.call('swig \
-python \
-doxygen \
-I{}/include \
-DFASTDDS_DOCS_BUILD \
-outdir {}/fastdds_python/src/swig \
-c++ \
-interface _fastdds_python \
-o {}/fastdds_python/src/swig/fastddsPYTHON_wrap.cxx \
{}/fastdds_python/src/swig/fastdds.i'.format(
fastdds_repo_name,
fastdds_python_repo_name,
fastdds_python_repo_name,
fastdds_python_repo_name
), shell=True)

if swig_ret != 0:
print('SWIG failed with return code {}'.format(swig_ret))
sys.exit(swig_ret)
Expand Down

0 comments on commit f97bc61

Please sign in to comment.