From da78237ed9fa2b9cd91005e2f601ddb2abfb7ec5 Mon Sep 17 00:00:00 2001 From: Nicholas Bianco Date: Fri, 16 Jun 2023 11:52:28 -0700 Subject: [PATCH 01/13] Add SWIG_DIR to CI scripts --- .github/workflows/continuous_integration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 668a6e55f6..6ccd111260 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -75,7 +75,7 @@ jobs: # TODO: Can remove /WX when we use that in CMakeLists.txt. # Set the CXXFLAGS environment variable to turn warnings into errors. # Skip timing test section included by default. - cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 + cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DSWIG_DIR=C:\ProgramData\chocolatey\lib\swig $env:match = cmake -L . | Select-String -Pattern OPENSIM_QUALIFIED_VERSION $version = $env:match.split('=')[1] echo $version @@ -210,7 +210,7 @@ jobs: # TODO: Can remove /WX when we use that in CMakeLists.txt. # Set the CXXFLAGS environment variable to turn warnings into errors. # Skip timing test section included by default. - cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 + cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DSWIG_DIR=C:\ProgramData\chocolatey\lib\swig $env:match = cmake -L . | Select-String -Pattern OPENSIM_QUALIFIED_VERSION $version = $env:match.split('=')[1] echo $version From 7cb2f231a48281a4afc07279aac36713b56403fd Mon Sep 17 00:00:00 2001 From: Nicholas Bianco Date: Fri, 16 Jun 2023 12:06:26 -0700 Subject: [PATCH 02/13] Point to the SWIG executable instead --- .github/workflows/continuous_integration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 6ccd111260..6ea52600b0 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -75,7 +75,7 @@ jobs: # TODO: Can remove /WX when we use that in CMakeLists.txt. # Set the CXXFLAGS environment variable to turn warnings into errors. # Skip timing test section included by default. - cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DSWIG_DIR=C:\ProgramData\chocolatey\lib\swig + cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DSWIG_EXECUTABLE=C:\ProgramData\chocolatey\bin\swig.exe $env:match = cmake -L . | Select-String -Pattern OPENSIM_QUALIFIED_VERSION $version = $env:match.split('=')[1] echo $version @@ -210,7 +210,7 @@ jobs: # TODO: Can remove /WX when we use that in CMakeLists.txt. # Set the CXXFLAGS environment variable to turn warnings into errors. # Skip timing test section included by default. - cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DSWIG_DIR=C:\ProgramData\chocolatey\lib\swig + cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DSWIG_EXECUTABLE=C:\ProgramData\chocolatey\bin\swig.exe $env:match = cmake -L . | Select-String -Pattern OPENSIM_QUALIFIED_VERSION $version = $env:match.split('=')[1] echo $version From 29e4abb698994ba39493787a4297c6d0a823993c Mon Sep 17 00:00:00 2001 From: Nicholas Bianco Date: Fri, 16 Jun 2023 13:47:32 -0700 Subject: [PATCH 03/13] Try a different SWIG_DIR --- .github/workflows/continuous_integration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 6ea52600b0..676babfd13 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -75,7 +75,7 @@ jobs: # TODO: Can remove /WX when we use that in CMakeLists.txt. # Set the CXXFLAGS environment variable to turn warnings into errors. # Skip timing test section included by default. - cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DSWIG_EXECUTABLE=C:\ProgramData\chocolatey\bin\swig.exe + cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DSWIG_DIR=C:\ProgramData\chocolatey\lib\swig\tools\install\swigwin-4.0.2 $env:match = cmake -L . | Select-String -Pattern OPENSIM_QUALIFIED_VERSION $version = $env:match.split('=')[1] echo $version @@ -210,7 +210,7 @@ jobs: # TODO: Can remove /WX when we use that in CMakeLists.txt. # Set the CXXFLAGS environment variable to turn warnings into errors. # Skip timing test section included by default. - cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DSWIG_EXECUTABLE=C:\ProgramData\chocolatey\bin\swig.exe + cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DSWIG_DIR=C:\ProgramData\chocolatey\lib\swig\tools\install\swigwin-4.0.2 $env:match = cmake -L . | Select-String -Pattern OPENSIM_QUALIFIED_VERSION $version = $env:match.split('=')[1] echo $version From 28c9ed6c98ed93c779b7653148649689ca7b5e54 Mon Sep 17 00:00:00 2001 From: Nicholas Bianco Date: Fri, 16 Jun 2023 14:03:52 -0700 Subject: [PATCH 04/13] Allow output when install SWIG --- .github/workflows/continuous_integration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 676babfd13..501440dec8 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -40,7 +40,7 @@ jobs: run: python3 -m pip install numpy==1.20.2 - name: Install SWIG - run: choco install swig --version 4.0.2 --yes --limit-output --allow-downgrade + run: choco install swig --version 4.0.2 --yes --allow-downgrade - name: Cache dependencies id: cache-dependencies @@ -175,7 +175,7 @@ jobs: run: python3 -m pip install numpy==1.20.2 - name: Install SWIG - run: choco install swig --version 4.0.2 --yes --limit-output --allow-downgrade + run: choco install swig --version 4.0.2 --yes --allow-downgrade - name: Cache dependencies id: cache-dependencies From 1dd39341f9e63ea741cc58fa743e1ad8dc176ae8 Mon Sep 17 00:00:00 2001 From: Nicholas Bianco Date: Fri, 16 Jun 2023 14:20:39 -0700 Subject: [PATCH 05/13] Set SWIG_DIR and SWIG_EXECUTABLE --- .github/workflows/continuous_integration.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 501440dec8..4f57e38aeb 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -40,7 +40,9 @@ jobs: run: python3 -m pip install numpy==1.20.2 - name: Install SWIG - run: choco install swig --version 4.0.2 --yes --allow-downgrade + run: | + choco install swig --version 4.0.2 --yes --limit-output --allow-downgrade + swig -swiglib - name: Cache dependencies id: cache-dependencies @@ -75,7 +77,7 @@ jobs: # TODO: Can remove /WX when we use that in CMakeLists.txt. # Set the CXXFLAGS environment variable to turn warnings into errors. # Skip timing test section included by default. - cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DSWIG_DIR=C:\ProgramData\chocolatey\lib\swig\tools\install\swigwin-4.0.2 + cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DSWIG_DIR=C:\ProgramData\chocolatey\lib\swig\tools\install\swigwin-4.0.2 -DSWIG_EXECUTABLE=C:\ProgramData\chocolatey\lib\swig\tools\install\swigwin-4.0.2 $env:match = cmake -L . | Select-String -Pattern OPENSIM_QUALIFIED_VERSION $version = $env:match.split('=')[1] echo $version @@ -175,7 +177,9 @@ jobs: run: python3 -m pip install numpy==1.20.2 - name: Install SWIG - run: choco install swig --version 4.0.2 --yes --allow-downgrade + run: | + choco install swig --version 4.0.2 --yes --limit-output --allow-downgrade + swig -swiglib - name: Cache dependencies id: cache-dependencies @@ -210,7 +214,7 @@ jobs: # TODO: Can remove /WX when we use that in CMakeLists.txt. # Set the CXXFLAGS environment variable to turn warnings into errors. # Skip timing test section included by default. - cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DSWIG_DIR=C:\ProgramData\chocolatey\lib\swig\tools\install\swigwin-4.0.2 + cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DSWIG_DIR=C:\ProgramData\chocolatey\lib\swig\tools\install\swigwin-4.0.2 -DSWIG_EXECUTABLE=C:\ProgramData\chocolatey\lib\swig\tools\install\swigwin-4.0.2 $env:match = cmake -L . | Select-String -Pattern OPENSIM_QUALIFIED_VERSION $version = $env:match.split('=')[1] echo $version From f6bc911a99a96d8e1e5ffd5031b905c496146e26 Mon Sep 17 00:00:00 2001 From: Nicholas Bianco Date: Fri, 16 Jun 2023 14:28:33 -0700 Subject: [PATCH 06/13] Point to SWIG \Lib folder --- .github/workflows/continuous_integration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 4f57e38aeb..202f58def9 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -77,7 +77,7 @@ jobs: # TODO: Can remove /WX when we use that in CMakeLists.txt. # Set the CXXFLAGS environment variable to turn warnings into errors. # Skip timing test section included by default. - cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DSWIG_DIR=C:\ProgramData\chocolatey\lib\swig\tools\install\swigwin-4.0.2 -DSWIG_EXECUTABLE=C:\ProgramData\chocolatey\lib\swig\tools\install\swigwin-4.0.2 + cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DSWIG_DIR=C:\ProgramData\Chocolatey\lib\swig\tools\install\Lib -DSWIG_EXECUTABLE=C:\ProgramData\chocolatey\bin\swig.exe $env:match = cmake -L . | Select-String -Pattern OPENSIM_QUALIFIED_VERSION $version = $env:match.split('=')[1] echo $version @@ -214,7 +214,7 @@ jobs: # TODO: Can remove /WX when we use that in CMakeLists.txt. # Set the CXXFLAGS environment variable to turn warnings into errors. # Skip timing test section included by default. - cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DSWIG_DIR=C:\ProgramData\chocolatey\lib\swig\tools\install\swigwin-4.0.2 -DSWIG_EXECUTABLE=C:\ProgramData\chocolatey\lib\swig\tools\install\swigwin-4.0.2 + cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DSWIG_DIR=C:\ProgramData\Chocolatey\lib\swig\tools\install\Lib -DSWIG_EXECUTABLE=C:\ProgramData\chocolatey\bin\swig.exe $env:match = cmake -L . | Select-String -Pattern OPENSIM_QUALIFIED_VERSION $version = $env:match.split('=')[1] echo $version From 9700475eaec02719e32a052acca7f140f447f8af Mon Sep 17 00:00:00 2001 From: Nicholas Bianco Date: Fri, 16 Jun 2023 14:36:25 -0700 Subject: [PATCH 07/13] Set SWIG_LIB variable --- .github/workflows/continuous_integration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 202f58def9..61dc42f6f0 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -77,7 +77,7 @@ jobs: # TODO: Can remove /WX when we use that in CMakeLists.txt. # Set the CXXFLAGS environment variable to turn warnings into errors. # Skip timing test section included by default. - cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DSWIG_DIR=C:\ProgramData\Chocolatey\lib\swig\tools\install\Lib -DSWIG_EXECUTABLE=C:\ProgramData\chocolatey\bin\swig.exe + cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DSWIG_LIB=C:\ProgramData\Chocolatey\lib\swig\tools\install\Lib -DSWIG_DIR=C:\ProgramData\Chocolatey\lib\swig\tools\install\Lib -DSWIG_EXECUTABLE=C:\ProgramData\chocolatey\bin\swig.exe $env:match = cmake -L . | Select-String -Pattern OPENSIM_QUALIFIED_VERSION $version = $env:match.split('=')[1] echo $version @@ -214,7 +214,7 @@ jobs: # TODO: Can remove /WX when we use that in CMakeLists.txt. # Set the CXXFLAGS environment variable to turn warnings into errors. # Skip timing test section included by default. - cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DSWIG_DIR=C:\ProgramData\Chocolatey\lib\swig\tools\install\Lib -DSWIG_EXECUTABLE=C:\ProgramData\chocolatey\bin\swig.exe + cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DSWIG_LIB=C:\ProgramData\Chocolatey\lib\swig\tools\install\Lib -DSWIG_DIR=C:\ProgramData\Chocolatey\lib\swig\tools\install\Lib -DSWIG_EXECUTABLE=C:\ProgramData\chocolatey\bin\swig.exe $env:match = cmake -L . | Select-String -Pattern OPENSIM_QUALIFIED_VERSION $version = $env:match.split('=')[1] echo $version From 41bc4aacad1114afb11e605a4932b98255a8e8fc Mon Sep 17 00:00:00 2001 From: Nicholas Bianco Date: Fri, 16 Jun 2023 14:43:29 -0700 Subject: [PATCH 08/13] Upgrade to SWIG 4.1.1 --- .github/workflows/continuous_integration.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 61dc42f6f0..3041f0a796 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -41,7 +41,7 @@ jobs: - name: Install SWIG run: | - choco install swig --version 4.0.2 --yes --limit-output --allow-downgrade + choco install swig --version 4.1.1 --yes --limit-output --allow-downgrade swig -swiglib - name: Cache dependencies @@ -178,7 +178,7 @@ jobs: - name: Install SWIG run: | - choco install swig --version 4.0.2 --yes --limit-output --allow-downgrade + choco install swig --version 4.1.1 --yes --limit-output --allow-downgrade swig -swiglib - name: Cache dependencies @@ -290,8 +290,8 @@ jobs: # if: steps.cache-swig.outputs.cache-hit != 'true' run: | mkdir ~/swig-source && cd ~/swig-source - wget https://github.com/swig/swig/archive/refs/tags/rel-4.0.2.tar.gz - tar xzf rel-4.0.2.tar.gz && cd swig-rel-4.0.2 + wget https://github.com/swig/swig/archive/refs/tags/rel-4.1.1.tar.gz + tar xzf rel-4.1.1.tar.gz && cd swig-rel-4.1.1 sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache make && make -j4 install @@ -396,8 +396,8 @@ jobs: # if: steps.cache-swig.outputs.cache-hit != 'true' run: | mkdir ~/swig-source && cd ~/swig-source - wget https://github.com/swig/swig/archive/refs/tags/rel-4.0.2.tar.gz - tar xzf rel-4.0.2.tar.gz && cd swig-rel-4.0.2 + wget https://github.com/swig/swig/archive/refs/tags/rel-4.1.1.tar.gz + tar xzf rel-4.1.1.tar.gz && cd swig-rel-4.1.1 sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache make && make -j4 install - name: Cache dependencies @@ -498,8 +498,8 @@ jobs: # if: steps.cache-swig.outputs.cache-hit != 'true' run: | mkdir ~/swig-source && cd ~/swig-source - wget https://github.com/swig/swig/archive/refs/tags/rel-4.0.2.tar.gz - tar xzf rel-4.0.2.tar.gz && cd swig-rel-4.0.2 + wget https://github.com/swig/swig/archive/refs/tags/rel-4.1.1.tar.gz + tar xzf rel-4.1.1.tar.gz && cd swig-rel-4.0.2 sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache make && make -j4 install - name: Cache dependencies From 31c0c50ca0c948e1b64b64b47795d96134d7e55a Mon Sep 17 00:00:00 2001 From: Nicholas Bianco Date: Fri, 16 Jun 2023 14:48:46 -0700 Subject: [PATCH 09/13] Fix mac/linux swig 4.1.1 --- .github/workflows/continuous_integration.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 3041f0a796..dc09d28308 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -290,8 +290,8 @@ jobs: # if: steps.cache-swig.outputs.cache-hit != 'true' run: | mkdir ~/swig-source && cd ~/swig-source - wget https://github.com/swig/swig/archive/refs/tags/rel-4.1.1.tar.gz - tar xzf rel-4.1.1.tar.gz && cd swig-rel-4.1.1 + wget https://github.com/swig/swig/archive/refs/tags/v4.1.1.tar.gz + tar xzf v4.1.1.tar.gz && cd swig-v4.1.1 sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache make && make -j4 install @@ -396,8 +396,8 @@ jobs: # if: steps.cache-swig.outputs.cache-hit != 'true' run: | mkdir ~/swig-source && cd ~/swig-source - wget https://github.com/swig/swig/archive/refs/tags/rel-4.1.1.tar.gz - tar xzf rel-4.1.1.tar.gz && cd swig-rel-4.1.1 + wget https://github.com/swig/swig/archive/refs/tags/v4.1.1.tar.gz + tar xzf v4.1.1.tar.gz && cd swig-v4.1.1 sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache make && make -j4 install - name: Cache dependencies @@ -498,8 +498,8 @@ jobs: # if: steps.cache-swig.outputs.cache-hit != 'true' run: | mkdir ~/swig-source && cd ~/swig-source - wget https://github.com/swig/swig/archive/refs/tags/rel-4.1.1.tar.gz - tar xzf rel-4.1.1.tar.gz && cd swig-rel-4.0.2 + wget https://github.com/swig/swig/archive/refs/tags/v4.1.1.tar.gz + tar xzf v4.1.1.tar.gz && cd swig-v4.1.1 sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache make && make -j4 install - name: Cache dependencies From 52d97b5bd6cfca593424e5823b620f693102fce3 Mon Sep 17 00:00:00 2001 From: Nicholas Bianco Date: Fri, 16 Jun 2023 14:57:48 -0700 Subject: [PATCH 10/13] Still debugging linux swig install --- .github/workflows/continuous_integration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index dc09d28308..74d89472ee 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -291,7 +291,7 @@ jobs: run: | mkdir ~/swig-source && cd ~/swig-source wget https://github.com/swig/swig/archive/refs/tags/v4.1.1.tar.gz - tar xzf v4.1.1.tar.gz && cd swig-v4.1.1 + tar xzf v4.1.1.tar.gz && ls && cd swig-v4.1.1 sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache make && make -j4 install @@ -499,7 +499,7 @@ jobs: run: | mkdir ~/swig-source && cd ~/swig-source wget https://github.com/swig/swig/archive/refs/tags/v4.1.1.tar.gz - tar xzf v4.1.1.tar.gz && cd swig-v4.1.1 + tar xzf v4.1.1.tar.gz && ls && cd swig-v4.1.1 sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache make && make -j4 install - name: Cache dependencies From 11914a44874c85f335f7fc69dd703cf438c359e4 Mon Sep 17 00:00:00 2001 From: Nicholas Bianco Date: Fri, 16 Jun 2023 14:58:25 -0700 Subject: [PATCH 11/13] Comment out windows swig cmake vars --- .github/workflows/continuous_integration.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 74d89472ee..ea54525f6e 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -71,13 +71,14 @@ jobs: - name: Configure opensim-core id: configure + # -DSWIG_LIB=C:\ProgramData\Chocolatey\lib\swig\tools\install\Lib -DSWIG_DIR=C:\ProgramData\Chocolatey\lib\swig\tools\install\Lib -DSWIG_EXECUTABLE=C:\ProgramData\chocolatey\bin\swig.exe run: | mkdir $env:GITHUB_WORKSPACE\\build chdir $env:GITHUB_WORKSPACE\\build # TODO: Can remove /WX when we use that in CMakeLists.txt. # Set the CXXFLAGS environment variable to turn warnings into errors. # Skip timing test section included by default. - cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DSWIG_LIB=C:\ProgramData\Chocolatey\lib\swig\tools\install\Lib -DSWIG_DIR=C:\ProgramData\Chocolatey\lib\swig\tools\install\Lib -DSWIG_EXECUTABLE=C:\ProgramData\chocolatey\bin\swig.exe + cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 $env:match = cmake -L . | Select-String -Pattern OPENSIM_QUALIFIED_VERSION $version = $env:match.split('=')[1] echo $version @@ -206,6 +207,7 @@ jobs: cmake -E env CXXFLAGS="/W0" cmake $env:GITHUB_WORKSPACE/dependencies -LAH -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim_dependencies_install -DSUPERBUILD_ezc3d=ON -DOPENSIM_WITH_TROPTER=ON -DOPENSIM_WITH_CASADI=ON cmake --build . --config Release -- /maxcpucount:4 + # -DSWIG_LIB=C:\ProgramData\Chocolatey\lib\swig\tools\install\Lib -DSWIG_DIR=C:\ProgramData\Chocolatey\lib\swig\tools\install\Lib -DSWIG_EXECUTABLE=C:\ProgramData\chocolatey\bin\swig.exe - name: Configure opensim-core id: configure run: | @@ -214,7 +216,7 @@ jobs: # TODO: Can remove /WX when we use that in CMakeLists.txt. # Set the CXXFLAGS environment variable to turn warnings into errors. # Skip timing test section included by default. - cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DSWIG_LIB=C:\ProgramData\Chocolatey\lib\swig\tools\install\Lib -DSWIG_DIR=C:\ProgramData\Chocolatey\lib\swig\tools\install\Lib -DSWIG_EXECUTABLE=C:\ProgramData\chocolatey\bin\swig.exe + cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 $env:match = cmake -L . | Select-String -Pattern OPENSIM_QUALIFIED_VERSION $version = $env:match.split('=')[1] echo $version From 4d1f1c530d520a00e8b7d174c18d8d1b8ee84976 Mon Sep 17 00:00:00 2001 From: Nicholas Bianco Date: Fri, 16 Jun 2023 15:00:48 -0700 Subject: [PATCH 12/13] cd to correct dir for swig on linux --- .github/workflows/continuous_integration.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index ea54525f6e..e5125e9e24 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -293,7 +293,7 @@ jobs: run: | mkdir ~/swig-source && cd ~/swig-source wget https://github.com/swig/swig/archive/refs/tags/v4.1.1.tar.gz - tar xzf v4.1.1.tar.gz && ls && cd swig-v4.1.1 + tar xzf v4.1.1.tar.gz && cd swig-4.1.1 sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache make && make -j4 install @@ -399,7 +399,7 @@ jobs: run: | mkdir ~/swig-source && cd ~/swig-source wget https://github.com/swig/swig/archive/refs/tags/v4.1.1.tar.gz - tar xzf v4.1.1.tar.gz && cd swig-v4.1.1 + tar xzf v4.1.1.tar.gz && cd swig-4.1.1 sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache make && make -j4 install - name: Cache dependencies @@ -501,7 +501,7 @@ jobs: run: | mkdir ~/swig-source && cd ~/swig-source wget https://github.com/swig/swig/archive/refs/tags/v4.1.1.tar.gz - tar xzf v4.1.1.tar.gz && ls && cd swig-v4.1.1 + tar xzf v4.1.1.tar.gz && cd swig-4.1.1 sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache make && make -j4 install - name: Cache dependencies From ec895ee8a2b076355e79cf6cec09cfcb494c89fb Mon Sep 17 00:00:00 2001 From: Nicholas Bianco Date: Fri, 16 Jun 2023 15:11:31 -0700 Subject: [PATCH 13/13] Remove temporary comments --- .github/workflows/continuous_integration.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index e5125e9e24..92c3c672c4 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -71,7 +71,6 @@ jobs: - name: Configure opensim-core id: configure - # -DSWIG_LIB=C:\ProgramData\Chocolatey\lib\swig\tools\install\Lib -DSWIG_DIR=C:\ProgramData\Chocolatey\lib\swig\tools\install\Lib -DSWIG_EXECUTABLE=C:\ProgramData\chocolatey\bin\swig.exe run: | mkdir $env:GITHUB_WORKSPACE\\build chdir $env:GITHUB_WORKSPACE\\build @@ -207,7 +206,6 @@ jobs: cmake -E env CXXFLAGS="/W0" cmake $env:GITHUB_WORKSPACE/dependencies -LAH -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim_dependencies_install -DSUPERBUILD_ezc3d=ON -DOPENSIM_WITH_TROPTER=ON -DOPENSIM_WITH_CASADI=ON cmake --build . --config Release -- /maxcpucount:4 - # -DSWIG_LIB=C:\ProgramData\Chocolatey\lib\swig\tools\install\Lib -DSWIG_DIR=C:\ProgramData\Chocolatey\lib\swig\tools\install\Lib -DSWIG_EXECUTABLE=C:\ProgramData\chocolatey\bin\swig.exe - name: Configure opensim-core id: configure run: |