admin/convoar
1
0
Fork 0
mirror of https://github.com/Misterblue/convoar.git synced 2026-08-14 00:57:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Complete using new version generation integration

Browse Source
This commit is contained in:
Robert Adams
2022-05-02 15:02:14 -06:00
parent c7c8549939
commit 1f9e2600de
9 changed files with 17 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
convoar.sln
+7 -8
View File
@@ -10,6 +10,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Herbal3d.CommonEntitiesConv
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Herbal3d.CommonUtil", "addon-modules\HerbalCommonUtilCS\Herbal3d.CommonUtil.csproj", "{C0DFAC61-6999-4278-855F-0E9BCA2E8625}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7077C142-D972-47D8-BE14-E5417159747E}"
ProjectSection(SolutionItems) = preProject
bin\libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64.so = bin\libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64.so
bin\openjpeg-dotnet-x86_64.dll = bin\openjpeg-dotnet-x86_64.dll
bin\openjpeg-dotnet.dll = bin\openjpeg-dotnet.dll
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -26,14 +33,6 @@ Global
{BD9942A1-315C-4961-B56A-D1770BED83B0}.Release|Any CPU.Build.0 = Release|Any CPU
{BD9942A1-315C-4961-B56A-D1770BED83B0}.Release|x64.ActiveCfg = Release|x64
{BD9942A1-315C-4961-B56A-D1770BED83B0}.Release|x64.Build.0 = Release|x64
{C0A6E265-E59A-4D66-B8F5-145848231484}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C0A6E265-E59A-4D66-B8F5-145848231484}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C0A6E265-E59A-4D66-B8F5-145848231484}.Debug|x64.ActiveCfg = Debug|Any CPU
{C0A6E265-E59A-4D66-B8F5-145848231484}.Debug|x64.Build.0 = Debug|Any CPU
{C0A6E265-E59A-4D66-B8F5-145848231484}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C0A6E265-E59A-4D66-B8F5-145848231484}.Release|Any CPU.Build.0 = Release|Any CPU
{C0A6E265-E59A-4D66-B8F5-145848231484}.Release|x64.ActiveCfg = Release|Any CPU
{C0A6E265-E59A-4D66-B8F5-145848231484}.Release|x64.Build.0 = Release|Any CPU
{1267952C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1267952C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1267952C-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|Any CPU
convoar/Convoar.cs
+4 -14
View File
@@ -39,7 +39,6 @@ namespace org.herbal3d.convoar {
public string contextName; // a unique identifier for this context -- used in filenames, ...
public string version;
public string versionLong;
public string buildDate;
public string buildDateShort;
public string gitCommit;
@@ -47,15 +46,9 @@ namespace org.herbal3d.convoar {
{
stats = null;
contextName = String.Empty;
version = Assembly.GetExecutingAssembly().GetName().Version.ToString();
// A command is added to the pre-build events that generates BuildDate resource:
// echo %date% %time% > "$(ProjectDir)\Resources\BuildDate.txt"
buildDate = Properties.Resources.BuildDate.Trim();
buildDateShort = buildDate.Substring(10, 4) + buildDate.Substring(4, 2) + buildDate.Substring(7, 2);
// A command is added to the pre-build events that generates last commit resource:
// git rev-parse HEAD > "$(ProjectDir)\Resources\GitCommit.txt"
gitCommit = Properties.Resources.GitCommit.Trim();
versionLong = version + "-" + buildDateShort + "-" + gitCommit.Substring(0, 8);
version = VersionInfo.appVersion;
buildDateShort = VersionInfo.buildDate;
versionLong = VersionInfo.longVersion;
}
}
@@ -119,10 +112,7 @@ namespace org.herbal3d.convoar {
}
if (!Globals.parms.Quiet) {
System.Console.WriteLine("Convoar v" + Globals.version
+ " built " + Globals.buildDate
+ " commit " + Globals.gitCommit
);
System.Console.WriteLine("Convoar " + Globals.versionLong);
}
// Validate parameters
convoar/Properties/AssemblyInfo.cs
+4 -4
View File
@@ -1,4 +1,4 @@
using System.Reflection;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("convoar")]
[assembly: AssemblyCopyright("Copyright © 2018")]
[assembly: AssemblyCopyright("Copyright © 2022")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -32,8 +32,8 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.5.0")]
[assembly: AssemblyFileVersion("1.2.5.0")]
[assembly: AssemblyVersion("2.0.1.0")]
[assembly: AssemblyFileVersion("2.0.1.0")]
[assembly: log4net.Config.XmlConfigurator(Watch = true)]
convoar/Properties/Resources.Designer.cs
Generated
-20
View File
@@ -59,25 +59,5 @@ namespace org.herbal3d.convoar.Properties {
resourceCulture = value;
}
}
/// <summary>
/// Looks up a localized string similar to Tue 01/14/2020 8:50:33.77
///.
/// </summary>
internal static string BuildDate {
get {
return ResourceManager.GetString("BuildDate", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to fae1e64c9a193860033db3028f5a2176561255d7
///.
/// </summary>
internal static string GitCommit {
get {
return ResourceManager.GetString("GitCommit", resourceCulture);
}
}
}
}
convoar/Properties/Resources.resx
-6
View File
@@ -118,10 +118,4 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="BuildDate" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\BuildDate.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="GitCommit" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\GitCommit.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
</root>
convoar/Resources/BuildDate.txt
-1
View File
@@ -1 +0,0 @@
Sat 04/23/2022 10:09:06.45
convoar/Resources/GitCommit.txt
-1
View File
@@ -1 +0,0 @@
f779ca06f2ab55a1f6ea1badca32e8e718658f7c
convoar/VersionInfo.cs
+1 -1
View File
@@ -4,7 +4,7 @@ using System;
namespace org.herbal3d.convoar {
public class VersionInfo {
public static string appVersion = "2.0.1";
public static string longVersion = "2.0.1-20220502-a90774dd";
public static string longVersion = "2.0.1-20220502-71f027de";
public static string buildDate = "20220502";
}
}
updateVersion.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#! /bin/bash
./bin/BuildVersion.exe --namespace org.herbal3d.convoar \
./BuildVersion/BuildVersion.exe --namespace org.herbal3d.convoar \
--version $(cat VERSION) \
--versionFile convoar/VersionInfo.cs \
--assemblyInfoFile convoar/Properties/AssemblyInfo.cs