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

Working on development version 4.2.1

This commit is contained in:
Sam Harwell 2014-03-25 14:48:45 -05:00
parent a14b197714
commit a6daadf360
11 changed files with 56 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
build/build.ps1
View File

@ -1,3 +1,7 @@
param (
[switch]$Debug
)
# build the solutions
$SolutionPath = "..\Runtime\CSharp\Antlr4.sln"
$CF35SolutionPath = "..\Runtime\CSharp\Antlr4.VS2008.sln"
@ -8,33 +12,38 @@ if (!(Test-Path $SolutionPath)) {
exit 1
}
$BuildConfig = "Release"
$DebugBuild = false
$AntlrVersion = "4.2.0-alpha001"
. .\version.ps1
If ($Debug) {
$BuildConfig = 'Debug'
} Else {
$BuildConfig = 'Release'
}
# this is configured here for path checking, but also in the .props and .targets files
[xml]$pom = Get-Content "..\tool\pom.xml"
$CSharpToolVersionNodeInfo = Select-Xml "/mvn:project/mvn:version" -Namespace @{mvn='http://maven.apache.org/POM/4.0.0'} $pom
$CSharpToolVersion = $CSharpToolVersionNodeInfo.Node.InnerText.trim()
# build the main project
$msbuild = "C:\Windows\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe"
$msbuild = "$env:windir\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe"
&$msbuild /nologo /m /nr:false /t:rebuild /p:Configuration=$BuildConfig $SolutionPath
&$msbuild '/nologo' '/m' '/nr:false' '/t:rebuild' "/p:Configuration=$BuildConfig" $SolutionPath
if ($LASTEXITCODE -ne 0) {
echo "Build failed, aborting!"
exit $p.ExitCode
}
# build the compact framework project
$msbuild = "C:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
$msbuild = "$env:windir\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
&$msbuild /nologo /m /nr:false /t:rebuild /p:Configuration=$BuildConfig $CF35SolutionPath
&$msbuild '/nologo' '/m' '/nr:false' '/t:rebuild' "/p:Configuration=$BuildConfig" $CF35SolutionPath
if ($LASTEXITCODE -ne 0) {
echo ".NET 3.5 Compact Framework Build failed, aborting!"
exit $p.ExitCode
}
if (-not (Test-Path nuget)) {
if (-not (Test-Path 'nuget')) {
mkdir "nuget"
}

13
build/push.ps1
View File

@ -1,5 +1,10 @@
$AntlrVersion = "4.2.0-alpha001"
. .\version.ps1
..\runtime\CSharp\.nuget\NuGet.exe push .\nuget\Antlr4.Runtime.$AntlrVersion.nupkg
..\runtime\CSharp\.nuget\NuGet.exe push .\nuget\Antlr4.$AntlrVersion.nupkg
..\runtime\CSharp\.nuget\NuGet.exe push .\nuget\Antlr4.VS2008.$AntlrVersion.nupkg
If ($AntlrVersion.EndsWith('-dev')) {
Write-Host "Cannot push development version '$AntlrVersion' to NuGet."
Exit 1
}
..\runtime\CSharp\.nuget\NuGet.exe push ".\nuget\Antlr4.Runtime.$AntlrVersion.nupkg"
..\runtime\CSharp\.nuget\NuGet.exe push ".\nuget\Antlr4.$AntlrVersion.nupkg"
..\runtime\CSharp\.nuget\NuGet.exe push ".\nuget\Antlr4.VS2008.$AntlrVersion.nupkg"

1
build/version.ps1 Normal file
View File

@ -0,0 +1 @@
$AntlrVersion = "4.2.1-dev"

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

@ -79,6 +79,6 @@ using System.Runtime.InteropServices;
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("4.2.0.0")]
#if !NET_CF
[assembly: AssemblyFileVersion("4.2.0.0")]
[assembly: AssemblyInformationalVersion("4.2.0-dev")]
[assembly: AssemblyFileVersion("4.2.1.0")]
[assembly: AssemblyInformationalVersion("4.2.1-dev")]
#endif

17
runtime/CSharp/Antlr4.sln
View File

@ -1,6 +1,8 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
# Visual Studio 2013
VisualStudioVersion = 12.0.30110.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.v4.5", "Antlr4.Runtime\Antlr4.Runtime.v4.5.csproj", "{E1D192DE-5347-48C4-A9F4-A8CBA2AF3869}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{47C0086D-577C-43DA-ADC7-544F27656E45}"
@ -40,6 +42,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Test.Portabl
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4BuildTasks.v3.5", "Antlr4BuildTasks\Antlr4BuildTasks.v3.5.csproj", "{0D3D20E9-3341-4449-80E7-76A4534F0E55}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{4CE79A54-058D-4940-875E-7F6AA9922A7D}"
ProjectSection(SolutionItems) = preProject
..\..\build\Antlr4.nuspec = ..\..\build\Antlr4.nuspec
..\..\build\Antlr4.Runtime.nuspec = ..\..\build\Antlr4.Runtime.nuspec
..\..\build\Antlr4.VS2008.nuspec = ..\..\build\Antlr4.VS2008.nuspec
..\..\build\build.ps1 = ..\..\build\build.ps1
..\..\build\push.ps1 = ..\..\build\push.ps1
..\..\build\version.ps1 = ..\..\build\version.ps1
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -106,4 +118,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{4CE79A54-058D-4940-875E-7F6AA9922A7D} = {47C0086D-577C-43DA-ADC7-544F27656E45}
EndGlobalSection
EndGlobal

2
runtime/CSharp/Antlr4BuildTasks/Antlr4.v3.5.props
View File

@ -4,6 +4,6 @@
<!-- Folder containing Antlr4BuildTasks.v3.5.dll -->
<Antlr4BuildTaskPath>.</Antlr4BuildTaskPath>
<!-- Path to the ANTLR tool itself -->
<Antlr4ToolPath>..\tools\antlr4-csharp-4.2-SNAPSHOT-complete.jar</Antlr4ToolPath>
<Antlr4ToolPath>..\tools\antlr4-csharp-4.2.1-SNAPSHOT-complete.jar</Antlr4ToolPath>
</PropertyGroup>
</Project>

2
runtime/CSharp/Antlr4BuildTasks/Antlr4.v3.5.targets
View File

@ -49,7 +49,7 @@
<PropertyGroup>
<Antlr4BuildTaskLocation Condition="'$(Antlr4BuildTaskPath)'==''">$(MSBuildBinPath)</Antlr4BuildTaskLocation>
<Antlr4BuildTaskLocation Condition="'$(Antlr4BuildTaskPath)'!=''">$(Antlr4BuildTaskPath)</Antlr4BuildTaskLocation>
<Antlr4ToolLocation Condition="'$(Antlr4ToolPath)'==''">$(MSBuildBinPath)\Antlr4\antlr4-csharp-4.2-SNAPSHOT-complete.jar</Antlr4ToolLocation>
<Antlr4ToolLocation Condition="'$(Antlr4ToolPath)'==''">$(MSBuildBinPath)\Antlr4\antlr4-csharp-4.2.1-SNAPSHOT-complete.jar</Antlr4ToolLocation>
<Antlr4ToolLocation Condition="'$(Antlr4ToolPath)'!=''">$(Antlr4ToolPath)</Antlr4ToolLocation>
<Antlr4JavaVendor Condition="'$(Antlr4JavaVendor)'==''">JavaSoft</Antlr4JavaVendor>

2
runtime/CSharp/Antlr4BuildTasks/Antlr4.v4.0.props
View File

@ -4,6 +4,6 @@
<!-- Folder containing Antlr4BuildTasks.v4.0.dll -->
<Antlr4BuildTaskPath>.</Antlr4BuildTaskPath>
<!-- Path to the ANTLR tool itself -->
<Antlr4ToolPath>..\tools\antlr4-csharp-4.2-SNAPSHOT-complete.jar</Antlr4ToolPath>
<Antlr4ToolPath>..\tools\antlr4-csharp-4.2.1-SNAPSHOT-complete.jar</Antlr4ToolPath>
</PropertyGroup>
</Project>

2
runtime/CSharp/Antlr4BuildTasks/Antlr4.v4.0.targets
View File

@ -47,7 +47,7 @@
<PropertyGroup>
<Antlr4BuildTaskLocation Condition="'$(Antlr4BuildTaskPath)'==''">$(MSBuildBinPath)</Antlr4BuildTaskLocation>
<Antlr4BuildTaskLocation Condition="'$(Antlr4BuildTaskPath)'!=''">$(Antlr4BuildTaskPath)</Antlr4BuildTaskLocation>
<Antlr4ToolLocation Condition="'$(Antlr4ToolPath)'==''">$(MSBuildBinPath)\Antlr4\antlr4-csharp-4.2-SNAPSHOT-complete.jar</Antlr4ToolLocation>
<Antlr4ToolLocation Condition="'$(Antlr4ToolPath)'==''">$(MSBuildBinPath)\Antlr4\antlr4-csharp-4.2.1-SNAPSHOT-complete.jar</Antlr4ToolLocation>
<Antlr4ToolLocation Condition="'$(Antlr4ToolPath)'!=''">$(Antlr4ToolPath)</Antlr4ToolLocation>
<Antlr4JavaVendor Condition="'$(Antlr4JavaVendor)'==''">JavaSoft</Antlr4JavaVendor>

4
runtime/CSharp/Antlr4BuildTasks/Properties/AssemblyInfo.cs
View File

@ -69,5 +69,5 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("4.2.0.0")]
[assembly: AssemblyFileVersion("4.2.0.0")]
[assembly: AssemblyInformationalVersion("4.2.0-dev")]
[assembly: AssemblyFileVersion("4.2.1.0")]
[assembly: AssemblyInformationalVersion("4.2.1-dev")]

10
tool/pom.xml
View File

@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.tunnelvisionlabs</groupId>
<artifactId>antlr4-csharp</artifactId>
<version>4.2-SNAPSHOT</version>
<version>4.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>ANTLR 4 Target C#</name>
@ -76,25 +76,25 @@
<dependency>
<groupId>com.tunnelvisionlabs</groupId>
<artifactId>antlr4</artifactId>
<version>4.2</version>
<version>4.2.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.tunnelvisionlabs</groupId>
<artifactId>antlr4-runtime</artifactId>
<version>4.2</version>
<version>4.2.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr-runtime</artifactId>
<version>3.5.1</version>
<version>3.5.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>ST4</artifactId>
<version>4.0.7</version>
<version>4.0.8</version>
<scope>compile</scope>
</dependency>
<dependency>