Skip to content

[xa-prep-tasks] implemented GitCommitTime task #734

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 1 commit into from
Aug 10, 2017
Merged

[xa-prep-tasks] implemented GitCommitTime task #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions build-tools/android-toolchain/android-toolchain.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,13 @@
</Target>
<Target Name="_SetMxeToolchainMakefileTimeToLastCommitTimestamp"
Condition=" '$(NeedMxe)' == 'true' And ($(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':mxe-Win64:')) Or $(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':mxe-Win32:')))">
<Exec
Command="touch -m -t `git log -1 --format=%25cd --date=format-local:%25Y%25m%25d%25H%25M.%25S` Makefile"
<GitCommitTime
WorkingDirectory="..\..\external\mxe"
/>
ToolPath="$(GitToolPath)"
ToolExe="$(GitToolExe)">
<Output TaskParameter="Time" PropertyName="_MxeCommitTime" />
</GitCommitTime>
<Touch Files="..\..\external\mxe\Makefile" Time="$(_MxeCommitTime)" />
</Target>
<ItemGroup>
<_AndroidMxeToolchain Include="$(MingwCommandPrefix32)" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':mxe-Win32:'))" />
Expand Down
9 changes: 6 additions & 3 deletions build-tools/libzip/libzip.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@
<Target Name="Build" DependsOnTargets="$(BuildDependsOn)" />
<Target Name="Clean" />
<Target Name="_SetCMakeListsTxtTimeToLastCommitTimestamp">
<Exec
Command="touch -m -t `git log -1 --format=%25cd --date=format-local:%25Y%25m%25d%25H%25M.%25S` CMakeLists.txt"
<GitCommitTime
WorkingDirectory="$(LibZipSourceFullPath)"
/>
ToolPath="$(GitToolPath)"
ToolExe="$(GitToolExe)">
<Output TaskParameter="Time" PropertyName="_LibZipCommitTime" />
</GitCommitTime>
<Touch Files="$(LibZipSourceFullPath)\CMakeLists.txt" Time="$(_LibZipCommitTime)" />
</Target>
<Target Name="_Configure"
Condition=" '@(_LibZipTarget)' != '' "
Expand Down
19 changes: 13 additions & 6 deletions build-tools/mono-runtimes/mono-runtimes.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\xa-prep-tasks.dll" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitTime" />
<Target Name="Build" DependsOnTargets="$(BuildDependsOn)" />
<PropertyGroup>
<_SourceTopDir>..\..</_SourceTopDir>
Expand Down Expand Up @@ -116,14 +117,20 @@
/>
</ItemGroup>
<Target Name="_SetAutogenShTimeToLastCommitTimestamp">
<Exec
Command="touch -m -t `git log -1 --format=%25cd --date=format-local:%25Y%25m%25d%25H%25M.%25S` autogen.sh"
<GitCommitTime
WorkingDirectory="$(MonoSourceFullPath)"
/>
<Exec
Command="touch -m -t `git log -1 --format=%25cd --date=format-local:%25Y%25m%25d%25H%25M.%25S` Makefile.config.in"
ToolPath="$(GitToolPath)"
ToolExe="$(GitToolExe)">
<Output TaskParameter="Time" PropertyName="_MonoCommitTime" />
</GitCommitTime>
<Touch Files="$(MonoSourceFullPath)\autogen.sh" Time="$(_MonoCommitTime)" />
<GitCommitTime
WorkingDirectory="$(LlvmSourceFullPath)"
/>
ToolPath="$(GitToolPath)"
ToolExe="$(GitToolExe)">
<Output TaskParameter="Time" PropertyName="_LlvmCommitTime" />
</GitCommitTime>
<Touch Files="$(LlvmSourceFullPath)\Makefile.config.in" Time="$(_LlvmCommitTime)" />
</Target>
<Target Name="_PrepareLlvmItems">
<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions build-tools/scripts/RequiredPrograms.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\xa-prep-tasks.dll" TaskName="Xamarin.Android.BuildTools.PrepTasks.DownloadUri" />
<UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\xa-prep-tasks.dll" TaskName="Xamarin.Android.BuildTools.PrepTasks.PrepareInstall" />
<UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\xa-prep-tasks.dll" TaskName="Xamarin.Android.BuildTools.PrepTasks.Which" />
<UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\xa-prep-tasks.dll" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitTime" />
<Target Name="CheckForRequiredPrograms"
Condition=" '@(RequiredProgram)' != '' "
Inputs="@(RequiredProgram)"
Expand Down
1 change: 1 addition & 0 deletions build-tools/scripts/XAVersionInfo.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\xa-prep-tasks.dll" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitBranch" />
<UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\xa-prep-tasks.dll" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitHash" />
<UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\xa-prep-tasks.dll" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitsInRange" />
<UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\xa-prep-tasks.dll" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitTime" />
<Target Name="GetXAVersionInfo">
<GitBlame
FileName="$(XamarinAndroidSourcePath)\Configuration.props"
Expand Down
46 changes: 46 additions & 0 deletions build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitCommitTime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
using System;

using Microsoft.Build.Framework;

namespace Xamarin.Android.BuildTools.PrepTasks
{
public sealed class GitCommitTime : Git
{
[Output]
public string Time { get; set; }

protected override bool LogTaskMessages {
get { return false; }
}

public GitCommitTime ()
{
}

public override bool Execute ()
{
Log.LogMessage (MessageImportance.Low, $"Task {nameof (GitCommitTime)}");
Log.LogMessage (MessageImportance.Low, $" {nameof (WorkingDirectory)}: {WorkingDirectory.ItemSpec}");

base.Execute ();

Log.LogMessage (MessageImportance.Low, $" [Output] {nameof (Time)}: {Time}");

return !Log.HasLoggedErrors;
}

protected override string GenerateCommandLineCommands ()
{
//NOTE: this command needs to return a string that is valid to pass to DateTime.Parse()
// The <Touch> MSBuild task requires this: https://docs.microsoft.com/en-us/visualstudio/msbuild/touch-task
return "log -1 --format=%cd --date=format-local:\"%Y/%m/%d %H:%M:%S\"";
}

protected override void LogEventsFromTextOutput (string singleLine, MessageImportance messageImportance)
{
if (string.IsNullOrEmpty (singleLine))
return;
Time = singleLine;
}
}
}
3 changes: 2 additions & 1 deletion build-tools/xa-prep-tasks/xa-prep-tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -41,6 +41,7 @@
<Compile Include="Xamarin.Android.BuildTools.PrepTasks\Git.cs" />
<Compile Include="Xamarin.Android.BuildTools.PrepTasks\GitBranch.cs" />
<Compile Include="Xamarin.Android.BuildTools.PrepTasks\GitCommitHash.cs" />
<Compile Include="Xamarin.Android.BuildTools.PrepTasks\GitCommitTime.cs" />
<Compile Include="Xamarin.Android.BuildTools.PrepTasks\HashFileContents.cs" />
<Compile Include="Xamarin.Android.BuildTools.PrepTasks\PathToolTask.cs" />
<Compile Include="Xamarin.Android.BuildTools.PrepTasks\SystemUnzip.cs" />
Expand Down
9 changes: 6 additions & 3 deletions src/sqlite-xamarin/sqlite-xamarin.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="_SetReadmeTimeToLastCommitTimestamp">
<Exec
Command="touch -m -t `git log -1 --format=%25cd --date=format-local:%25Y%25m%25d%25H%25M.%25S` README.version"
<GitCommitTime
WorkingDirectory="$(SqliteSourceFullPath)"
/>
ToolPath="$(GitToolPath)"
ToolExe="$(GitToolExe)">
<Output TaskParameter="Time" PropertyName="_SqliteCommitTime" />
</GitCommitTime>
<Touch Files="$(SqliteSourceFullPath)\README.version" Time="$(_SqliteCommitTime)" />
</Target>
<ItemGroup>
<!-- build outputs include (if enabled):
Expand Down