Author: julianfoad
Date: Fri Sep 27 09:39:25 2019
New Revision: 1867624
URL: http://svn.apache.org/viewvc?rev=1867624&view=rev
Log:
* tools/dist/release.py (tool_versions): Deduplicate the data.
Modified:
subversion/trunk/tools/dist/release.py
Modified: subversion/trunk/tools/dist/release.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1867624&r1=1867623&r2=1867624&view=diff
==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Fri Sep 27 09:39:25 2019
@@ -68,64 +68,35 @@ except ImportError:
# Our required / recommended release tool versions by release branch
-tool_versions = {
- 'trunk' : {
+tool_versions = {}
+tool_versions['1.8'] = {
'autoconf' : ['2.69',
'954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'],
- 'libtool' : ['2.4.6',
-
'e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3'],
- 'swig' : ['3.0.12',
-
'7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d'],
- },
- '1.13' : {
- 'autoconf' : ['2.69',
-
'954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'],
- 'libtool' : ['2.4.6',
-
'e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3'],
- 'swig' : ['3.0.12',
-
'7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d'],
- },
- '1.12' : {
- 'autoconf' : ['2.69',
-
'954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'],
- 'libtool' : ['2.4.6',
-
'e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3'],
- 'swig' : ['3.0.12',
-
'7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d'],
- },
- '1.11' : {
+ 'libtool' : ['2.4.3',
+
'36b4881c1843d7585de9c66c4c3d9a067ed3a3f792bc670beba21f5a4960acdf'],
+ 'swig' : ['2.0.9',
+
'586954000d297fafd7e91d1ad31089cc7e249f658889d11a44605d3662569539'],
+ }
+tool_versions['1.9'] = {
'autoconf' : ['2.69',
'954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'],
'libtool' : ['2.4.6',
'e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3'],
- 'swig' : ['3.0.12',
-
'7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d'],
- },
- '1.10' : {
+ 'swig' : ['2.0.12',
+
'65e13f22a60cecd7279c59882ff8ebe1ffe34078e85c602821a541817a4317f7'],
+ }
+tool_versions['1.10'] = {
'autoconf' : ['2.69',
'954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'],
'libtool' : ['2.4.6',
'e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3'],
'swig' : ['3.0.12',
'7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d'],
- },
- '1.9' : {
- 'autoconf' : ['2.69',
-
'954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'],
- 'libtool' : ['2.4.6',
-
'e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3'],
- 'swig' : ['2.0.12',
-
'65e13f22a60cecd7279c59882ff8ebe1ffe34078e85c602821a541817a4317f7'],
- },
- '1.8' : {
- 'autoconf' : ['2.69',
-
'954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'],
- 'libtool' : ['2.4.3',
-
'36b4881c1843d7585de9c66c4c3d9a067ed3a3f792bc670beba21f5a4960acdf'],
- 'swig' : ['2.0.9',
-
'586954000d297fafd7e91d1ad31089cc7e249f658889d11a44605d3662569539'],
- },
-}
+ }
+tool_versions['1.11'] = tool_versions['1.10']
+tool_versions['1.12'] = tool_versions['1.10']
+tool_versions['1.13'] = tool_versions['1.10']
+tool_versions['trunk'] = tool_versions['1.10']
# The version that is our current recommended release
# ### TODO: derive this from svn_version.h; see ../../build/getversion.py
