Attachment 201897 Details for Bug 224895 – Updated shar to address issues from comment 3.

Updated shar to address issues from comment 3.

rosdep.shar (text/plain), 8.84 KB, created by Trenton Schulz on 2019-02-10 16:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Trenton Schulz

Created: 2019-02-10 16:30:00 UTC

Size: 8.84 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	rosdep
>#	rosdep/pkg-descr
>#	rosdep/files
>#	rosdep/files/patch-src_rosdep2_platforms_freebsd.py
>#	rosdep/files/patch-src_rosdep2_____init____.py
>#	rosdep/files/patch-src_rosdep2_catkin__support.py
>#	rosdep/distinfo
>#	rosdep/Makefile
>#
>echo c - rosdep
>mkdir -p rosdep > /dev/null 2>&1
>echo x - rosdep/pkg-descr
>sed 's/^X//' >rosdep/pkg-descr << '8008cf1a7c42d94d6e7c404fab7ba3ce'
>Xrosdep is a command-line tool for installing system dependencies
>X
>Xrosdep uses the backend of operating system for installing
>Xpackages. For end-users, rosdep helps you install system dependencies
>Xfor software that you are building from source. For developers, rosdep
>Xsimplifies the problem of installing system dependencies on different
>Xplatforms.
>X
>XOn FreeBSD, the pkg system is used.
>X
>XWWW: http://docs.ros.org/independent/api/rosdep/html/
>8008cf1a7c42d94d6e7c404fab7ba3ce
>echo c - rosdep/files
>mkdir -p rosdep/files > /dev/null 2>&1
>echo x - rosdep/files/patch-src_rosdep2_platforms_freebsd.py
>sed 's/^X//' >rosdep/files/patch-src_rosdep2_platforms_freebsd.py << '1b729930d91895a42b73cc4fe25dc17a'
>X--- src/rosdep2/platforms/freebsd.py.orig	2017-08-04 00:33:42 UTC
>X+++ src/rosdep2/platforms/freebsd.py
>X@@ -28,60 +28,54 @@
>X 
>X # Original from cygwin.py by Tingfan Wu tingfan@gmail.com
>X # Modified for FreeBSD by Rene Ladan rene@freebsd.org
>X+# Updated for FreeBSD with pkg by Trenton Schulz trentonw@ifi.uio.no
>X 
>X-import os
>X-import subprocess
>X-
>X from rospkg.os_detect import OS_FREEBSD
>X 
>X-from .source import SOURCE_INSTALLER
>X-from ..installers import Installer
>X+from .pip import PIP_INSTALLER
>X+from ..installers import PackageManagerInstaller
>X+from ..shell_utils import read_stdout
>X 
>X-PKG_ADD_INSTALLER = 'pkg_add'
>X+PKG_INSTALLER = 'pkg'
>X 
>X+
>X def register_installers(context):
>X-    context.set_installer(PKG_ADD_INSTALLER, PkgAddInstaller())
>X-    
>X+    context.set_installer(PKG_INSTALLER, PkgInstaller())
>X+
>X+
>X def register_platforms(context):
>X-    context.add_os_installer_key(OS_FREEBSD, SOURCE_INSTALLER)
>X-    context.add_os_installer_key(OS_FREEBSD, PKG_ADD_INSTALLER)
>X-    context.set_default_os_installer_key(OS_FREEBSD, lambda self: PKG_ADD_INSTALLER)
>X+    context.add_os_installer_key(OS_FREEBSD, PKG_INSTALLER)
>X+    context.add_os_installer_key(OS_FREEBSD, PIP_INSTALLER)
>X+    context.set_default_os_installer_key(OS_FREEBSD, lambda self: PKG_INSTALLER)
>X 
>X-def pkg_info_detect_single(p):
>X+
>X+def pkg_detect_single(p, exec_fn):
>X     if p == "builtin":
>X         return True
>X-    # The next code is a lot of hassle, but there is no
>X-    # better way in FreeBSD using just the base tools
>X-    portname = p
>X-    if p == "gtk20":
>X-        portname = "gtk-2.\*"
>X-    elif p == "py-gtk2":
>X-        portname = "py27-gtk-2.\*"
>X-    elif p[:9] in ["autoconf2", "automake1"]:
>X-        portname = p[:8] + "-" + p[8] + "." + p[9:] + "\*"
>X-    elif p[:3] == "py-":
>X-        portname = "py27-" + p[3:] + "\*"
>X-    else:
>X-        portname = p + "-\*"
>X-    pop = subprocess.Popen("/usr/sbin/pkg_info -qE " + portname, shell=True)
>X-    return os.waitpid(pop.pid, 0)[1] == 0 # pkg_info -E returns 0 if pkg installed, 1 if not
>X 
>X-def pkg_info_detect(packages):
>X-    return [p for p in packages if pkg_info_detect_single(p)]
>X+    cmd = ['/usr/sbin/pkg', 'query', '%n', p]
>X+    std_out = exec_fn(cmd)
>X+    return std_out.split() != []
>X 
>X-class PkgAddInstaller(Installer):
>X+
>X+def pkg_detect(packages, exec_fn=None):
>X+    if exec_fn is None:
>X+        exec_fn = read_stdout
>X+    return [p for p in packages if pkg_detect_single(p, exec_fn)]
>X+
>X+
>X+class PkgInstaller(PackageManagerInstaller):
>X     """
>X     An implementation of the Installer for use on FreeBSD-style
>X     systems.
>X     """
>X 
>X     def __init__(self):
>X-        super(PkgAddInstaller, self).__init__(pkg_info_detect)
>X+        super(PkgInstaller, self).__init__(pkg_detect)
>X 
>X     def get_install_command(self, resolved, interactive=True, reinstall=False, quiet=False):
>X-        packages = self.get_packages_to_install(resolved, reinstall=reinstall)        
>X+        packages = self.get_packages_to_install(resolved, reinstall=reinstall)
>X         if not packages:
>X             return []
>X         else:
>X-            #pkg_add does not have a non-interactive command
>X-            return [self.elevate_priv(['/usr/sbin/pkg_add', '-r'])+packages]
>X+            return [self.elevate_priv(['/usr/sbin/pkg', 'install', '-y']) + packages]
>1b729930d91895a42b73cc4fe25dc17a
>echo x - rosdep/files/patch-src_rosdep2_____init____.py
>sed 's/^X//' >rosdep/files/patch-src_rosdep2_____init____.py << '573fe1db812b6e4427ba7c607f20effe'
>X--- src/rosdep2/__init__.py.orig	2017-08-04 00:33:42 UTC
>X+++ src/rosdep2/__init__.py
>X@@ -64,10 +64,11 @@ def create_default_installer_context(verbose=False):
>X     from .platforms import pip
>X     from .platforms import gem
>X     from .platforms import redhat
>X+    from .platforms import freebsd
>X     from .platforms import slackware
>X     from .platforms import source
>X 
>X-    platform_mods = [arch, cygwin, debian, gentoo, opensuse, osx, redhat, slackware]
>X+    platform_mods = [arch, cygwin, debian, gentoo, opensuse, osx, redhat, slackware, freebsd]
>X     installer_mods = [source, pip, gem] + platform_mods
>X 
>X     context = InstallerContext()
>573fe1db812b6e4427ba7c607f20effe
>echo x - rosdep/files/patch-src_rosdep2_catkin__support.py
>sed 's/^X//' >rosdep/files/patch-src_rosdep2_catkin__support.py << '885c870a56e570f4cb1f87653ba1259a'
>X--- src/rosdep2/catkin_support.py.orig	2017-08-04 00:33:42 UTC
>X+++ src/rosdep2/catkin_support.py
>X@@ -27,20 +27,23 @@ from .platforms.debian import APT_INSTALLER
>X from .platforms.osx import BREW_INSTALLER
>X from .platforms.pip import PIP_INSTALLER
>X from .platforms.redhat import YUM_INSTALLER
>X+from .platforms.freebsd import PKG_INSTALLER
>X from .rep3 import download_targets_data
>X from .rosdistrohelper import get_targets
>X from .rospkg_loader import DEFAULT_VIEW_KEY
>X from .sources_list import get_sources_list_dir, DataSourceMatcher, SourcesListLoader
>X 
>X+
>X class ValidationFailed(Exception):
>X     pass
>X 
>X+
>X def call(command, pipe=None):
>X     """
>X     Copy of call() function from catkin-generate-debian to mimic output
>X     """
>X     working_dir = '.'
>X-    #print('+ cd %s && ' % working_dir + ' '.join(command))
>X+    # print('+ cd %s && ' % working_dir + ' '.join(command))
>X     process = Popen(command, stdout=pipe, stderr=pipe, cwd=working_dir)
>X     output, unused_err = process.communicate()
>X     retcode = process.poll()
>X@@ -49,6 +52,7 @@ def call(command, pipe=None):
>X     if pipe:
>X         return output
>X 
>X+
>X def get_ubuntu_targets(rosdistro):
>X     """
>X     Get a list of Ubuntu distro codenames for the specified ROS
>X@@ -64,16 +68,18 @@ def get_ubuntu_targets(rosdistro):
>X         targets_data['electric'] = {'ubuntu': legacy_targets['electric']}
>X     return targets_data[rosdistro]['ubuntu']
>X 
>X+
>X def get_installer(installer_name):
>X     """ Expected installers APT_INSTALLER, YUM_INSTALLER, ..."""
>X 
>X     installer_context = create_default_installer_context()
>X     return installer_context.get_installer(installer_name)
>X 
>X+
>X def resolve_for_os(rosdep_key, view, installer, os_name, os_version):
>X     """
>X     Resolve rosdep key to dependencies.
>X-    
>X+
>X     :param os_name: OS name, e.g. 'ubuntu'
>X 
>X     :raises: :exc:`rosdep2.ResolutionError`
>X@@ -110,8 +116,8 @@ def get_catkin_view(rosdistro_name, os_name, os_versio
>X         raise ValidationFailed("""rosdep database does not have any sources.
>X Please make sure you have a valid configuration in:
>X \t%s
>X-"""%(sources_list_dir))
>X-    
>X+""" % (sources_list_dir))
>X+
>X     # for vestigial reasons, using the roskg loader, but we're only
>X     # actually using the backend db as resolution is not resource-name based
>X     lookup = RosdepLookup.create_from_rospkg(sources_loader=sources_loader)
>885c870a56e570f4cb1f87653ba1259a
>echo x - rosdep/distinfo
>sed 's/^X//' >rosdep/distinfo << 'f8dbcfa901e69f6683c5a5d3dff84fbc'
>XTIMESTAMP = 1513849764
>XSHA256 (ros-infrastructure-rosdep-0.11.8_GH0.tar.gz) = 2d5b3c73caa1af5a92b2d1d5356614fff4947d62ac9985e96f62ef801a078137
>XSIZE (ros-infrastructure-rosdep-0.11.8_GH0.tar.gz) = 112899
>f8dbcfa901e69f6683c5a5d3dff84fbc
>echo x - rosdep/Makefile
>sed 's/^X//' >rosdep/Makefile << '4a5ef68c8a4dfea569c697f3f6410060'
>X# $FreeBSD$
>X
>XPORTNAME=	ros-rosdep
>XDISTVERSION=	0.11.8
>XCATEGORIES=	devel
>XPKGNAMEPREFIX=	${PY_FLAVOR}-
>X
>XMAINTAINER=	trueos@norwegianrockcat.com
>XCOMMENT=	Multi-package manager system dependency tool for ROS
>X
>XLICENSE=	BSD3CLAUSE
>X
>XUSES= 	python
>X
>XUSE_PYTHON=	autoplist distutils
>X
>XUSE_GITHUB=	yes
>XGH_ACCOUNT=	ros-infrastructure
>XGH_PROJECT=	rosdep
>X
>X.include <bsd.port.mk>
>4a5ef68c8a4dfea569c697f3f6410060
>exit
>

Actions: View

Attachments on bug 224895: 189396 | 189943 | 201897 | 202139 | 207565