Skip to content
Snippets Groups Projects
Commit f7a45c8a authored by Anthony Mallet's avatar Anthony Mallet
Browse files

[wip/ros18-base] Fix installation and PLIST of some python packages

Some ros python packages require py-setuptools instead of using vanilla
distutils. This has the side effect of installing so called EGG_INFO
directories that behave differently depending on the platform (sometimes the
directory is zipped, sometimes not). The PLIST may then be broken.

Instead of fighting with this, just use distutils instead of setuptools since
setuptools does not bring anything useful in robotpkg (does it?). This is done
via a SUBST stage in setup.py for packages that declare using it.

Affected packages are, so far:
 - ros-gencpp
 - ros-genlisp
 - ros-genpy
parent 1e53ca48
No related branches found
No related tags found
No related merge requests found
......@@ -11,6 +11,8 @@ HOMEPAGE= http://www.ros.org/wiki/roscpp
include ../../wip/ros18-base/Makefile.common
SUBST_CLASSES+= py-distsetup
include ../../wip/catkin/depend.mk
include ../../wip/ros-genmsg/depend.mk
include ../../mk/sysdep/python.mk
......
@comment Mon Oct 8 17:51:21 CEST 2012
@comment Mon Oct 8 22:00:47 CEST 2012
bin/gen_cpp.py
etc/langs/gencpp
lib/pkgconfig/gencpp.pc
${PYTHON_SITELIB}/gencpp-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/PKG-INFO
${PYTHON_SITELIB}/gencpp-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/SOURCES.txt
${PYTHON_SITELIB}/gencpp-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/dependency_links.txt
${PYTHON_SITELIB}/gencpp-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/requires.txt
${PYTHON_SITELIB}/gencpp-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/scripts/gen_cpp.py
${PYTHON_SITELIB}/gencpp-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/scripts/${PYTHON_PYCACHE}/gen_cpp${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/gencpp-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/scripts/${PYTHON_PYCACHE}/gen_cpp${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/gencpp-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/top_level.txt
${PYTHON_SITELIB}/gencpp-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/zip-safe
${PYTHON_SITELIB}/gencpp-${PKGVERSION}-py${PYTHON_VERSION}.egg/gencpp/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/gencpp-${PKGVERSION}-py${PYTHON_VERSION}.egg/gencpp/__init__.py
${PYTHON_SITELIB}/gencpp-${PKGVERSION}-py${PYTHON_VERSION}.egg/gencpp/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/gencpp-${PKGVERSION}-py${PYTHON_VERSION}.egg/gencpp/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
share/gencpp/bin/gen_cpp.py
${PYTHON_SITELIB}/gencpp-${PKGVERSION}-py${PYTHON_VERSION}.egg-info
${PYTHON_SITELIB}/gencpp/__init__.py
${PYTHON_SITELIB}/gencpp/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/gencpp/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
share/gencpp/bin/${PYTHON_PYCACHE}/gen_cpp${PYTHON_TAG}.pyc
share/gencpp/bin/${PYTHON_PYCACHE}/gen_cpp${PYTHON_TAG}.pyo
share/gencpp/bin/gen_cpp.py
share/gencpp/cmake/gencpp-config-version.cmake
share/gencpp/cmake/gencpp-config.cmake
share/gencpp/cmake/gencpp-extras.cmake
......
......@@ -11,6 +11,8 @@ HOMEPAGE= http://www.ros.org/wiki/roslisp
include ../../wip/ros18-base/Makefile.common
SUBST_CLASSES+= py-distsetup
include ../../wip/catkin/depend.mk
include ../../wip/ros-genmsg/depend.mk
include ../../mk/sysdep/python.mk
......
@comment Mon Oct 8 18:37:12 CEST 2012
@comment Mon Oct 8 22:04:01 CEST 2012
bin/gen_lisp.py
etc/langs/genlisp
lib/pkgconfig/genlisp.pc
${PYTHON_SITELIB}/genlisp-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/PKG-INFO
${PYTHON_SITELIB}/genlisp-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/SOURCES.txt
${PYTHON_SITELIB}/genlisp-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/dependency_links.txt
${PYTHON_SITELIB}/genlisp-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/requires.txt
${PYTHON_SITELIB}/genlisp-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/scripts/gen_lisp.py
${PYTHON_SITELIB}/genlisp-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/scripts/${PYTHON_PYCACHE}/gen_lisp${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genlisp-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/scripts/${PYTHON_PYCACHE}/gen_lisp${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genlisp-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/top_level.txt
${PYTHON_SITELIB}/genlisp-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/zip-safe
${PYTHON_SITELIB}/genlisp-${PKGVERSION}-py${PYTHON_VERSION}.egg/genlisp/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genlisp-${PKGVERSION}-py${PYTHON_VERSION}.egg/genlisp/${PYTHON_PYCACHE}/generate${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genlisp-${PKGVERSION}-py${PYTHON_VERSION}.egg/genlisp/${PYTHON_PYCACHE}/genlisp_main${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genlisp-${PKGVERSION}-py${PYTHON_VERSION}.egg/genlisp/__init__.py
${PYTHON_SITELIB}/genlisp-${PKGVERSION}-py${PYTHON_VERSION}.egg/genlisp/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genlisp-${PKGVERSION}-py${PYTHON_VERSION}.egg/genlisp/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genlisp-${PKGVERSION}-py${PYTHON_VERSION}.egg/genlisp/generate.py
${PYTHON_SITELIB}/genlisp-${PKGVERSION}-py${PYTHON_VERSION}.egg/genlisp/${PYTHON_PYCACHE}/generate${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genlisp-${PKGVERSION}-py${PYTHON_VERSION}.egg/genlisp/${PYTHON_PYCACHE}/generate${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genlisp-${PKGVERSION}-py${PYTHON_VERSION}.egg/genlisp/genlisp_main.py
${PYTHON_SITELIB}/genlisp-${PKGVERSION}-py${PYTHON_VERSION}.egg/genlisp/${PYTHON_PYCACHE}/genlisp_main${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genlisp-${PKGVERSION}-py${PYTHON_VERSION}.egg/genlisp/${PYTHON_PYCACHE}/genlisp_main${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genlisp-${PKGVERSION}-py${PYTHON_VERSION}.egg-info
${PYTHON_SITELIB}/genlisp/__init__.py
${PYTHON_SITELIB}/genlisp/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genlisp/generate.py
${PYTHON_SITELIB}/genlisp/${PYTHON_PYCACHE}/generate${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genlisp/genlisp_main.py
${PYTHON_SITELIB}/genlisp/${PYTHON_PYCACHE}/genlisp_main${PYTHON_TAG}.pyc
share/genlisp/cmake/genlisp-config-version.cmake
share/genlisp/cmake/genlisp-config.cmake
share/genlisp/cmake/genlisp-extras.cmake
......
......@@ -11,6 +11,8 @@ HOMEPAGE= http://www.ros.org/wiki/genpy
include ../../wip/ros18-base/Makefile.common
SUBST_CLASSES+= py-distsetup
include ../../wip/catkin/depend.mk
include ../../wip/ros-genmsg/depend.mk
include ../../mk/sysdep/python.mk
......
@comment Mon Oct 8 18:00:54 CEST 2012
@comment Mon Oct 8 21:57:33 CEST 2012
bin/genmsg_py.py
bin/gensrv_py.py
etc/langs/genpy
lib/pkgconfig/genpy.pc
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/PKG-INFO
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/SOURCES.txt
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/dependency_links.txt
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/requires.txt
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/scripts/genmsg_py.py
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/scripts/${PYTHON_PYCACHE}/genmsg_py${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/scripts/${PYTHON_PYCACHE}/genmsg_py${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/scripts/gensrv_py.py
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/scripts/${PYTHON_PYCACHE}/gensrv_py${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/scripts/${PYTHON_PYCACHE}/gensrv_py${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/top_level.txt
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/EGG-INFO/zip-safe
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/base${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/dynamic${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/generate_initpy${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/generate_numpy${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/generate_struct${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/generator${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/genpy_main${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/message${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/rostime${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/__init__.py
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/base.py
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/base${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/base${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/dynamic.py
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/dynamic${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/dynamic${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/generate_initpy.py
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/generate_initpy${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/generate_initpy${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/generate_numpy.py
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/generate_numpy${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/generate_numpy${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/generate_struct.py
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/generate_struct${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/generate_struct${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/generator.py
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/generator${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/generator${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/genpy_main.py
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/genpy_main${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/genpy_main${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/message.py
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/message${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/message${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/rostime.py
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/rostime${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg/genpy/${PYTHON_PYCACHE}/rostime${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genpy-${PKGVERSION}-py${PYTHON_VERSION}.egg-info
${PYTHON_SITELIB}/genpy/__init__.py
${PYTHON_SITELIB}/genpy/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genpy/base.py
${PYTHON_SITELIB}/genpy/${PYTHON_PYCACHE}/base${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy/${PYTHON_PYCACHE}/base${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genpy/dynamic.py
${PYTHON_SITELIB}/genpy/${PYTHON_PYCACHE}/dynamic${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy/${PYTHON_PYCACHE}/dynamic${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genpy/generate_initpy.py
${PYTHON_SITELIB}/genpy/${PYTHON_PYCACHE}/generate_initpy${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy/${PYTHON_PYCACHE}/generate_initpy${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genpy/generate_numpy.py
${PYTHON_SITELIB}/genpy/${PYTHON_PYCACHE}/generate_numpy${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy/${PYTHON_PYCACHE}/generate_numpy${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genpy/generate_struct.py
${PYTHON_SITELIB}/genpy/${PYTHON_PYCACHE}/generate_struct${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy/${PYTHON_PYCACHE}/generate_struct${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genpy/generator.py
${PYTHON_SITELIB}/genpy/${PYTHON_PYCACHE}/generator${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy/${PYTHON_PYCACHE}/generator${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genpy/genpy_main.py
${PYTHON_SITELIB}/genpy/${PYTHON_PYCACHE}/genpy_main${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy/${PYTHON_PYCACHE}/genpy_main${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genpy/message.py
${PYTHON_SITELIB}/genpy/${PYTHON_PYCACHE}/message${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy/${PYTHON_PYCACHE}/message${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/genpy/rostime.py
${PYTHON_SITELIB}/genpy/${PYTHON_PYCACHE}/rostime${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/genpy/${PYTHON_PYCACHE}/rostime${PYTHON_TAG}.pyo
share/genpy/bin/${PYTHON_PYCACHE}/genmsg_py${PYTHON_TAG}.pyc
share/genpy/bin/${PYTHON_PYCACHE}/genmsg_py${PYTHON_TAG}.pyo
share/genpy/bin/${PYTHON_PYCACHE}/gensrv_py${PYTHON_TAG}.pyc
share/genpy/bin/${PYTHON_PYCACHE}/gensrv_py${PYTHON_TAG}.pyo
share/genpy/bin/genmsg_py.py
share/genpy/bin/${PYTHON_PYCACHE}/genmsg_py${PYTHON_TAG}.pyc
share/genpy/bin/${PYTHON_PYCACHE}/genmsg_py${PYTHON_TAG}.pyo
......
......@@ -47,3 +47,10 @@ SUBST_DATA.py-syspath=\
print "sys.path.insert(0, \"${PREFIX}/${PYTHON_SITELIB}\")"
SUBST_FILTER_CMD.py-syspath=\
${AWK} 'NR==2 { ${SUBST_DATA.py-syspath} } {print}'
# Replace setuptools setup by vanilla distutils setup
SUBST_STAGE.py-distsetup= pre-configure
SUBST_MESSAGE.py-distsetup= Replacing setuptools setup by distutils setup
SUBST_FILES.py-distsetup+= setup.py
SUBST_SED.py-distsetup=\
-e 's/from setuptools import setup/from distutils.core import setup/'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment