Release preparation (#597)

.gitexternals

@@ -1,2 +1,2 @@
 # -*- mode: cmake -*-
-# CMake/common https://github.com/Eyescale/CMake.git 11ee9c1
+# CMake/common https://github.com/Eyescale/CMake.git 3d5d284

.gitsubprojects

@@ -1,9 +1,9 @@
 # -*- mode: cmake -*-
-git_subproject(vmmlib https://github.com/Eyescale/vmmlib.git caa86d8)
-git_subproject(Servus https://github.com/HBPVIS/Servus 001588d)
-git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git d9d3ff1)
-git_subproject(Pression https://github.com/Eyescale/Pression.git 0a6bf49)
-git_subproject(hwsd https://github.com/Eyescale/hwsd.git 8d17ad9)
-git_subproject(Collage https://github.com/Eyescale/Collage.git 75c145a)
-git_subproject(GLStats https://github.com/Eyescale/GLStats.git 840c29d)
-git_subproject(Deflect https://github.com/BlueBrain/Deflect.git fd77ea4)
+git_subproject(vmmlib https://github.com/Eyescale/vmmlib.git 6b7d203)
+git_subproject(Servus https://github.com/HBPVIS/Servus 2da95ea)
+git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git e1ecab8)
+git_subproject(Pression https://github.com/Eyescale/Pression.git 8242c90)
+git_subproject(hwsd https://github.com/Eyescale/hwsd.git 2898f91)
+git_subproject(Collage https://github.com/Eyescale/Collage.git 9ce67d0)
+git_subproject(GLStats https://github.com/Eyescale/GLStats.git 12d73c9)
+git_subproject(Deflect https://github.com/BlueBrain/Deflect.git 76526f0)

.travis.yml

@@ -3,13 +3,6 @@ notifications:
     on_success: never
 language: cpp
 sudo: false
-cache:
-  ccache: true
-  pip: true
-  directories:
-  - /usr/local
-before_cache:
-  - brew cleanup
 os:
   - osx
 env:

CMake/GitExternal.cmake

@@ -8,7 +8,7 @@
 #    update target to bump the tag to the master revision by
 #    recreating .gitexternals.
 #  * Provides function
-#      git_external(<directory> <giturl> <gittag> [VERBOSE,SHALLOW]
+#      git_external(<directory> <giturl> <gittag> [VERBOSE]
 #        [RESET <files>])
 #    which will check out directory in CMAKE_SOURCE_DIR (if relative)
 #    or in the given absolute path using the given repository and tag
@@ -18,11 +18,6 @@
 #  VERBOSE, when present, this option tells the function to output
 #    information about what operations are being performed by git on
 #    the repo.
-#  SHALLOW, when present, causes a shallow clone of depth 1 to be made
-#    of the specified repo. This may save considerable memory/bandwidth
-#    when only a specific branch of a repo is required and the full history
-#    is not required. Note that the SHALLOW option will only work for a branch
-#    or tag and cannot be used for an arbitrary SHA.
 #  OPTIONAL, when present, this option makes this operation optional.
 #    The function will output a warning and return if the repo could not be
 #    cloned.
@@ -69,15 +64,8 @@ macro(GIT_EXTERNAL_MESSAGE msg)
   endif()
 endmacro()
 
-# utility function for printing a list with custom separator
-function(JOIN VALUES GLUE OUTPUT)
-  string (REGEX REPLACE "([^\\]|^);" "\\1${GLUE}" _TMP_STR "${VALUES}")
-  string (REGEX REPLACE "[\\](.)" "\\1" _TMP_STR "${_TMP_STR}") #fixes escaping
-  set (${OUTPUT} "${_TMP_STR}" PARENT_SCOPE)
-endfunction()
-
 function(GIT_EXTERNAL DIR REPO tag)
-  cmake_parse_arguments(GIT_EXTERNAL_LOCAL "VERBOSE;SHALLOW;OPTIONAL" "" "RESET" ${ARGN})
+  cmake_parse_arguments(GIT_EXTERNAL_LOCAL "VERBOSE;OPTIONAL" "" "RESET" ${ARGN})
   set(TAG ${tag})
   if(GIT_EXTERNAL_TAG AND "${tag}" MATCHES "^[0-9a-f]+$")
     set(TAG ${GIT_EXTERNAL_TAG})
@@ -105,16 +93,9 @@ function(GIT_EXTERNAL DIR REPO tag)
 
   if(NOT EXISTS "${DIR}")
     # clone
-    set(_clone_options --recursive)
-    if(GIT_EXTERNAL_LOCAL_SHALLOW)
-      list(APPEND _clone_options --depth 1 --branch ${TAG})
-    else()
-      set(_msg_tag "[${TAG}]")
-    endif()
-    JOIN("${_clone_options}" " " _msg_text)
-    message(STATUS "git clone ${_msg_text} ${REPO} ${DIR} ${_msg_tag}")
+    message(STATUS "git clone --recursive ${REPO} ${DIR} [${TAG}]")
     execute_process(
-      COMMAND "${GIT_EXECUTABLE}" clone ${_clone_options} ${REPO} ${DIR}
+      COMMAND "${GIT_EXECUTABLE}" clone --recursive ${REPO} ${DIR}
       RESULT_VARIABLE nok ERROR_VARIABLE error
       WORKING_DIRECTORY "${GIT_EXTERNAL_DIR}")
     if(nok)
@@ -127,21 +108,8 @@ function(GIT_EXTERNAL DIR REPO tag)
     endif()
 
     # checkout requested tag
-    if(NOT GIT_EXTERNAL_LOCAL_SHALLOW)
-      execute_process(
-        COMMAND "${GIT_EXECUTABLE}" checkout -q "${TAG}"
-        RESULT_VARIABLE nok ERROR_VARIABLE error
-        WORKING_DIRECTORY "${DIR}")
-      if(nok)
-        message(FATAL_ERROR "git checkout ${TAG} in ${DIR} failed: ${error}\n")
-      endif()
-    endif()
-
-    # checkout requested tag
-    execute_process(
-      COMMAND "${GIT_EXECUTABLE}" checkout -q "${TAG}"
-      RESULT_VARIABLE nok ERROR_VARIABLE error
-      WORKING_DIRECTORY "${DIR}")
+    execute_process(COMMAND "${GIT_EXECUTABLE}" checkout -q "${TAG}"
+      RESULT_VARIABLE nok ERROR_VARIABLE error WORKING_DIRECTORY "${DIR}")
     if(nok)
       message(FATAL_ERROR "git checkout ${TAG} in ${DIR} failed: ${error}\n")
     endif()
@@ -281,13 +249,10 @@ if(EXISTS ${GIT_EXTERNALS} AND NOT GIT_EXTERNAL_SCRIPT_MODE)
           if(NOT TARGET update)
             add_custom_target(update)
           endif()
-          if(NOT TARGET update-gitexternal)
-            add_custom_target(update-gitexternal)
-            add_custom_target(flatten-gitexternal)
-            add_dependencies(update update-gitexternal)
-          endif()
-          if(NOT TARGET ${PROJECT_NAME}-flatten-gitexternal)
+          if(NOT TARGET ${PROJECT_NAME}-update-gitexternal)
+            add_custom_target(${PROJECT_NAME}-update-gitexternal)
             add_custom_target(${PROJECT_NAME}-flatten-gitexternal)
+            add_dependencies(update ${PROJECT_NAME}-update-gitexternal)
           endif()
 
           # Create a unique, flat name
@@ -328,7 +293,7 @@ endif()")
             COMMENT "Update ${REPO} in ${GIT_EXTERNALS_BASE}"
             DEPENDS ${GIT_EXTERNAL_TARGET}
             WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
-          add_dependencies(update-gitexternal
+          add_dependencies(${PROJECT_NAME}-update-gitexternal
             update-gitexternal-${GIT_EXTERNAL_NAME})
 
           # Flattens a git external repository into its parent repo:
@@ -346,12 +311,10 @@ endif()")
             COMMENT "Flatten ${REPO} into ${DIR}"
             DEPENDS ${PROJECT_NAME}-make-branch
             WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${DIR}")
-          add_dependencies(flatten-gitexternal
-            flatten-gitexternal-${GIT_EXTERNAL_NAME})
           add_dependencies(${PROJECT_NAME}-flatten-gitexternal
             flatten-gitexternal-${GIT_EXTERNAL_NAME})
 
-          foreach(_target flatten-gitexternal-${GIT_EXTERNAL_NAME} ${PROJECT_NAME}-flatten-gitexternal flatten-gitexternal update-gitexternal-${GIT_EXTERNAL_NAME} ${GIT_EXTERNAL_TARGET} update-gitexternal update)
+          foreach(_target flatten-gitexternal-${GIT_EXTERNAL_NAME} ${PROJECT_NAME}-flatten-gitexternal update-gitexternal-${GIT_EXTERNAL_NAME} ${GIT_EXTERNAL_TARGET} ${PROJECT_NAME}-update-gitexternal update)
             set_target_properties(${_target} PROPERTIES
               EXCLUDE_FROM_DEFAULT_BUILD ON FOLDER git)
           endforeach()

README.md

@@ -56,23 +56,24 @@ fixed and open bugs, and to report new bugs.
 
 # Building from source
 
-Equalizer is a cross-platform library, designed to run on any modern operating
-system, including all Unix variants and the Windows operating system. Equalizer
-requires at least [OpenGL 1.1](http://www.opengl.org), but uses newer OpenGL
-features when available. Equalizer uses CMake to create a platform-specific
-build environment. The following platforms and build environments are tested:
-
-* Linux: Ubuntu 14.04, RHEL 6.6 (Makefile, Ninja)
+Equalizer is a cross-platform library, designed to run on any modern
+operating system, including all Unix variants and the Windows operating
+system. Equalizer requires at least [OpenGL 1.1](http://www.opengl.org),
+but uses newer OpenGL features when available. It requires a C++11
+compiler and uses CMake to create a platform-specific build
+environment. The following platforms and build environments are tested:
+
+* Linux: Ubuntu 16.04, RHEL 6.8 (Makefile, Ninja)
 * Windows: 7 (Visual Studio 2012)
-* Mac OS X: 10.8 (Makefile, Ninja)
+* Mac OS X: 10.9 (Makefile, Ninja)
 
 ## Linux, Mac OS X
 
     git clone https://github.com/Eyescale/Equalizer.git
     mkdir Equalizer/build
     cd Equalizer/build
-    cmake  -DINSTALL_PACKAGES=1 ..
-    make
+    cmake -GNinja ..
+    ninja
 
 ## Windows
 

doc/Changelog.md

@@ -1,7 +1,9 @@
 Changelog {#Changelog}
 =========
 
-# Release 1.13 (git master)
+# git master
+
+# Release 2.0 (09-12-2016)
 
 * [590](https://github.com/Eyescale/Equalizer/pull/590):
   Added key modifiers to pointer and key events.