bump patch level, update release notes, clean up

mamoll · mamoll · commit 366fa9d80ef0 · 2016-07-01T16:04:41.000-05:00
diff --git a/CMakeModules/CPackSettings.cmake b/CMakeModules/CPackSettings.cmake
@@ -35,10 +35,7 @@ set(CPACK_SOURCE_IGNORE_FILES
     "/html/"
     "/bindings/"
     "TODO"
-    "exposed_decl.pypp.txt"
     "ompl.pc$"
-    "installPyPlusPlus.bat$"
-    "installPyPlusPlus.sh$"
     "create_symlinks.sh$"
     "uninstall_symlinks.sh$"
     "config.h$"
diff --git a/CMakeModules/OMPLVersion.cmake b/CMakeModules/OMPLVersion.cmake
@@ -1,7 +1,7 @@
 # set the version in a way CMake can use
 set(OMPL_MAJOR_VERSION 1)
 set(OMPL_MINOR_VERSION 2)
-set(OMPL_PATCH_VERSION 0)
+set(OMPL_PATCH_VERSION 1)
 set(OMPL_VERSION "${OMPL_MAJOR_VERSION}.${OMPL_MINOR_VERSION}.${OMPL_PATCH_VERSION}")
 
 # increment this when we have ABI changes
diff --git a/doc/markdown/releaseNotes.md b/doc/markdown/releaseNotes.md
@@ -1,6 +1,13 @@
 # Release Notes
 
 
+# OMPL 1.2.1 (July 1, 2016)
+
+- New simplified installation instructions. There is now also a [installation script](http://ompl.kavrakilab.org/install-ompl-ubuntu.sh) that will download and install OMPL and all its dependencies on Ubuntu 14.04, 15.10, and 16.04.
+- Fixed python bindings for gcc5. Python bindings still take a [very long time](https://github.com/gccxml/pygccxml/issues/56) to generate.
+- Misc. small bug fixes.
+
+
 # OMPL 1.2.0 (June 20, 2016)
 
 - C++11 is now **required**. A lot of Boost usage in older versions of OMPL has been replaced with C++11 STL equivalents.
diff --git a/install-ompl-ubuntu.sh.in b/install-ompl-ubuntu.sh.in
@@ -12,19 +12,21 @@ install_common_dependencies()
     # On Ubuntu 14.04 we need to add a PPA to get a recent compiler (g++-4.8 is too old).
     # We also need to specify a boost version, since the default Boost is too old.
     if [ -z $TRUSTY ]; then
-        sudo apt-get install -y cmake libboost-all-dev libeigen3-dev libode-dev
+        sudo apt-get -y install cmake libboost-all-dev libeigen3-dev libode-dev
     else
+        # needed for the add-apt-repository command, which was not part of early Trusty releases
+        sudo apt-get -y install software-properties-common
         sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
         sudo apt-get -y update
-        sudo apt-get install -y g++-5 cmake libboost1.55-all-dev libeigen3-dev libode-dev
+        sudo apt-get -y install g++-5 cmake libboost1.55-all-dev libeigen3-dev libode-dev
         export CXX=g++-5
     fi
     export MAKEFLAGS="-j `nproc`"
 }
 
 install_python_binding_dependencies()
 {
-    sudo apt-get install -y python-dev python-pip
+    sudo apt-get -y install python-dev python-pip
     # install additional python dependencies via pip
     sudo -H pip -v install pygccxml https://bitbucket.org/ompl/pyplusplus/get/1.6.tar.gz
     # install castxml
@@ -40,11 +42,11 @@ install_app_dependencies()
 {
     # We prefer PyQt5, but PyQt4 also still works.
     if [ -z $TRUSTY ]; then
-        sudo apt-get install -y python-pyqt5.qtopengl
+        sudo apt-get -y install python-pyqt5.qtopengl
     else
-        sudo apt-get install -y python-qt4-dev python-qt4-gl
+        sudo apt-get -y install python-qt4-dev python-qt4-gl
     fi
-    sudo apt-get install -y freeglut3-dev libassimp-dev python-opengl python-flask python-celery
+    sudo apt-get -y install freeglut3-dev libassimp-dev python-opengl python-flask python-celery
     # install additional python dependencies via pip
     sudo -H pip -v install PyOpenGL-accelerate
     # install libccd
