From c92ddcbd06fd0298084f29026996c857e80c219b Mon Sep 17 00:00:00 2001 From: Terence Parr Date: Sat, 30 Jan 2016 09:54:47 -0800 Subject: [PATCH] update version to 4.5.2 in source / packaging stuff. --- doc/releasing-antlr.md | 15 +++++---------- .../Antlr4.Runtime/Properties/AssemblyInfo.cs | 6 +++--- .../src/org/antlr/v4/runtime/RuntimeMetaData.java | 2 +- runtime/JavaScript/src/antlr4/Recognizer.js | 2 +- runtime/JavaScript/src/antlr4/package.json | 2 +- runtime/Python2/setup.py | 4 ++-- runtime/Python2/src/antlr4/Recognizer.py | 2 +- runtime/Python3/setup.py | 4 ++-- runtime/Python3/src/antlr4/Recognizer.py | 2 +- .../org/antlr/v4/codegen/target/CSharpTarget.java | 2 +- .../antlr/v4/codegen/target/JavaScriptTarget.java | 2 +- .../antlr/v4/codegen/target/Python2Target.java | 2 +- .../antlr/v4/codegen/target/Python3Target.java | 2 +- 13 files changed, 21 insertions(+), 26 deletions(-) diff --git a/doc/releasing-antlr.md b/doc/releasing-antlr.md index 8131f8c9b..b4293c7c2 100644 --- a/doc/releasing-antlr.md +++ b/doc/releasing-antlr.md @@ -2,13 +2,6 @@ ## Github -Create a release candidate tag 4.x-rc-1 or full 4.5 tag - -```bash -git tag -a 4.5 -m 'ANTLR final release 4.5' -git push origin 4.5 -``` - Create a pre-release or full release at github; [Example 4.5-rc-1](https://github.com/antlr/antlr4/releases/tag/4.5-rc-1). ## Bump version @@ -20,7 +13,7 @@ Edit the repository looking for 4.5 or whatever and update it. Bump version in t * runtime/Python2/src/antlr4/Recognizer.py * runtime/Python3/setup.py * runtime/Python3/src/antlr4/Recognizer.py - * runtime/CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs + * runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs * runtime/JavaScript/src/antlr4/package.json * runtime/JavaScript/src/antlr4/Recognizer.js * tool/src/org/antlr/v4/codegen/target/CSharpTarget.java @@ -89,8 +82,10 @@ The maven deploy lifecycle phased deploys the artifacts and the poms for the ANT mvn deploy -DskipTests ``` +With JDK 1.7 (not 6 or 8), do this: + ```bash -mvn release:prepare +mvn release:prepare -Darguments="-DskipTests" ``` It will start out by asking you the version number: @@ -111,7 +106,7 @@ What is the new development version for "ANTLR 4"? (org.antlr:antlr4-master) 4.5 Maven will go through your pom.xml files to update versions from 4.5.2-SNAPSHOT to 4.5.2 for release and then to 4.5.3-SNAPSHOT after release, which is done with: ```bash -mvn release:perform +mvn release:perform -Darguments="-DskipTests" ``` Maven will use git to push pom.xml changes. (big smile) diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs b/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs index 15edab194..e74711082 100644 --- a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs +++ b/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs @@ -67,8 +67,8 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("4.5.1.0")] +[assembly: AssemblyVersion("4.5.2.0")] #if !COMPACT -[assembly: AssemblyFileVersion("4.5.1.0")] -[assembly: AssemblyInformationalVersion("4.5.1-dev")] +[assembly: AssemblyFileVersion("4.5.2.0")] +[assembly: AssemblyInformationalVersion("4.5.2.0")] #endif diff --git a/runtime/Java/src/org/antlr/v4/runtime/RuntimeMetaData.java b/runtime/Java/src/org/antlr/v4/runtime/RuntimeMetaData.java index bf67cf029..aa1375edb 100644 --- a/runtime/Java/src/org/antlr/v4/runtime/RuntimeMetaData.java +++ b/runtime/Java/src/org/antlr/v4/runtime/RuntimeMetaData.java @@ -91,7 +91,7 @@ public class RuntimeMetaData { * omitted. * */ - public static final String VERSION = "4.5.1"; + public static final String VERSION = "4.5.2"; /** * Gets the currently executing version of the ANTLR 4 runtime library. diff --git a/runtime/JavaScript/src/antlr4/Recognizer.js b/runtime/JavaScript/src/antlr4/Recognizer.js index fecc44140..f7a39ebc8 100644 --- a/runtime/JavaScript/src/antlr4/Recognizer.js +++ b/runtime/JavaScript/src/antlr4/Recognizer.js @@ -45,7 +45,7 @@ Recognizer.ruleIndexMapCache = {}; Recognizer.prototype.checkVersion = function(toolVersion) { - var runtimeVersion = "4.5.1"; + var runtimeVersion = "4.5.2"; if (runtimeVersion!==toolVersion) { console.log("ANTLR runtime and generated code versions disagree: "+runtimeVersion+"!="+toolVersion); } diff --git a/runtime/JavaScript/src/antlr4/package.json b/runtime/JavaScript/src/antlr4/package.json index f192da1c0..c5f4cd608 100644 --- a/runtime/JavaScript/src/antlr4/package.json +++ b/runtime/JavaScript/src/antlr4/package.json @@ -1,6 +1,6 @@ { "name": "antlr4", - "version": "4.5.1", + "version": "4.5.2", "description": "JavaScript runtime for ANTLR4", "main": "src/antlr4/index.js", "repository": "antlr/antlr4.git", diff --git a/runtime/Python2/setup.py b/runtime/Python2/setup.py index 0eeb03c5f..42dbc86b5 100644 --- a/runtime/Python2/setup.py +++ b/runtime/Python2/setup.py @@ -2,12 +2,12 @@ from distutils.core import setup setup( name='antlr4-python2-runtime', - version='4.5.2', + version='4.5.2.1', packages=['antlr4', 'antlr4.atn', 'antlr4.dfa', 'antlr4.tree', 'antlr4.error', 'antlr4.xpath'], package_dir={'': 'src'}, url='http://www.antlr.org', license='BSD', author='Eric Vergnaud, Terence Parr, Sam Harwell', author_email='eric.vergnaud@wanadoo.fr', - description='ANTLR 4.5.2 runtime for Python 2.7.6' + description='ANTLR 4.5.2.1 runtime for Python 2.7.6' ) diff --git a/runtime/Python2/src/antlr4/Recognizer.py b/runtime/Python2/src/antlr4/Recognizer.py index 35388f939..c82760e59 100644 --- a/runtime/Python2/src/antlr4/Recognizer.py +++ b/runtime/Python2/src/antlr4/Recognizer.py @@ -55,7 +55,7 @@ class Recognizer(object): return major, minor def checkVersion(self, toolVersion): - runtimeVersion = "4.5.2" + runtimeVersion = "4.5.2.1" rvmajor, rvminor = self.extractVersion(runtimeVersion) tvmajor, tvminor = self.extractVersion(toolVersion) if rvmajor!=tvmajor or rvminor!=tvminor: diff --git a/runtime/Python3/setup.py b/runtime/Python3/setup.py index d9de10715..65cdd8d27 100644 --- a/runtime/Python3/setup.py +++ b/runtime/Python3/setup.py @@ -2,12 +2,12 @@ from distutils.core import setup setup( name='antlr4-python3-runtime', - version='4.5.2', + version='4.5.2.1', packages=['antlr4', 'antlr4.atn', 'antlr4.dfa', 'antlr4.tree', 'antlr4.error', 'antlr4.xpath'], package_dir={'': 'src'}, url='http://www.antlr.org', license='BSD', author='Eric Vergnaud, Terence Parr, Sam Harwell', author_email='eric.vergnaud@wanadoo.fr', - description='ANTLR 4.5.2 runtime for Python 3.4.0' + description='ANTLR 4.5.2.1 runtime for Python 3.4.0' ) diff --git a/runtime/Python3/src/antlr4/Recognizer.py b/runtime/Python3/src/antlr4/Recognizer.py index 5212cbf9a..a887504f4 100644 --- a/runtime/Python3/src/antlr4/Recognizer.py +++ b/runtime/Python3/src/antlr4/Recognizer.py @@ -58,7 +58,7 @@ class Recognizer(object): return major, minor def checkVersion(self, toolVersion): - runtimeVersion = "4.5.2" + runtimeVersion = "4.5.2.1" rvmajor, rvminor = self.extractVersion(runtimeVersion) tvmajor, tvminor = self.extractVersion(toolVersion) if rvmajor!=tvmajor or rvminor!=tvminor: diff --git a/tool/src/org/antlr/v4/codegen/target/CSharpTarget.java b/tool/src/org/antlr/v4/codegen/target/CSharpTarget.java index 09df962cc..bfebe4b7e 100644 --- a/tool/src/org/antlr/v4/codegen/target/CSharpTarget.java +++ b/tool/src/org/antlr/v4/codegen/target/CSharpTarget.java @@ -51,7 +51,7 @@ public class CSharpTarget extends Target { @Override public String getVersion() { - return "4.5.1"; // crossing fingers that it's close enough. + return "4.5.2"; // crossing fingers that it's close enough. } @Override diff --git a/tool/src/org/antlr/v4/codegen/target/JavaScriptTarget.java b/tool/src/org/antlr/v4/codegen/target/JavaScriptTarget.java index 26fa4fe0d..71926acfb 100644 --- a/tool/src/org/antlr/v4/codegen/target/JavaScriptTarget.java +++ b/tool/src/org/antlr/v4/codegen/target/JavaScriptTarget.java @@ -74,7 +74,7 @@ public class JavaScriptTarget extends Target { @Override public String getVersion() { - return "4.5.1"; + return "4.5.2"; } public Set getBadWords() { diff --git a/tool/src/org/antlr/v4/codegen/target/Python2Target.java b/tool/src/org/antlr/v4/codegen/target/Python2Target.java index 36249d59a..efa5d2ce9 100644 --- a/tool/src/org/antlr/v4/codegen/target/Python2Target.java +++ b/tool/src/org/antlr/v4/codegen/target/Python2Target.java @@ -117,7 +117,7 @@ public class Python2Target extends Target { @Override public String getVersion() { - return "4.5.2"; + return "4.5.2.1"; } public Set getBadWords() { diff --git a/tool/src/org/antlr/v4/codegen/target/Python3Target.java b/tool/src/org/antlr/v4/codegen/target/Python3Target.java index d07247fc4..68d7a162c 100644 --- a/tool/src/org/antlr/v4/codegen/target/Python3Target.java +++ b/tool/src/org/antlr/v4/codegen/target/Python3Target.java @@ -119,7 +119,7 @@ public class Python3Target extends Target { @Override public String getVersion() { - return "4.5.2"; + return "4.5.2.1"; } /** Avoid grammar symbols in this set to prevent conflicts in gen'd code. */