switch stable branch to RB-2.4

MX-05 · Apr 9, 2021 · ad1403d · ad1403d
1 parent 2325adf
commit ad1403d
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 20 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,11 +1,11 @@
 Please ask questions ("how do I...?") on the [forum](https://discuss.pixls.us/c/software/natron), not by filing issues.
 
-Please read carefully the [Troubleshooting](http://natron.readthedocs.io/en/rb-2.3/guide/getstarted-troubleshooting.html) section of the [Natron documentation](http://natron.readthedocs.io) before submitting an issue: this issue may already be signaled, or may have a simple workaround.
+Please read carefully the [Troubleshooting](http://natron.readthedocs.io/en/rb-2.4/guide/getstarted-troubleshooting.html) section of the [Natron documentation](http://natron.readthedocs.io) before submitting an issue: this issue may already be signaled, or may have a simple workaround.
 
 Make concrete suggestions for fixing the code ("here is a patch") by filing
 a [pull request](https://github.com/MrKepzie/Natron/pull/new/master), not an issue.
 
-Finally, please follow the [Code of Conduct](https://github.com/NatronGitHub/Natron/blob/RB-2.3/CODE_OF_CONDUCT.md) when interacting with the Natron community (both users and developers).
+Finally, please follow the [Code of Conduct](https://github.com/NatronGitHub/Natron/blob/RB-2.4/CODE_OF_CONDUCT.md) when interacting with the Natron community (both users and developers).
 
 
 ### Problem

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -57,7 +57,7 @@ with enough detail that others can reproduce the problem.
 Contributions Under Repository License
 --------------------------------------
 
-Whenever you make a contribution to a repository containing notice of a [license](https://github.com/NatronGitHub/Natron/blob/RB-2.3/LICENSE.txt), you license your contribution under the same terms, and you agree that you have the right to license your contribution under those terms.
+Whenever you make a contribution to a repository containing notice of a [license](https://github.com/NatronGitHub/Natron/blob/RB-2.4/LICENSE.txt), you license your contribution under the same terms, and you agree that you have the right to license your contribution under those terms.
 
 Pull Requests and Code Review
 -----------------------------

diff --git a/Documentation/source/guide/tutorials-writedoc.rst b/Documentation/source/guide/tutorials-writedoc.rst
@@ -38,13 +38,13 @@ To send your contributions, the best way is to follow the procedure below. Howev
 The standard procedure is the following:
 
 - Fork `https://github.com/NatronGitHub/Natron <https://github.com/NatronGitHub/Natron>`_ using your github account.
-- On your fork, `create a branch <https://help.github.com/en/articles/creating-and-deleting-branches-within-your-repository>`_ from the RB-2.3 branch (do not use the master branch), and give it a name like "documentation-keying" if you are going to write the keying doc (which we really need).
+- On your fork, `create a branch <https://help.github.com/en/articles/creating-and-deleting-branches-within-your-repository>`_ from the RB-2.4 branch (do not use the master branch), and give it a name like "documentation-keying" if you are going to write the keying doc (which we really need).
 - To add your doc, you can either:
 
   - Clone the repository to your computer, edit and add files, commit your changes locally (the github desktop application is easy to use), and then push your changes,
-  - Or edit the files directly on github. See `tutorials-hsvtool.rst <https://github.com/NatronGitHub/Natron/blob/RB-2.3/Documentation/source/guide/tutorials-hsvtool.rst>`_ for en example (you will probably need to fork the repository first, see below, and browse to that file on your fork). Click on the pencil icon on the top right. You get an editable the text view and can get a preview by clicking on the preview tab on top.
+  - Or edit the files directly on github. See `tutorials-hsvtool.rst <https://github.com/NatronGitHub/Natron/blob/RB-2.4/Documentation/source/guide/tutorials-hsvtool.rst>`_ for en example (you will probably need to fork the repository first, see below, and browse to that file on your fork). Click on the pencil icon on the top right. You get an editable the text view and can get a preview by clicking on the preview tab on top.
 
-- Then, submit a `pull request <https://help.github.com/articles/about-pull-requests/>`_ to the RB-2.3 branch on the main repository from your branch (there is a button to submit a pull request when you view your fork on github). Give an accurate description of the pull request, and remember to follow the `Contributor Covenant Code of Conduct <https://www.contributor-covenant.org/version/1/4/code-of-conduct>`_, as with all contributions to Natron or the plugins. The Natron maintainers can either accept it as it is, or ask for a few modifications.
+- Then, submit a `pull request <https://help.github.com/articles/about-pull-requests/>`_ to the RB-2.4 branch on the main repository from your branch (there is a button to submit a pull request when you view your fork on github). Give an accurate description of the pull request, and remember to follow the `Contributor Covenant Code of Conduct <https://www.contributor-covenant.org/version/1/4/code-of-conduct>`_, as with all contributions to Natron or the plugins. The Natron maintainers can either accept it as it is, or ask for a few modifications.
 
 You can view the formatted documentation on your github repository, as explained above, but you can also preview your modifications by using `pandoc <https://pandoc.org/>`_ to convert it to another format, or install `Sphinx <http://sphinx-doc.org>`_ and recompile the whole documentation. On Linux and Mac you can install Sphinx through your package manager (using MacPorts type ``sudo port install py27-sphinx py27-sphinx_rtd_theme``, on HomeBrew type ``brew install sphinx-doc; /usr/local/opt/sphinx-doc/libexec/bin/pip3 install sphinx_rtd_theme```, on Linux type ``pip install sphinx sphinx_rtd_theme``), on Windows refer to the `Sphinx documentation <http://www.sphinx-doc.org/en/stable/install.html#windows-install-python-and-sphinx>`_.
 

diff --git a/Documentation/source/index.rst b/Documentation/source/index.rst
@@ -15,12 +15,12 @@ The Natron documentation is organized as follows:
 - The :ref:`developers-guide` contains documentation about using the Python scripting language within Natron, and using the Natron command-line interface (a.k.a. NatronRenderer).
 
 This documentation is also
-`available online <http://natron.readthedocs.io/en/rb-2.3/>`_
+`available online <http://natron.readthedocs.io/en/rb-2.4/>`_
 and can be downloaded as a
-`PDF <https://readthedocs.org/projects/natron/downloads/pdf/rb-2.3/>`_,
-`HTML zip <https://readthedocs.org/projects/natron/downloads/htmlzip/rb-2.3/>`_
+`PDF <https://readthedocs.org/projects/natron/downloads/pdf/rb-2.4/>`_,
+`HTML zip <https://readthedocs.org/projects/natron/downloads/htmlzip/rb-2.4/>`_
 or
-`ePub <https://readthedocs.org/projects/natron/downloads/epub/rb-2.3/>`_
+`ePub <https://readthedocs.org/projects/natron/downloads/epub/rb-2.4/>`_
 file.
 
 This manual is maintained largely by volunteers.

diff --git a/Global/Macros.h b/Global/Macros.h
@@ -142,9 +142,9 @@ namespace NATRON_PYTHON_NAMESPACE { }
 #define NATRON_VERSION_REVISION_21 10
 
 // The Natron version for this branch
-#define NATRON_VERSION_MAJOR NATRON_VERSION_MAJOR_23
-#define NATRON_VERSION_MINOR NATRON_VERSION_MINOR_23
-#define NATRON_VERSION_REVISION NATRON_VERSION_REVISION_23
+#define NATRON_VERSION_MAJOR NATRON_VERSION_MAJOR_24
+#define NATRON_VERSION_MINOR NATRON_VERSION_MINOR_24
+#define NATRON_VERSION_REVISION NATRON_VERSION_REVISION_24
 
 
 #define NATRON_LATEST_VERSION_URL "https://natrongithub.github.io/LATEST_VERSION.txt"

diff --git a/LATEST_VERSION_README.txt b/LATEST_VERSION_README.txt
@@ -6,4 +6,4 @@ The Natron version number (eg 2.4.0) appears in:
 - Global/Macros.h in variables NATRON_VERSION_MAJOR NATRON_VERSION_MINOR NATRON_VERSION_REVISION
 - This file!
 
-Documentation/source/index.rst also contains links to the versioned documentation on readthedocs (currently rb-2.3)
+Documentation/source/index.rst also contains links to the versioned documentation on readthedocs (currently rb-2.4)
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # Natron
-[![GPL2 License](http://img.shields.io/:license-gpl2-blue.svg?)](https://github.com/NatronGitHub/Natron/blob/master/LICENSE.txt) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v1.4%20adopted-ff69b4.svg)](CODE_OF_CONDUCT.md) [![Build Status](https://api.travis-ci.org/NatronGitHub/Natron.svg?branch=RB-2.3)](https://travis-ci.org/NatronGitHub/Natron) [![Coverage Status](https://coveralls.io/repos/NatronGitHub/Natron/badge.svg?branch=master)](https://coveralls.io/r/NatronGitHub/Natron?branch=master) [![Documentation Status](https://readthedocs.org/projects/natron/badge/?version=rb-2.3)](http://natron.readthedocs.io/en/rb-2.3/) [![Packaging status](https://repology.org/badge/tiny-repos/natron.svg)](https://repology.org/project/natron/badges) [![BountySource Status](https://api.bountysource.com/badge/team?team_id=271309)](https://www.bountysource.com/teams/natrongithub/issues?utm_source=Mozilla&utm_medium=shield&utm_campaign=bounties_received) [![OpenHub](https://www.openhub.net/p/natron/widgets/project_thin_badge?format=gif&ref=Thin+badge)](https://www.openhub.net/p/Natron)
+[![GPL2 License](http://img.shields.io/:license-gpl2-blue.svg?)](https://github.com/NatronGitHub/Natron/blob/master/LICENSE.txt) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v1.4%20adopted-ff69b4.svg)](CODE_OF_CONDUCT.md) [![Build Status](https://api.travis-ci.org/NatronGitHub/Natron.svg?branch=RB-2.4)](https://travis-ci.org/NatronGitHub/Natron) [![Coverage Status](https://coveralls.io/repos/NatronGitHub/Natron/badge.svg?branch=master)](https://coveralls.io/r/NatronGitHub/Natron?branch=master) [![Documentation Status](https://readthedocs.org/projects/natron/badge/?version=rb-2.4)](http://natron.readthedocs.io/en/rb-2.4/) [![Packaging status](https://repology.org/badge/tiny-repos/natron.svg)](https://repology.org/project/natron/badges) [![BountySource Status](https://api.bountysource.com/badge/team?team_id=271309)](https://www.bountysource.com/teams/natrongithub/issues?utm_source=Mozilla&utm_medium=shield&utm_campaign=bounties_received) [![OpenHub](https://www.openhub.net/p/natron/widgets/project_thin_badge?format=gif&ref=Thin+badge)](https://www.openhub.net/p/Natron)
 
 ---
 
@@ -146,11 +146,11 @@ You should start contributing to the Natron project by first picking an easy tas
 
 We coordinate development through the [GitHub issue tracker](https://github.com/NatronGitHub/Natron/issues).
 
-The main development branch is called ["master"](https://github.com/NatronGitHub/Natron/tree/master). The stable version is on branch RB-2.3.
+The main development branch is called ["master"](https://github.com/NatronGitHub/Natron/tree/master). The stable version is on branch RB-2.4.
 
 Additionally, each stable release supported has a branch on its own. For example, the stable release of the v1.0. and all its bug fixes should go into that branch. At some point, a version that is no longer supported will get removed from GitHub's branches and only a release tag will be available to get the source code at that point.
 
-Feel free to report bugs, discuss tasks, or pick up work there. If you want to make changes, please fork, edit, and [send us a pull request](https://github.com/NatronGitHub/Natron/pull/new/RB-2.3), preferably on the ["RB-2.3"](https://github.com/NatronGitHub/Natron/tree/RB-2.3) branch.
+Feel free to report bugs, discuss tasks, or pick up work there. If you want to make changes, please fork, edit, and [send us a pull request](https://github.com/NatronGitHub/Natron/pull/new/RB-2.4), preferably on the ["RB-2.4"](https://github.com/NatronGitHub/Natron/tree/RB-2.4) branch.
 
 There's a `.git-hooks` directory in the root. This contains a `pre-commit` hook that verifies code styling before accepting changes. You can add this to your local repository's `.git/hooks/` directory by doing the following:
 

diff --git a/tools/buildmaster/common-buildmaster.sh b/tools/buildmaster/common-buildmaster.sh
@@ -19,7 +19,7 @@
 
 #THE FOLLOWING CAN BE MODIFIED TO CONFIGURE RELEASE BUILDS
 #----------------------------------------------------------
-NATRON_RELEASE_BRANCH=RB-2.3
+NATRON_RELEASE_BRANCH=RB-2.4
 NATRON_GIT_TAG=tags/2.3.13
 IOPLUG_GIT_TAG=tags/Natron-2.3.13
 MISCPLUG_GIT_TAG=tags/Natron-2.3.13

diff --git a/tools/docker/natron-build/Dockerfile b/tools/docker/natron-build/Dockerfile
@@ -36,7 +36,7 @@ ARG QTDIR=$SDK/qt4
 # EXTRA_PYTHON_MODULES_SCRIPT: Path to a python script that should install extra modules with pip or easy_install.
 
 ENV GIT_URL=https://github.com/NatronGitHub/Natron.git
-ENV GIT_BRANCH=RB-2.3
+ENV GIT_BRANCH=RB-2.4
 ENV GIT_COMMIT=
 ENV RELEASE_TAG= 
 ENV SNAPSHOT_BRANCH=

diff --git a/tools/jenkins/include/scripts/build-Linux-sdk.sh b/tools/jenkins/include/scripts/build-Linux-sdk.sh
@@ -108,7 +108,7 @@ EOF
     PATH=\"\$SDK/bin:\$QTDIR/bin:\$GCC/bin:\$FFMPEG/bin:\$LIBRAW_PATH:\$PATH\" \\
     WORKSPACE=/home \\
     GIT_URL=https://github.com/NatronGitHub/Natron.git \\
-    GIT_BRANCH=RB-2.3 \\
+    GIT_BRANCH=RB-2.4 \\
     GIT_COMMIT= \\
     RELEASE_TAG=  \\
     SNAPSHOT_BRANCH= \\