diff --git a/.gitignore b/.gitignore index d297a6d77f1..1fba0e6eef7 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ tags /license_check/ /install*/ .DS_Store +*.swp +/source-package/ diff --git a/COPYING b/COPYING index 0841957a15b..ba52eeefafd 100644 --- a/COPYING +++ b/COPYING @@ -6,6 +6,7 @@ The list of authors for YARP (ordered by file count) is: Paul Fitzpatrick Lorenzo Natale Ali Paikan + iCub Facility, Istituto Italiano di Tecnologia Giorgio Metta Daniele E. Domenichelli Dr. Roland Bock @@ -13,13 +14,14 @@ The list of authors for YARP (ordered by file count) is: Anne van Rossum Duarte Aragao Alessandro Scalzo + Alberto Cardellino Daniel Krieg Arjan Gijsberts Marco Randazzo Elena Ceseracciu Chris Morley - Alberto Cardellino Alexandre Bernardino + Istituto Italiano di Tecnologia Francesco Nori Renaud Detry Miguel Sarabia del Castillo @@ -35,10 +37,11 @@ The list of authors for YARP (ordered by file count) is: Mike P. Blow Matteo Brunettini Lars Olsson + Istituto Italiano di Tecnologia (IIT) Gianluca Massera Free Software Foundation - Daniele Domenichelli - by Chris Morley + Francesco Romano + Chris Morley The gtkmm Development Team The goocanvasmm Development Team Stephen Hart @@ -47,6 +50,7 @@ The list of authors for YARP (ordered by file count) is: Marco Randazo H. Nieuwenhuis Hatice Kose-Bagci + Francesco Giovannini Fabien Benureau Alexis Maldonado @@ -54,6 +58,7 @@ The list of committers in the YARP repository (ordered by number of commit) is: Paul Fitzpatrick Daniele E. Domenichelli Lorenzo Natale + YARP Developers Ali Paikan Ugo Pattacini Alessandro Scalzo @@ -61,13 +66,13 @@ The list of committers in the YARP repository (ordered by number of commit) is: Giacomo Spigler Giorgio Metta Marco Randazzo + Alberto Cardellino Alexandre Bernardino Duarte Aragao - Alberto Cardellino - Francesco Nori Konstantinos Theofilis - Andrea Del Prete Matteo Brunettini + Francesco Nori + Andrea Del Prete Arjan Gijsberts Carlos Beltran-Gonzalez Claudio Castellini @@ -75,16 +80,23 @@ The list of committers in the YARP repository (ordered by number of commit) is: Jonas Ruesch Michael Bucko Vadim Tikhanoff - Paul Fitzpatrick + Mirko + Alessio Rocchi + Francesco Giovannini + Silvio Traversaro Bruno Nery Fabien Benureau Francesco Orabona + Francesco Romano Naeem Assif Mirza + Silvio Traversaro + Valentina Gaggero Ze Ji - Enrico - Lorenzo Natale + francesco-romano + Enrico Mingo + Plinio Moreno Serena Ivaldi - Valentina Gaggero + iCub Developers The list of people thanked in the ChangeLog (ordered by mention count) is: Lorenzo Natale @@ -180,10 +192,9 @@ The list of people thanked in the ChangeLog (ordered by mention count) is: Zenon Mathews The list of copyright holders for YARP is: - Copyright 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 + Copyright 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 RobotCub Consortium (754 files) - Dept. Robotics, Brain and Cognitive Sciences, Istituto Italiano di Tecnologia (264 files) - iCub Facility, Istituto Italiano di Tecnologia (94 files) + Istituto Italiano di Tecnologia (407 files) Dr. Roland Bock (35 files) Duarte Aragao (25 files) Giacomo Spigler (17 files) @@ -201,14 +212,14 @@ The list of copyright holders for YARP is: Ze Ji (4 files) Jonas Ruesch (3 files) Marco Randazzo (3 files) - by Chris Morley (2 files) + Chris Morley (2 files) Eric Mislivec (2 files) Free Software Foundation (2 files) Freyr Magnusson (2 files) - Istituto Italiano di Tecnologia (IIT) (10 files) Lars Olsson (2 files) Matteo Brunettini (2 files) Mike P. Blow (2 files) + Francesco Giovannini (1 file) H. Nieuwenhuis (1 file) Lorenzo Natale (1 file) The goocanvasmm Development Team (1 file) @@ -685,14 +696,6 @@ src/carriers/portmonitor_carrier/lua_swig.h Copyright: unknown CopyPolicy: unknown -src/libYARP_dev/src/modules/AnalogWrapper/AnalogWrapper.cpp - Copyright: unknown - CopyPolicy: unknown - -src/libYARP_dev/src/modules/AnalogWrapper/AnalogWrapper.h - Copyright: unknown - CopyPolicy: unknown - src/libYARP_dev/src/modules/ControlBoardWrapper/ControlBoardWrapper.cpp Copyright: (C) 2009 RobotCub Consortium Authors: Lorenzo Natale @@ -952,34 +955,6 @@ example/matlab/simulink/sfun_time.c Copyright: 2009 The MathWorks, Inc. CopyPolicy: 3-clause BSD -example/ros/add_int_client_v1.cpp - Copyright: unknown - CopyPolicy: unknown - -example/ros/CMakeLists.txt - Copyright: unknown - CopyPolicy: unknown - -example/ros/listener_v1.cpp - Copyright: unknown - CopyPolicy: unknown - -example/ros/add_int_server_v1.cpp - Copyright: unknown - CopyPolicy: unknown - -example/ros/add_int_client_v2.cpp - Copyright: unknown - CopyPolicy: unknown - -example/ros/talker.cpp - Copyright: unknown - CopyPolicy: unknown - -example/ros/listener_v2.cpp - Copyright: unknown - CopyPolicy: unknown - example/yayarpview/CImg.h Copyright: 2004 David Tschumperle CopyPolicy: CeCILL license (use, modify, redistribute) diff --git a/ChangeLog b/ChangeLog index a668762019b..24c37e2edc0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2014-07-14 Matteo Brunettini + * tagging version 2.3.63 + 2014-05-24 Ugo Pattacini * yarp/src/libYARP_dev/src/include/yarp/dev/CartesianControl.h added methods to set/get pose priority diff --git a/conf/YarpVersion.cmake b/conf/YarpVersion.cmake index e81d8dfd503..2762b3b0da2 100644 --- a/conf/YarpVersion.cmake +++ b/conf/YarpVersion.cmake @@ -9,8 +9,8 @@ # bumping VERSION_PATCH set(YARP_VERSION_MAJOR "2") set(YARP_VERSION_MINOR "3") -set(YARP_VERSION_PATCH "62") -set(YARP_VERSION_TWEAK "3") +set(YARP_VERSION_PATCH "63") +set(YARP_VERSION_TWEAK "0") set(YARP_VERSION_STRING "") set(YARP_VERSION_ABI "1") diff --git a/scripts/admin/README_RELEASE b/scripts/admin/README_RELEASE index 789f4c665a3..9fba0d0e29d 100644 --- a/scripts/admin/README_RELEASE +++ b/scripts/admin/README_RELEASE @@ -4,6 +4,14 @@ http://wiki.icub.org/yarpdoc/download.html +* Checkout latest master and make sure that there are no local modifications + + git checkout -f master + git fetch origin + git reset --hard origin/master + git status + (check that there are no uncommitted modifications or new files) + * Check regression tests * Make sure that conf/YarpVersion.cmake is different to the latest @@ -22,15 +30,22 @@ * Update src/doc/download.dox -* Commit and push current version: - git commit -m "YARP 2.3.21" - git push origin master +* Commit : + git commit -a -m "YARP 2.3.21" * Tag: - git tag -a -m "yarp release 2.3.21" v2.3.21 + git tag -a -m "YARP release 2.3.21" v2.3.21 HEAD + +* Further checks : + git log --oneline --graph --decorate origin/master...HEAD + (Check that the only commit is like "* xxxxxxx (tag: v2.3.21, HEAD, master) YARP 2.3.21) + +* Push your modifications + git push origin master git push origin v2.3.21 * Build source packages: ./scripts/admin/make-source-package-svn yarp-2.3.21 * Upload to sourceforge + diff --git a/src/doc/download.dox b/src/doc/download.dox index f197dfafda7..14fe23b7179 100644 --- a/src/doc/download.dox +++ b/src/doc/download.dox @@ -17,8 +17,8 @@ Here is the most recent source code package (stable version) for YARP: Here is the most recent source code package (developement version) for YARP: CMake version 2.8.7 or newer