Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[21325] Remove all code related to FAST CDR v1 #882

Merged
merged 3 commits into from
Jul 24, 2024
Merged

[21325] Remove all code related to FAST CDR v1 #882

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6086a26
Refs #21325: fastcdr/config.h is generated with version 2
EduPonz Jul 18, 2024
620bd30
Refs #21325: Define FASTDDS_DOCS_BUILD when calling swig CLI
EduPonz Jul 20, 2024
b55f398
Refs #21325: Apply Ricardo's suggestion
EduPonz Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions docs/conf.py
View file
Open in desktop
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
Loading