huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add version number to java client build (#2776)

This commit is contained in:
Andrew Stanton-Nurse 2018-08-09 12:10:20 -07:00 committed by GitHub
parent 5843b5415b
commit da35d1f4e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build/repo.targets
View File

@ -17,8 +17,10 @@
<HasJdk Condition="Exists('$(JavacPath)')">true</HasJdk>
<!-- Pass the Java Package Version down to Gradle -->
<GradleOptions>-PpackageVersion="$(JavaPackageVersion)"</GradleOptions>
<!-- Disable gradle daemon on CI since the CI seems to try to wait for the daemon to shut down, which it doesn't do :) -->
<GradleOptions Condition="'$(CI)' == 'true'">-Dorg.gradle.daemon=false</GradleOptions>
<GradleOptions Condition="'$(CI)' == 'true'">$(GradleOptions) -Dorg.gradle.daemon=false</GradleOptions>
</PropertyGroup>
<PropertyGroup>
@ -48,6 +50,7 @@
<Target Name="RunJavaTests" Condition="'$(HasJdk)' == 'true'">
<Message Text="Running Java client tests" Importance="high" />
<Message Text="> gradlew $(GradleOptions) test" Importance="high" />
<Exec Command="./gradlew $(GradleOptions) test" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" IgnoreStandardErrorWarningFormat="true" />
</Target>
@ -109,6 +112,7 @@
<Target Name="BuildJavaClient" Condition="'$(HasJdk)' == 'true'" DependsOnTargets="GetJavaArtifactInfo">
<Message Text="Building Java client" Importance="high" />
<Message Text="> gradlew $(GradleOptions) compileJava" Importance="high" />
<Exec Command="./gradlew $(GradleOptions) compileJava" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" />
</Target>
@ -126,14 +130,15 @@
</Target>
<ItemGroup>
<Jars Include="signalr-$(JavaClientVersion).jar;signalr-$(JavaClientVersion)-javadoc.jar;signalr-$(JavaClientVersion)-sources.jar;" />
<PomFile Include="signalr-$(JavaClientVersion).pom" />
<Jars Include="signalr-$(JavaPackageVersion).jar;signalr-$(JavaPackageVersion)-javadoc.jar;signalr-$(JavaPackageVersion)-sources.jar;" />
<PomFile Include="signalr-$(JavaPackageVersion).pom" />
<JavaBuildFiles Include="@(Jars);@(PomFile)"/>
</ItemGroup>
<Target Name="PackJavaClient" Condition="'$(HasJdk)' == 'true'">
<Message Text="Packing Java client" Importance="high" />
<Exec Command="./gradlew $(GradleOptions) jar sourceJar javadocJar generatePOM" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" />
<Message Text="> gradlew $(GradleOptions) createPackage" Importance="high" />
<Exec Command="./gradlew $(GradleOptions) createPackage" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" />
<Copy SourceFiles="$(RepositoryRoot)clients/java/signalr\build\libs\%(JavaBuildFiles.Identity)" DestinationFolder="$(BuildDir)" />
</Target>

11
clients/java/signalr/build.gradle
View File

@ -4,7 +4,9 @@ plugins {
}
group 'com.microsoft.aspnet'
version '0.1.0-preview1'
// If we're run from outside MSBuild, just assign a bogus dev version.
version project.findProperty('packageVersion') ?: "99.99.99-dev"
sourceCompatibility = 1.8
@ -54,8 +56,7 @@ task generatePOM {
}
}
}
}.writeTo("signalr-0.1.0-preview1.pom")
ant.move file: "signalr-0.1.0-preview1.pom",
todir: "${buildDir}/libs"
}.writeTo("${buildDir}/libs/signalr-${project.version}.pom")
}
task createPackage(dependsOn: [jar,sourceJar,javadocJar,generatePOM])

5
version.props
View File

@ -1,11 +1,14 @@
<Project>
<PropertyGroup>
<VersionPrefix>1.1.0</VersionPrefix>
<JavaClientVersion>0.1.0-preview1</JavaClientVersion>
<JavaVersionPrefix>0.1.0</JavaVersionPrefix>
<VersionSuffix>preview1</VersionSuffix>
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
<BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
<JavaPackageVersion>$(JavaVersionPrefix)-$(VersionSuffix)-$(BuildNumber)</JavaPackageVersion>
<JavaPackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(JavaVersionPrefix)-$(VersionSuffix)</JavaPackageVersion>
<JavaPackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(JavaVersionPrefix)-$(VersionSuffix)-final</JavaPackageVersion>
<FeatureBranchVersionPrefix Condition="'$(FeatureBranchVersionPrefix)' == ''">a-</FeatureBranchVersionPrefix>
<VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(FeatureBranchVersionSuffix)' != ''">$(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-'))</VersionSuffix>
<VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>