Skip to content

Commit

Permalink
Merge pull request #2230 from jwillemsen/jwi-ace8
Browse files Browse the repository at this point in the history
Next release will be ACE8 with TAO4
  • Loading branch information
jwillemsen authored Apr 30, 2024
2 parents b94cb45 + fe15e4e commit 42c460d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ACE/NEWS
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
USER VISIBLE CHANGES BETWEEN ACE-7.1.4 and ACE-7.2.0
USER VISIBLE CHANGES BETWEEN ACE-7.1.4 and ACE-8.0.0
====================================================

. ACE/TAO now require C++17 or newer
Expand Down
8 changes: 4 additions & 4 deletions ACE/bin/make_release.py
Original file line number Diff line number Diff line change
Expand Up @@ -448,20 +448,20 @@ def make_version (versions, joiner):


def update_latest_branch (product, which, main_branch):
"""Update one of the Latest_ACE7TAO3_* branches to point to the new release.
"""Update one of the Latest_ACE8TAO4_* branches to point to the new release.
"""

name = "Latest_ACE7TAO3_" + which
name = "Latest_ACE8TAO4_" + which

vprint ('Fast-forwarding', name, 'to', main_branch)
ex ("cd $DOC_ROOT/" + product + " && git fetch . " + main_branch + ":" + name)


def push_latest_branch (product, which, main_branch):
"""Update one of the remote Latest_ACE7TAO3_* branches to point to the new release.
"""Update one of the remote Latest_ACE8TAO4_* branches to point to the new release.
"""

name = "Latest_ACE7TAO3_" + which
name = "Latest_ACE8TAO4_" + which

if opts.push:
vprint ("Pushing branch", name)
Expand Down
4 changes: 3 additions & 1 deletion TAO/NEWS
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
USER VISIBLE CHANGES BETWEEN TAO-3.1.4 and TAO-3.2.0
USER VISIBLE CHANGES BETWEEN TAO-3.1.4 and TAO-4.0.0
====================================================

- ACE/TAO now require C++17 or newer

USER VISIBLE CHANGES BETWEEN TAO-3.1.3 and TAO-3.1.4
====================================================

Expand Down

0 comments on commit 42c460d

Please sign in to comment.