Release 1.5.0

jhu-dvrk · Nov 8, 2017 · 25df147 · 25df147
1 parent d2a2d51
commit 25df147
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 67 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 Change log
 ==========
 
-1.5.0 (2017-xx-xx)
+1.5.0 (2017-11-07)
 ==================
 
 * API changes:

diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2009-2016 Johns Hopkins University (JHU), All Rights Reserved.
+# (C) Copyright 2009-2017 Johns Hopkins University (JHU), All Rights Reserved.
 #
 # --- begin cisst license - do not edit ---
 #
@@ -31,7 +31,7 @@ set (REQUIRED_CISST_LIBRARIES cisstCommon
                               cisstQt)
 
 # find cisst and make sure the required libraries have been compiled
-find_package (cisst 1.0.8 REQUIRED ${REQUIRED_CISST_LIBRARIES})
+find_package (cisst 1.0.9 REQUIRED ${REQUIRED_CISST_LIBRARIES})
 
 if (cisst_FOUND_AS_REQUIRED)
 
@@ -45,9 +45,9 @@ if (cisst_FOUND_AS_REQUIRED)
   endif ()
 
   # saw components have been compiled within cisst, we should find them automatically
-  find_package (sawRobotIO1394          1.4.0 REQUIRED)
-  find_package (sawControllers          1.4.0 REQUIRED)
-  find_package (sawIntuitiveResearchKit 1.4.0 REQUIRED)
+  find_package (sawRobotIO1394          1.5.0 REQUIRED)
+  find_package (sawControllers          1.5.0 REQUIRED)
+  find_package (sawIntuitiveResearchKit 1.5.0 REQUIRED)
   find_package (sawTextToSpeech REQUIRED)
 
   if (sawRobotIO1394_FOUND AND sawControllers_FOUND

diff --git a/applications/gripper-calibration/CMakeLists.txt b/applications/gripper-calibration/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2009-2016 Johns Hopkins University (JHU), All Rights Reserved.
+# (C) Copyright 2009-2017 Johns Hopkins University (JHU), All Rights Reserved.
 #
 # --- begin cisst license - do not edit ---
 #
@@ -20,7 +20,7 @@ set (REQUIRED_CISST_LIBRARIES cisstCommon
                               cisstParameterTypes)
 
 # find cisst and make sure the required libraries have been compiled
-find_package (cisst 1.0.8 REQUIRED ${REQUIRED_CISST_LIBRARIES})
+find_package (cisst 1.0.9 REQUIRED ${REQUIRED_CISST_LIBRARIES})
 
 if (cisst_FOUND_AS_REQUIRED)
 
@@ -34,7 +34,7 @@ if (cisst_FOUND_AS_REQUIRED)
   endif ()
 
   # saw components have been compiled within cisst, we should find them automatically
-  find_package (sawRobotIO1394          1.4.0 REQUIRED)
+  find_package (sawRobotIO1394 1.5.0 REQUIRED)
 
   if (sawRobotIO1394_FOUND)
 

diff --git a/applications/package.xml b/applications/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>saw_intuitive_research_kit_applications</name>
-  <version>1.4.0</version>
+  <version>1.5.0</version>
   <description>
   sawIntuitiveResearchKit Application
   </description>

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
@@ -23,7 +23,7 @@ set (REQUIRED_CISST_LIBRARIES
      cisstRobot
      cisstNumerical)
 
-find_package (cisst 1.0.8 REQUIRED ${REQUIRED_CISST_LIBRARIES})
+find_package (cisst 1.0.9 REQUIRED ${REQUIRED_CISST_LIBRARIES})
 
 if (cisst_FOUND)
 
@@ -39,8 +39,8 @@ if (cisst_FOUND)
   endif ()
 
   # saw components have been compiled within cisst, we should find them automatically
-  find_package (sawRobotIO1394          1.4.0 REQUIRED)
-  find_package (sawControllers          1.4.0 REQUIRED)
+  find_package (sawRobotIO1394          1.5.0 REQUIRED)
+  find_package (sawControllers          1.5.0 REQUIRED)
 
 
   if (sawRobotIO1394_FOUND AND sawControllers_FOUND)
@@ -71,7 +71,7 @@ if (cisst_FOUND)
 
     # Set the version number
     set (sawIntuitiveResearchKit_VERSION_MAJOR "1")
-    set (sawIntuitiveResearchKit_VERSION_MINOR "4")
+    set (sawIntuitiveResearchKit_VERSION_MINOR "5")
     set (sawIntuitiveResearchKit_VERSION_PATCH "0")
     set (sawIntuitiveResearchKit_VERSION "${sawIntuitiveResearchKit_VERSION_MAJOR}.${sawIntuitiveResearchKit_VERSION_MINOR}.${sawIntuitiveResearchKit_VERSION_PATCH}")
 

diff --git a/components/code/Qt/CMakeLists.txt b/components/code/Qt/CMakeLists.txt
@@ -49,14 +49,14 @@ if (cisst_FOUND_AS_REQUIRED)
   endif (CISST_HAS_QT4)
 
   # saw components have been compiled within cisst, we should find them automatically
-  find_package (sawRobotIO1394          1.4.0 REQUIRED)
-  find_package (sawControllers          1.4.0 REQUIRED)
+  # find_package (sawRobotIO1394          1.5.0 REQUIRED)
+  # find_package (sawControllers          1.5.0 REQUIRED)
   # find_package (sawIntuitiveResearchKit 1.4.0 REQUIRED)
 
   # make sure the new library is known by the parent folder to add to the config file
   set (sawIntuitiveResearchKitQt_LIBRARIES sawIntuitiveResearchKitQt PARENT_SCOPE)
 
-  if (sawRobotIO1394_FOUND AND sawControllers_FOUND)
+  # if (sawRobotIO1394_FOUND AND sawControllers_FOUND)
 
     add_library (sawIntuitiveResearchKitQt
                  ${sawIntuitiveResearchKit_HEADER_DIR}/mtsIntuitiveResearchKitConsoleQt.h
@@ -79,9 +79,9 @@ if (cisst_FOUND_AS_REQUIRED)
     set_property (TARGET sawIntuitiveResearchKitQt PROPERTY FOLDER "sawIntuitiveResearchKit")
     cisst_target_link_libraries (sawIntuitiveResearchKitQt ${REQUIRED_CISST_LIBRARIES})
     target_link_libraries (sawIntuitiveResearchKitQt
-                           ${sawRobotIO1394_LIBRARIES}
-                           ${sawIntuitiveResearchKit_LIBRARIES}
-                           ${sawControllers_LIBRARIES})
+                           # ${sawRobotIO1394_LIBRARIES}
+                           ${sawIntuitiveResearchKit_LIBRARIES})
+                           # ${sawControllers_LIBRARIES})
 
     # make sure the new library is known by the parent folder to add to the config file
     set (sawIntuitiveResearchKitQt_LIBRARIES sawIntuitiveResearchKitQt PARENT_SCOPE)
@@ -90,7 +90,7 @@ if (cisst_FOUND_AS_REQUIRED)
              RUNTIME DESTINATION bin
              LIBRARY DESTINATION lib
              ARCHIVE DESTINATION lib)
-  endif ()
+  # endif ()
 
 else (cisst_FOUND_AS_REQUIRED)
   message ("Information: code will not be compiled, it requires ${REQUIRED_CISST_LIBRARIES}")

diff --git a/components/package.xml b/components/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>saw_intuitive_research_kit</name>
-  <version>1.4.0</version>
+  <version>1.5.0</version>
   <description>
   sawIntuitiveResearchKit
   </description>

diff --git a/examples/deprecated/CMakeLists.txt b/examples/deprecated/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2009-2016 Johns Hopkins University (JHU), All Rights Reserved.
+# (C) Copyright 2009-2017 Johns Hopkins University (JHU), All Rights Reserved.
 #
 # --- begin cisst license - do not edit ---
 #
@@ -26,7 +26,7 @@ set (REQUIRED_CISST_LIBRARIES cisstCommon
                               cisstQt)
 
 # find cisst and make sure the required libraries have been compiled
-find_package (cisst 1.0.8 REQUIRED ${REQUIRED_CISST_LIBRARIES})
+find_package (cisst 1.0.9 REQUIRED ${REQUIRED_CISST_LIBRARIES})
 
 if (cisst_FOUND_AS_REQUIRED)
 
@@ -40,9 +40,9 @@ if (cisst_FOUND_AS_REQUIRED)
   endif ()
 
   # saw components have been compiled within cisst, we should find them automatically
-  find_package (sawRobotIO1394          1.4.0 REQUIRED)
-  find_package (sawControllers          1.4.0 REQUIRED)
-  find_package (sawIntuitiveResearchKit 1.4.0 REQUIRED)
+  find_package (sawRobotIO1394          1.5.0 REQUIRED)
+  find_package (sawControllers          1.5.0 REQUIRED)
+  find_package (sawIntuitiveResearchKit 1.5.0 REQUIRED)
   find_package (sawTextToSpeech REQUIRED)
 
   if (sawRobotIO1394_FOUND AND sawControllers_FOUND

diff --git a/examples/deprecated/package.xml b/examples/deprecated/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>saw_intuitive_research_kit_examples_deprecated</name>
-  <version>1.4.0</version>
+  <version>1.5.0</version>
   <description>
   sawIntuitiveResearchKit Examples (deprecated)
   </description>

diff --git a/examples/derivedTeleOperationPSM/components/CMakeLists.txt b/examples/derivedTeleOperationPSM/components/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2011-2013 Johns Hopkins University (JHU), All Rights
+# (C) Copyright 2011-2017 Johns Hopkins University (JHU), All Rights
 # Reserved.
 #
 # --- begin cisst license - do not edit ---

diff --git a/examples/derivedTeleOperationPSM/components/package.xml b/examples/derivedTeleOperationPSM/components/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>saw_intuitive_research_kit_example_derived_teleop_psm</name>
-  <version>1.4.0</version>
+  <version>1.5.0</version>
   <description>
   sawIntuitiveResearchKit Example
   </description>

diff --git a/share/package.xml b/share/package.xml
@@ -1,51 +1,16 @@
 <?xml version="1.0"?>
 <package>
   <name>dvrk_config</name>
-  <version>1.0.3</version>
+  <version>1.5.0</version>
   <description>dVRK config files</description>
 
-  <!-- One maintainer tag required, multiple allowed, one person per tag --> 
-  <!-- Example:  -->
-  <!-- <maintainer email="[email protected]">Jane Doe</maintainer> -->
   <maintainer email="[email protected]">Anton Deguet</maintainer>
 
-
-  <!-- One license tag required, multiple allowed, one license per tag -->
-  <!-- Commonly used license strings: -->
-  <!--   BSD, MIT, Boost Software License, GPLv2, GPLv3, LGPLv2.1, LGPLv3 -->
   <license>cisst</license>
   <url>https://github.com/jhu-saw/sawIntuitiveResearchKit</url>
 
-
-  <!-- Url tags are optional, but mutiple are allowed, one per tag -->
-  <!-- Optional attribute type can be: website, bugtracker, or repository -->
-  <!-- Example: -->
-  <!-- <url type="website">http://wiki.ros.org/share</url> -->
-
-
-  <!-- Author tags are optional, mutiple are allowed, one per tag -->
-  <!-- Authors do not have to be maintianers, but could be -->
-  <!-- Example: -->
-  <!-- <author email="[email protected]">Jane Doe</author> -->
-
-
-  <!-- The *_depend tags are used to specify dependencies -->
-  <!-- Dependencies can be catkin packages or system dependencies -->
-  <!-- Examples: -->
-  <!-- Use build_depend for packages you need at compile time: -->
-  <!--   <build_depend>message_generation</build_depend> -->
-  <!-- Use buildtool_depend for build tool packages: -->
-  <!--   <buildtool_depend>catkin</buildtool_depend> -->
-  <!-- Use run_depend for packages you need at runtime: -->
-  <!--   <run_depend>message_runtime</run_depend> -->
-  <!-- Use test_depend for packages you need only for testing: -->
-  <!--   <test_depend>gtest</test_depend> -->
   <buildtool_depend>catkin</buildtool_depend>
 
-
-  <!-- The export tag contains other, unspecified, tags -->
   <export>
-    <!-- Other tools can request additional information be placed here -->
-
   </export>
-</package>
+</package>