Skip to content

Commit

Permalink
Update version to 5.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
shahramn committed Nov 29, 2021
1 parent 8e432a1 commit 4aa71d2
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 30 deletions.
12 changes: 6 additions & 6 deletions ACore/src/ecflow_version.h
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#ifndef ecflow_version_config_h
#define ecflow_version_config_h

#define ECFLOW_VERSION "5.7.3"
#define ECFLOW_VERSION "5.8.0"
#define ECFLOW_RELEASE "5"
#define ECFLOW_MAJOR "7"
#define ECFLOW_MINOR "3"
#define ECFLOW_MAJOR "8"
#define ECFLOW_MINOR "0"

// available but not used
//PROJECT_VERSION=5.7.3
//PROJECT_VERSION=5.8.0
//PROJECT_VERSION_MAJOR=5
//PROJECT_VERSION_MINOR=7
//PROJECT_VERSION_PATCH=3
//PROJECT_VERSION_MINOR=8
//PROJECT_VERSION_PATCH=0

#endif
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.3 )
project( ecflow LANGUAGES CXX VERSION 5.8.0 )


include( ecbuild_system NO_POLICY_SCOPE )
Expand Down
10 changes: 5 additions & 5 deletions Doc/misc/Release-Anouncement.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
======================================================================================
Subject: New release of ecFlow(5.7.3) now available
Subject: New release of ecFlow(5.8.0) now available

A new version of ecFlow(5.7.3) has been released:
A new version of ecFlow(5.8.0) has been released:


This release is accessible from: /usr/local/apps/ecflow/5.7.3
This release is accessible from: /usr/local/apps/ecflow/5.8.0
on the following platforms:

o linux 11.3 (lxop-dev)
Expand All @@ -24,7 +24,7 @@ Note: The GUI(ecflowview) is only available on linux

module avail ecflow
module unload ecflow
module load ecflow/5.7.3
module load ecflow/5.8.0

The new GUI(ecflow_ui) is available from vsms1,ecgb,lxop-dev,lxc,leap42

Expand All @@ -34,7 +34,7 @@ The client/Server from one release should not be mixed with another.
To avoid this problem it is *highly* recommended that you use a
specific version:

module load ecflow/5.7.3
module load ecflow/5.8.0

Additionally references to ecflow_client in the scripts(.ecf) should use
the server variable %ECF_VERSION% to locate the executable, this ensures
Expand Down
14 changes: 7 additions & 7 deletions Doc/misc/Release-Process.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,21 @@ Process
<Inform Daniel>

0/ Build release: Two approaches, both use meta-builder:
1/ git flow release start 5.7.3
git_tag=release/5.7.3
1/ git flow release start 5.8.0
git_tag=release/5.8.0
Use this approach when multiple people working on the release.
*Push* branch onto stash, otherwise we cannot pull, from the remote machines
- In eclipse, you *may* have to push this branch first Team->Push Branch
*otherwise* the option Team->Push Upstream may well be greyed out.

2/ git flow release start 5.7.3
git flow release finish 5.7.3
2/ git flow release start 5.8.0
git flow release finish 5.8.0
git push
git push --tags
git_tag=5.7.3
git_tag=5.8.0
When single person making release

0/ Update metabuilder/config.yaml master branch to "5.7.3"
0/ Update metabuilder/config.yaml master branch to "5.8.0"
Then use the meta builder/master to build/install.

0/ Update Documentation
Expand Down Expand Up @@ -89,7 +89,7 @@ Process

0/ Update tag 5new
module load modulemgr
modulemgr -g module -m cca,ccb,cct,ecgb,leap42,lxc,lxg,lxop-dev,sappa,sappb,vsms1 -f -v tag ecflow 5.7.3 5new
modulemgr -g module -m cca,ccb,cct,ecgb,leap42,lxc,lxg,lxop-dev,sappa,sappb,vsms1 -f -v tag ecflow 5.8.0 5new

0/ Announce release
mail group: ecflow_int@lists.ecmwf.int
Expand Down
2 changes: 1 addition & 1 deletion Pyext/ecflow/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
The ecFlow python module
"""

__version__ = '5.7.3'
__version__ = '5.8.0'

# http://stackoverflow.com/questions/13040646/how-do-i-create-documentation-with-pydoc
2 changes: 1 addition & 1 deletion Pyext/samples/extract_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def get_ecflow_version( work_space ):
"This will extract ecFlow version *list* from the source code."
"The version is defined in the file CMakeList.txt"
"expecting string of form:"
"project( ecflow LANGUAGES CXX VERSION 5.7.3 )"
"project( ecflow LANGUAGES CXX VERSION 5.8.0 )"
file = work_space + "/CMakeLists.txt11"
ecflow_version = []
if os.path.exists(file):
Expand Down
18 changes: 9 additions & 9 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ Install from source
* ecfFlow consists of two tar files i.e. ::

- boost_1_71_0.tar.gz
- ecFlow-5.7.3-Source.tar.gz
- ecFlow-5.8.0-Source.tar.gz

* Create a directory for the build
.. code-block:: bash
Expand All @@ -105,18 +105,18 @@ Install from source
.. code-block:: bash
tar -zxf boost_1_71_0.tar.gz
tar -zxf ecFlow-5.7.3-Source.tar.gz
tar -zxf ecFlow-5.8.0-Source.tar.gz
* You should have two directories created
.. code-block:: bash
- boost_1_71_0
- ecFlow-5.7.3-Source
- ecFlow-5.8.0-Source
* Create two environment variables. These are used by some of scripts
.. code-block:: bash
export WK=/tmp/ecflow_build/ecFlow-5.7.3-Source
export WK=/tmp/ecflow_build/ecFlow-5.8.0-Source
export BOOST_ROOT=/tmp/ecflow_build/boost_1_71_0
* ecflow uses bjam/b2 to build BOOST libraries and cmake to build ecflow
Expand Down Expand Up @@ -151,7 +151,7 @@ cmake
* By default will install /usr/local, hence may require root access rights
.. code-block:: bash
cd /tmp/ecflow_build/ecFlow-5.7.3-Source
cd /tmp/ecflow_build/ecFlow-5.8.0-Source
mkdir build; cd build
cmake ..
make -j2
Expand All @@ -161,7 +161,7 @@ cmake
* Optionally you can specify install prefix directory
.. code-block:: bash
cd /tmp/ecflow_build/ecFlow-5.7.3-Source
cd /tmp/ecflow_build/ecFlow-5.8.0-Source
mkdir build; cd build
cmake .. -DCMAKE_INSTALL_PREFIX=/var/tmp/$USER/install/cmake/ecflow
make -j2
Expand All @@ -170,7 +170,7 @@ cmake
* Optionally if you do *NOT* want to build the UI(ecflow_ui) or Python api
.. code-block:: bash
cd /tmp/ecflow_build/ecFlow-5.7.3-Source
cd /tmp/ecflow_build/ecFlow-5.8.0-Source
mkdir build; cd build
cmake .. -DCMAKE_INSTALL_PREFIX=/var/tmp/$USER/install/cmake/ecflow \
-DENABLE_UI=OFF \
Expand All @@ -181,7 +181,7 @@ cmake
* Optionally if you did not export BOOST_ROOT you can specify on the command line
.. code-block:: bash
cd /tmp/ecflow_build/ecFlow-5.7.3-Source
cd /tmp/ecflow_build/ecFlow-5.8.0-Source
mkdir build; cd build
cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local/apps/ecflow \
-DCMAKE_BUILD_TYPE=Debug \
Expand All @@ -192,7 +192,7 @@ cmake
* On some platforms(AIX) you may need to specify the c++ compiler
.. code-block:: bash
cd /tmp/ecflow_build/ecFlow-5.7.3-Source
cd /tmp/ecflow_build/ecFlow-5.8.0-Source
mkdir build; cd build
cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local/apps/ecflow \
-DCMAKE_CXX_COMPILER=xlC_r"
Expand Down

0 comments on commit 4aa71d2

Please sign in to comment.