From 68410620837d61eec092ac689f5cbd40aa48bcac Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Wed, 11 Dec 2013 16:33:53 -0800 Subject: [PATCH] update release stuff for use with ros_release_python --- Makefile | 21 +-------------------- dput.cf | 23 ----------------------- stdeb.cfg => stdeb2.cfg | 0 stdeb3.cfg | 5 +++++ 4 files changed, 6 insertions(+), 43 deletions(-) delete mode 100644 dput.cf rename stdeb.cfg => stdeb2.cfg (100%) create mode 100644 stdeb3.cfg diff --git a/Makefile b/Makefile index 41083fde..4e3af975 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,8 @@ -.PHONY: all setup clean_dist distro clean install deb_dist upload-packages upload-building upload testsetup test +.PHONY: all setup clean_dist distro clean install NAME=vcstool VERSION=`./setup.py --version` -OUTPUT_DIR=deb_dist - - all: echo "noop for debbuild" @@ -20,24 +17,8 @@ clean_dist: distro: setup clean_dist python setup.py sdist -push: distro - python setup.py sdist register upload - scp dist/${NAME}-${VERSION}.tar.gz ros@ftp-osl.osuosl.org:/home/ros/data/download.ros.org/downloads/${NAME} - clean: clean_dist echo "clean" install: distro sudo checkinstall python setup.py install - -deb_dist: - python setup.py --command-packages=stdeb.command sdist_dsc --workaround-548392=False bdist_deb - -upload-packages: deb_dist - dput -u -c dput.cf all-shadow-fixed ${OUTPUT_DIR}/${NAME}_${VERSION}-1_amd64.changes - dput -u -c dput.cf all-ros ${OUTPUT_DIR}/${NAME}_${VERSION}-1_amd64.changes - -upload-building: deb_dist - dput -u -c dput.cf all-building ${OUTPUT_DIR}/${NAME}_${VERSION}-1_amd64.changes - -upload: upload-building upload-packages diff --git a/dput.cf b/dput.cf deleted file mode 100644 index 8b2bdba9..00000000 --- a/dput.cf +++ /dev/null @@ -1,23 +0,0 @@ -[all-building] -method = scp -login = rosbuild -fqdn = repos.ros.org -incoming = /var/www/repos/building/queue/all -run_dinstall = 0 -post_upload_command = ssh rosbuild@repos.ros.org -- /usr/bin/reprepro -b /var/www/repos/building --ignore=emptyfilenamepart -V processincoming all - -[all-shadow-fixed] -method = scp -login = rosbuild -fqdn = repos.ros.org -incoming = /var/www/repos/ros-shadow-fixed/ubuntu/queue/all -run_dinstall = 0 -post_upload_command = ssh rosbuild@repos.ros.org -- /usr/bin/reprepro -b /var/www/repos/ros-shadow-fixed/ubuntu --ignore=emptyfilenamepart -V processincoming all - -[all-ros] -method = scp -login = rosbuild -fqdn = repos.ros.org -incoming = /var/www/repos/ros/ubuntu/queue/all -run_dinstall = 0 -post_upload_command = ssh rosbuild@repos.ros.org -- /usr/bin/reprepro -b /var/www/repos/ros/ubuntu --ignore=emptyfilenamepart -V processincoming all diff --git a/stdeb.cfg b/stdeb2.cfg similarity index 100% rename from stdeb.cfg rename to stdeb2.cfg diff --git a/stdeb3.cfg b/stdeb3.cfg new file mode 100644 index 00000000..70eafdd4 --- /dev/null +++ b/stdeb3.cfg @@ -0,0 +1,5 @@ +[DEFAULT] +Package: python3-vcstool +Depends: python3-yaml +Suite: trusty +X-Python3-Version: >= 3.3