From 9e83a6d0856bdd5c655492970643e765d1126c52 Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Thu, 22 Dec 2016 17:29:32 -0800 Subject: [PATCH] updating from googlecode to sourceforge re: https://github.com/ros/rosdistro/issues/7484 --- buildfarm/release_jobs.py | 2 +- resources/static_jobs/_dry_sourcedeb.xml | 2 +- rosdeb/list_missing.py | 6 +++--- rosdeb/source_deb.py | 2 +- scripts/single_deb.py | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/buildfarm/release_jobs.py b/buildfarm/release_jobs.py index 4f469fb..de8077b 100755 --- a/buildfarm/release_jobs.py +++ b/buildfarm/release_jobs.py @@ -150,7 +150,7 @@ def _remove_leafs_recursively(deps): # dry dependencies def dry_get_stack_info(stackname, version, workspace=None): - url = 'http://ros-dry-releases.googlecode.com/svn/download/stacks/%(stackname)s/%(stackname)s-%(version)s/%(stackname)s-%(version)s.yaml' % locals() + url = 'http://svn.code.sf.net/p/ros-dry-releases/code/download/stacks/%(stackname)s/%(stackname)s-%(version)s/%(stackname)s-%(version)s.yaml' % locals() if workspace: filename = os.path.join(workspace, '%(stackname)s-%(version)s.yaml' % locals()) diff --git a/resources/static_jobs/_dry_sourcedeb.xml b/resources/static_jobs/_dry_sourcedeb.xml index 63c77a1..1798509 100644 --- a/resources/static_jobs/_dry_sourcedeb.xml +++ b/resources/static_jobs/_dry_sourcedeb.xml @@ -83,7 +83,7 @@ then rm -rf $WORKSPACE/release fi -svn export http://ros-dry-releases.googlecode.com/svn/trunk/ release +svn export http://svn.code.sf.net/p/ros-dry-releases/code/trunk/ release export PYTHONPATH=$WORKSPACE/buildfarm export ROS_PACKAGE_PATH=$WORKSPACE/release diff --git a/rosdeb/list_missing.py b/rosdeb/list_missing.py index 940fa1f..400a463 100755 --- a/rosdeb/list_missing.py +++ b/rosdeb/list_missing.py @@ -53,7 +53,7 @@ from repo import deb_in_repo, load_Packages, get_repo_version, get_stack_version, BadRepo NAME = 'list_missing.py' -TARBALL_URL = "http://ros-dry-releases.googlecode.com/svn/download/stacks/%(stack_name)s/%(base_name)s/%(f_name)s" +TARBALL_URL = "http://svn.code.sf.net/p/ros-dry-releases/code/download/stacks/%(stack_name)s/%(base_name)s/%(f_name)s" REPO_URL="http://packages.ros.org/%(repo)s/" SHADOW_REPO=REPO_URL%{'repo': 'ros-shadow'} @@ -174,7 +174,7 @@ def compute_missing_depends(stack_name, distro, os_platform, arch, repo=SHADOW_R def get_missing(distro, os_platform, arch, repo=SHADOW_REPO, lock_version=True): distro_name = distro.release_name # Load the list of exclusions - excludes_uri = "http://ros-dry-releases.googlecode.com/svn/trunk/distros/%s.excludes"%(distro_name) + excludes_uri = "http://svn.code.sf.net/p/ros-dry-releases/code/trunk/distros/%s.excludes"%(distro_name) excludes = ExclusionList(excludes_uri, distro_name, os_platform, arch) # Find all the deps in the distro for this stack @@ -253,7 +253,7 @@ def load_distro(distro_name): "Load the distro from the URL" return rospkg.distro.load_distro(rospkg.distro.distro_uri(distro_name)) -SOURCEDEB_DIR_URI = 'http://ros-dry-releases.googlecode.com/svn/download/stacks/%(stack_name)s/%(stack_name)s-%(stack_version)s/' +SOURCEDEB_DIR_URI = 'http://svn.code.sf.net/p/ros-dry-releases/code/download/stacks/%(stack_name)s/%(stack_name)s-%(stack_version)s/' SOURCEDEB_URI = SOURCEDEB_DIR_URI+'%(deb_name)s_%(stack_version)s-0~%(os_platform)s.dsc' MISSING_REPO = '*' diff --git a/rosdeb/source_deb.py b/rosdeb/source_deb.py index 479a17d..1bebbb8 100644 --- a/rosdeb/source_deb.py +++ b/rosdeb/source_deb.py @@ -200,7 +200,7 @@ def stack_depends(metadata, distro_name, platform_name): return stackdeps def download_control(stack_name, stack_version): - url = 'http://ros-dry-releases.googlecode.com/svn/download/stacks/%(stack_name)s/%(stack_name)s-%(stack_version)s/%(stack_name)s-%(stack_version)s.yaml' + url = 'http://svn.code.sf.net/p/ros-dry-releases/code/download/stacks/%(stack_name)s/%(stack_name)s-%(stack_version)s/%(stack_name)s-%(stack_version)s.yaml' url = url%locals() import urllib2 try: diff --git a/scripts/single_deb.py b/scripts/single_deb.py index 3aef89c..61c8c89 100755 --- a/scripts/single_deb.py +++ b/scripts/single_deb.py @@ -54,7 +54,7 @@ from rosdeb.source_deb import download_control NAME = 'build_debs.py' -TARBALL_URL = "http://ros-dry-releases.googlecode.com/svn/download/stacks/%(stack_name)s/%(base_name)s/%(f_name)s" +TARBALL_URL = "http://svn.code.sf.net/p/ros-dry-releases/code/download/stacks/%(stack_name)s/%(base_name)s/%(f_name)s" REPO_PATH = '/var/www/repos/building' REPO_USERNAME = 'rosbuild' @@ -283,7 +283,7 @@ def do_deb_build(distro_name, stack_name, stack_version, os_platform, arch, stag f.write("""#!/bin/sh set -o errexit apt-get install ca-certificates -y # not in default ubuntu anymore -wget http://ros-dry-releases.googlecode.com/svn/download/stacks/%(stack_name)s/%(stack_name)s-%(stack_version)s/%(stack_name)s-%(stack_version)s.tar.bz2 -O /tmp/buildd/%(stack_name)s-%(stack_version)s.tar.bz2 +wget http://svn.code.sf.net/p/ros-dry-releases/code/download/stacks/%(stack_name)s/%(stack_name)s-%(stack_version)s/%(stack_name)s-%(stack_version)s.tar.bz2 -O /tmp/buildd/%(stack_name)s-%(stack_version)s.tar.bz2 rosdep update chown -R pbuilder /tmp/buildd/.ros su pbuilder -c "rosdep resolve gtest"