Skip to content

Gem and command line packaging #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 19, 2014
Merged

Gem and command line packaging #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2a83fa
Added nuget command line package
Jun 7, 2014
c1dad6f
Automatically package Gem, will try and execute but continue if it fa…
Jun 7, 2014
d180fa6
Fixing gem (hopefully) and renaming chocolatey package
Jun 11, 2014
cc44bcd
Try to get build working
Jun 14, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,4 @@ Thumbs.db
Desktop.ini

_NCrunch_GitVersion
NuGetCommandLineBuild/
6 changes: 3 additions & 3 deletions Build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set framework=v4.0.30319

"%SystemDrive%\Windows\Microsoft.NET\Framework\%framework%\MSBuild.exe" "%~dp0GitVersion.sln"

mkdir "%~dp0GitVersion\bin\Intermediate"
cp "%~dp0GitVersion\bin\Debug\GitVersion.exe" "%~dp0GitVersion\bin\Intermediate\GitVersion.exe"
mkdir "%~dp0GitVersionExe\bin\Intermediate"
cp "%~dp0GitVersionExe\bin\Debug\GitVersion.exe" "%~dp0GitVersionExe\bin\Intermediate\GitVersion.exe"

"%~dp0GitVersion\bin\Intermediate\GitVersion.exe" /l console /output buildserver /updateAssemblyInfo /proj "%~dp0GitVersion.sln"
"%~dp0GitVersionExe\bin\Intermediate\GitVersion.exe" /l console /output buildserver /updateAssemblyInfo /proj "%~dp0GitVersion.sln"
2 changes: 1 addition & 1 deletion GitVersionExe/GemAssets/gitversion.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Gem::Specification.new do |spec|
spec.platform = Gem::Platform::RUBY
spec.name = 'gitversion'
spec.licenses = ['MIT']
spec.version = '0.20.0'
spec.version = '$version$'
spec.summary = 'Derives SemVer information from a repository following GitFlow or GitHubFlow.'
spec.description = <<-EOF
Derives SemVer information from a repository following GitFlow or GitHubFlow.
Expand Down
50 changes: 49 additions & 1 deletion GitVersionExe/GitVersionExe.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
<None Include="NugetAssets\chocolateyUninstall.ps1">
<SubType>Designer</SubType>
</None>
<None Include="NugetAssets\GitVersion.CommandLine.nuspec" />
<None Include="NugetAssets\GitVersion.nuspec">
<SubType>Designer</SubType>
</None>
Expand Down Expand Up @@ -97,24 +98,71 @@
</ItemGroup>
<Delete Files="@(ExeFilesToDelete)" />
</Target>
<UsingTask TaskName="ReplaceFileText" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
<ParameterGroup>
<InputFilename ParameterType="System.String" Required="true" />
<OutputFilename ParameterType="System.String" Required="true" />
<MatchExpression ParameterType="System.String" Required="true" />
<ReplacementText ParameterType="System.String" Required="true" />
</ParameterGroup>
<Task>
<Reference Include="System.Core" />
<Using Namespace="System" />
<Using Namespace="System.IO" />
<Using Namespace="System.Text.RegularExpressions" />
<Code Type="Fragment" Language="cs">
<![CDATA[
File.WriteAllText(
OutputFilename,
Regex.Replace(File.ReadAllText(InputFilename), MatchExpression, ReplacementText)
);
]]>
</Code>
</Task>
</UsingTask>
<Target Name="AfterBuild" DependsOnTargets="Clean">
<!-- NugetExeBuild -->
<MakeDir Directories="$(SolutionDir)NuGetExeBuild" />
<Copy SourceFiles="$(OutputPath)\GitVersion.pdb" DestinationFolder="$(SolutionDir)NuGetExeBuild\Tools" />
<Copy SourceFiles="$(OutputPath)\GitVersion.exe" DestinationFolder="$(SolutionDir)NuGetExeBuild\Tools" />
<Copy SourceFiles="$(ProjectDir)NugetAssets\chocolateyInstall.ps1" DestinationFolder="$(SolutionDir)NuGetExeBuild\Tools" />
<Copy SourceFiles="$(ProjectDir)NugetAssets\chocolateyUninstall.ps1" DestinationFolder="$(SolutionDir)NuGetExeBuild\Tools" />
<Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersion.nuspec" DestinationFolder="$(SolutionDir)NuGetExeBuild" />
<Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersion.Portable.nuspec" DestinationFolder="$(SolutionDir)NuGetExeBuild" />
<PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(SolutionDir)NuGetExeBuild" MetadataAssembly="$(OutputPath)GitVersion.exe" />
<!-- NugetCommandLineBuild -->
<MakeDir Directories="$(SolutionDir)NuGetCommandLineBuild" />
<Copy SourceFiles="$(OutputPath)\GitVersion.pdb" DestinationFolder="$(SolutionDir)NuGetCommandLineBuild\Tools" />
<Copy SourceFiles="$(OutputPath)\GitVersion.exe" DestinationFolder="$(SolutionDir)NuGetCommandLineBuild\Tools" />
<Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersion.CommandLine.nuspec" DestinationFolder="$(SolutionDir)NuGetCommandLineBuild" />
<PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(SolutionDir)NuGetCommandLineBuild" MetadataAssembly="$(OutputPath)GitVersion.exe" />
<!-- Gem -->
<Copy SourceFiles="$(OutputPath)\GitVersion.pdb" DestinationFolder="$(SolutionDir)GemBuild\bin" />
<Copy SourceFiles="$(OutputPath)\GitVersion.exe" DestinationFolder="$(SolutionDir)GemBuild\bin" />
<ItemGroup>
<GemFiles Include="$(ProjectDir)GemAssets\bin*\**\*.*" />
<GemFiles Include="$(ProjectDir)GemAssets\lib*\**\*.*" />
<GemFiles Include="$(ProjectDir)GemAssets\spec*\**\*.*" />
<GemFiles Include="$(ProjectDir)GemAssets\*.gemspec" />
<GemFiles Include="$(ProjectDir)GemAssets\.rspec" />
<GemFiles Include="$(ProjectDir)GemAssets\Guardfile" />
<GemFiles Include="$(ProjectDir)GemAssets\Gemfile" />
</ItemGroup>
<Copy SourceFiles="@(GemFiles)" DestinationFiles="@(GemFiles->'$(SolutionDir)GemBuild\%(RecursiveDir)%(Filename)%(Extension)')" />

<PropertyGroup>
<GemVersion Condition="'$(GitVersion_PreReleaseTag)' == ''">$(GitVersion_MajorMinorPatch)</GemVersion>
<GemVersion Condition="'$(GitVersion_PreReleaseTag)' != ''">$(GitVersion_MajorMinorPatch).$(GitVersion_PreReleaseTag)</GemVersion>
</PropertyGroup>

<ReplaceFileText
InputFilename="$(SolutionDir)GemBuild\gitversion.gemspec"
OutputFilename="$(SolutionDir)GemBuild\gitversion.gemspec"
MatchExpression="\$version\$"
ReplacementText="$(GemVersion)"
Condition="'$(GitVersion_SemVer)' != ''"/>

<Exec Command="gem build gitversion.gemspec" ContinueOnError="True"
WorkingDirectory="$(SolutionDir)GemBuild" Condition="'$(GitVersion_SemVer)' != ''" />
</Target>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
Expand Down
17 changes: 17 additions & 0 deletions GitVersionExe/NugetAssets/GitVersion.CommandLine.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>GitVersion.CommandLine</id>
<version>$version$</version>
<title>GitVersion</title>
<authors>NServiceBus Ltd</authors>
<owners>nservicebus, simoncropp</owners>
<licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>
<projectUrl>http://github.com/Particular/GitVersion</projectUrl>
<iconUrl>https://raw.github.com/Particular/GitVersion/master/Icons/package_icon.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Derives SemVer information from a repository following GitFlow or GitHubFlow.</description>
<language>en-AU</language>
<tags>Git, Versioning, GitVersion, GitFlowVersion, GitFlow, GitHubFlow, SemVer</tags>
</metadata>
</package>
2 changes: 1 addition & 1 deletion GitVersionExe/NugetAssets/GitVersion.nuspec → ...xe/NugetAssets/GitVersion.Portable.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>GitVersion</id>
<id>GitVersion.Portable</id>
<version>$version$</version>
<title>GitVersion</title>
<authors>NServiceBus Ltd</authors>
Expand Down