Fix CI build

rospypi · Jun 13, 2021 · 778be90 · 778be90
1 parent 634b9e7
commit 778be90
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 17 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -77,6 +77,7 @@ jobs:
       env:
         PYTHON_VERSION: ${{ matrix.python-version }}
       run: |
+        sudo apt-get update
         sudo apt install liblz4-dev sip-dev libeigen3-dev sip-dev libboost-all-dev
         echo BRANCH_NAME=Linux_${PYTHON_VERSION} >> $GITHUB_ENV
     - name: Install packages(MacOS)
@@ -93,10 +94,16 @@ jobs:
       run: |
         curl -LO -s "https://github.com/lz4/lz4/archive/v1.9.2.zip"
         unzip -q v1.9.2.zip -d roslz4
-        "/c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/MSBuild/Current/Bin/MSBuild.exe" "roslz4\lz4-1.9.2\visual\VS2017\lz4.sln" //t:liblz4 //p:Configuration=Release //p:Platform="x64" //p:ForceImportBeforeCppTargets="D:\a\simple\simple\roslz4\build.props" //p:WindowsTargetPlatformVersion="10.0.18362.0"
+        "/c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/MSBuild/Current/Bin/MSBuild.exe" "roslz4\lz4-1.9.2\visual\VS2017\liblz4\liblz4.vcxproj" //t:Build //p:Configuration=Release //p:Platform="x64" //p:ForceImportBeforeCppTargets="D:\a\simple\simple\roslz4\build.props" //p:WindowsTargetPlatformVersion="10.0.19041.0"
         curl -LO -s "https://gitlab.com/libeigen/eigen/-/archive/3.3.7/eigen-3.3.7.zip"
         unzip -q eigen-3.3.7.zip -d PyKDL
-        echo BOOST_ROOT=${BOOST_ROOT_1_72_0} >> $GITHUB_ENV
+        curl -LO -s "https://sourceforge.net/projects/boost/files/boost-binaries/1.72.0/boost_1_72_0-msvc-14.2-64.exe"
+        ./boost_1_72_0-msvc-14.2-64.exe //SILENT //SP- //SUPPRESSMSGBOXES //DIR=boost_1_72_0
+        mkdir -p boost_1_72_0/include
+        mv boost_1_72_0/boost boost_1_72_0/include
+        mv boost_1_72_0/lib64-msvc-14.2 boost_1_72_0/lib
+        ls boost_1_72_0/include
+        echo BOOST_ROOT=$(cmd //c cd)\\boost_1_72_0 >> $GITHUB_ENV
         echo EIGEN_ROOT=eigen-3.3.7 >> $GITHUB_ENV
         echo BRANCH_NAME=Windows_${PYTHON_VERSION} >> $GITHUB_ENV
       shell: bash

diff --git a/PyKDL/MANIFEST.in b/PyKDL/MANIFEST.in
@@ -1,11 +1,15 @@
-include config.h
 include include/kdl/config.h
 include kdl/*.hpp
 include kdl/*.inl
-include kdl/utilities/*
+include kdl/utilities/*.h
+include kdl/utilities/*.hpp
 include orocos_kinematics_dynamics/orocos_kdl/src/*.cpp
+include orocos_kinematics_dynamics/orocos_kdl/src/*.hpp
+include orocos_kinematics_dynamics/orocos_kdl/src/*.inl
 include orocos_kinematics_dynamics/orocos_kdl/src/utilities/*.cpp
 include orocos_kinematics_dynamics/orocos_kdl/src/utilities/*.cxx
-include orocos_kinematics_dynamics/python_orocos_kdl/PyKDL/pybind11/*.cpp
-include orocos_kinematics_dynamics/python_orocos_kdl/PyKDL/pybind11/*.h
+include orocos_kinematics_dynamics/orocos_kdl/src/utilities/*.hpp
+include orocos_kinematics_dynamics/orocos_kdl/src/utilities/*.h
+include orocos_kinematics_dynamics/python_orocos_kdl/PyKDL/*.cpp
+include orocos_kinematics_dynamics/python_orocos_kdl/PyKDL/*.h
 recursive-include orocos_kinematics_dynamics/python_orocos_kdl/pybind11/include *.h
diff --git a/PyKDL/orocos_kinematics_dynamics b/PyKDL/orocos_kinematics_dynamics
diff --git a/PyKDL/setup.py b/PyKDL/setup.py
@@ -1,11 +1,7 @@
 import glob
 import os
 import platform
-import subprocess
-from distutils.cmd import Command
 from setuptools import setup, Extension
-from setuptools.command.sdist import sdist
-from setuptools.command.build_ext import build_ext
 
 
 orocos_root = "orocos_kinematics_dynamics/"
@@ -23,20 +19,23 @@
 if platform.system() == "Darwin":
     include_dirs += ["/usr/local/include/eigen3"]
 
+extra_compile_args = []
+if platform.system() != "Windows":
+    extra_compile_args += ["-std=c++11"]
 
 setup(
     name="PyKDL",
     packages=["PyKDL"],
-    version="1.4.post3",
+    version="1.5",
     ext_package="PyKDL",
     ext_modules=[Extension(
         "PyKDL",
-        glob.glob(orocos_root + "python_orocos_kdl/PyKDL/pybind11/*.cpp") +
+        glob.glob(orocos_root + "python_orocos_kdl/PyKDL/*.cpp") +
         glob.glob(orocos_root + "orocos_kdl/src/*.cpp") +
         glob.glob(orocos_root + "orocos_kdl/src/utilities/*.cpp") +
         glob.glob(orocos_root + "orocos_kdl/src/utilities/*.cxx"),
         include_dirs=include_dirs,
-        extra_compile_args=['-std=c++11'],
+        extra_compile_args=extra_compile_args,
     )],
     zip_safe=False,
 )
diff --git a/roslz4/setup.py b/roslz4/setup.py
@@ -15,20 +15,22 @@
 if platform.system() == "Windows":
     # these are special value for Github Action build
     include_dirs += ["lz4-1.9.2/lib"]
-    libraries = ["lz4-1.9.2/visual/VS2017/bin/x64_Release/liblz4_static"]
+    libraries = ["lz4-1.9.2/visual/VS2017/liblz4/bin/x64_Release/liblz4_static"]
 else:
     extra_compile_args += [
         "-Wno-strict-prototypes",
         "-Wno-missing-field-initializers",
         "-Wno-unused-variable",
         "-Wno-strict-aliasing",
     ]
+    if platform.system() == "Darwin":
+        extra_compile_args += [""]
 
 
 setup(
     name="roslz4",
     packages=["roslz4"],
-    version="1.14.3.post1",
+    version="1.14.3.post2",
     package_dir={"": "ros_comm/utilities/roslz4/src"},
     install_requires=[],
     ext_package="roslz4",

diff --git a/tf2_py/setup.py b/tf2_py/setup.py
@@ -8,6 +8,7 @@
     "roscpp_core/rostime/include",
     "stubs/include",
 ]
+extra_compile_args = []
 library_dirs = []
 libraris = []
 
@@ -25,11 +26,14 @@
 
 if platform.system() == "Windows":
     define_macros += [("_WINDOWS", None)]
+else:
+    extra_compile_args += ["-std=c++11"]
+
 
 setup(
     name="tf2_py",
     packages=["tf2_py"],
-    version="0.6.5.post0",
+    version="0.6.5.post1",
     package_dir={"": "geometry2/tf2_py/src"},
     install_requires=["rospy", "geometry_msgs", "tf2_msgs"],
     ext_package="tf2_py",
@@ -46,5 +50,6 @@
         include_dirs=include_dirs,
         library_dirs=library_dirs,
         define_macros=define_macros,
+        extra_compile_args=extra_compile_args,
         )],
     )