forgetest1
/
antlr
forked from jasder/antlr
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Merge pull request #1503 from parrt/fix-some-version-numbers 

tweak
This commit is contained in:
Terence Parr 2016-12-13 16:11:26 -08:00 committed by GitHub
parent caa500094f 81aaeb199b
commit 57d8cc2e0c
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs
View File

@ -42,8 +42,8 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("4.5.3.0")] [assembly: AssemblyVersion("4.6.0")]
#if !COMPACT #if !COMPACT
[assembly: AssemblyFileVersion("4.5.3.0")] [assembly: AssemblyFileVersion("4.6.0")]
[assembly: AssemblyInformationalVersion("4.5.3.0")] [assembly: AssemblyInformationalVersion("4.6.0")]
#endif #endif

2
runtime/Cpp/VERSION
View File

@ -1 +1 @@
4.5.4 4.6

4
runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake
View File

@ -65,8 +65,8 @@ set(ANTLR4CPP_EXTERNAL_ROOT ${CMAKE_BINARY_DIR}/externals/antlr4cpp)
# external repository # external repository
# GIT_REPOSITORY https://github.com/antlr/antlr4.git # GIT_REPOSITORY https://github.com/antlr/antlr4.git
set(ANTLR4CPP_EXTERNAL_REPO "https://github.com/DanMcLaughlin/antlr4.git") set(ANTLR4CPP_EXTERNAL_REPO "https://github.com/antlr/antlr4.git")
set(ANTLR4CPP_EXTERNAL_TAG "v4.5.4") set(ANTLR4CPP_EXTERNAL_TAG "4.6")
if(NOT EXISTS "${ANTLR4CPP_JAR_LOCATION}") if(NOT EXISTS "${ANTLR4CPP_JAR_LOCATION}")
message(FATAL_ERROR "Unable to find antlr tool. ANTLR4CPP_JAR_LOCATION:${ANTLR4CPP_JAR_LOCATION}") message(FATAL_ERROR "Unable to find antlr tool. ANTLR4CPP_JAR_LOCATION:${ANTLR4CPP_JAR_LOCATION}")

2
runtime/Cpp/runtime/src/RuntimeMetaData.cpp
View File

@ -7,7 +7,7 @@
using namespace antlr4; using namespace antlr4;
const std::string RuntimeMetaData::VERSION = "4.5.4"; const std::string RuntimeMetaData::VERSION = "4.6";
std::string RuntimeMetaData::getRuntimeVersion() { std::string RuntimeMetaData::getRuntimeVersion() {
return VERSION; return VERSION;