Merge hotfix changes 'release/5.11.4' into develop

ecmwf · Nov 17, 2023 · 319b34f · 319b34f
2 parents baf5ad4 + 41f0467
commit 319b34f
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,7 +25,7 @@ endif()
 find_package( ecbuild 3.4 REQUIRED HINTS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../ecbuild ) # Before project()  
 
 # this will generate variables, see ACore/ecflow_version.h.in
-project( ecflow LANGUAGES CXX VERSION 5.11.3 )
+project( ecflow LANGUAGES CXX VERSION 5.11.4 )
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 

diff --git a/Pyext/ecflow/__init__.py b/Pyext/ecflow/__init__.py
@@ -15,6 +15,6 @@
 The ecFlow python module
 """
 
-__version__ = '5.11.3'
+__version__ = '5.11.4'
 
 # http://stackoverflow.com/questions/13040646/how-do-i-create-documentation-with-pydoc
diff --git a/docs/release_notes/index.rst b/docs/release_notes/index.rst
@@ -4,6 +4,7 @@ Release notes
 .. toctree::
     :maxdepth: 1
 
+    version_5.11.4
     version_5.11.3
     version_5.11.2
     version_5.11.1

diff --git a/docs/release_notes/version_5.11.4.rst b/docs/release_notes/version_5.11.4.rst
@@ -0,0 +1,16 @@
+.. _version_5.11.4:
+
+Version 5.11.4 updates
+//////////////////////
+
+
+Version 5.11.4
+==============
+
+* `Released <https://confluence.ecmwf.int/display/ECFLOW/Releases>`__\  on 2023-10-10
+
+
+General
+-------
+
+- **Fix**: Correct the finding of the logserver script
diff --git a/tools/ecflow_logserver.sh b/tools/ecflow_logserver.sh
@@ -100,10 +100,10 @@ prognum=$((base+username))
 #prognum=35502
 
 PROG=$(which $0)
-#PROG_PATH=$(readlink -f $PROG)
-PROG_PATH=$(readlink $PROG)
-#PATH_NAME=$ecflow_DIR/bin
-PATH_NAME=./
+PROG_PATH=$(readlink -f $PROG)
+PATH_NAME=$ecflow_DIR/bin
+#PROG_PATH=$(readlink $PROG)
+#PATH_NAME=./
 
 export LOGPORT=$prognum
 LOGDIR=$(dirname $LOGFILE)