Mirror
/
GitExtensions
mirror of https://github.com/gitextensions/gitextensions.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Text version support added

pull/2422/head
Arkady Shapkin 11 years ago
parent
4acecd9136
commit
9bca1dceb2
10 changed files with 63 additions and 62 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      CommonAssemblyInfo.cs
  2. 2
      GitCommands/Patch/PatchManager.cs
  3. 7
      GitCommands/Settings/AppSettings.cs
  4. 2
      GitExtSshAskPass/SshAskPass.rc2
  5. 2
      GitExtensionsShellEx/GitExtensionsShellEx.rc
  6. 2
      GitUI/CommandsDialogs/AboutBox.cs
  7. 2
      GitUI/CommandsDialogs/FormBrowse.cs
  8. 2
      GitUI/FormSplash.cs
  9. 95
      Setup/set_version_to.py
  10. 6
      TranslationApp/TranslationHelpers.cs

5
CommonAssemblyInfo.cs
View File

@ -1,6 +1,6 @@
using System.Reflection;
// General Information about an assembly is controlled through the following
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("GitExtensions")]
@ -15,9 +15,10 @@
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Minor Version
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.48")]
[assembly: AssemblyFileVersion("2.48")]
[assembly: AssemblyInformationalVersion("2.48RC1")]

2
GitCommands/Patch/PatchManager.cs
View File

@ -606,7 +606,7 @@ namespace PatchApply
if (result != null)
{
result = result.Combine("\n", "--");
result = result.Combine("\n", Application.ProductName + " " + AppSettings.GitExtensionsVersionString);
result = result.Combine("\n", Application.ProductName + " " + AppSettings.ProductVersion);
}
return result;

7
GitCommands/Settings/AppSettings.cs
View File

@ -23,9 +23,9 @@ namespace GitCommands
public static class AppSettings
{
//semi-constants
public static readonly string GitExtensionsVersionString;
public static readonly char PosixPathSeparator = '/';
public static Version AppVersion { get { return Assembly.GetCallingAssembly().GetName().Version; } }
public static string ProductVersion { get { return Application.ProductVersion; } }
public const string SettingsFileName = "GitExtensions.settings";
public static Lazy<string> ApplicationDataPath;
@ -51,11 +51,6 @@ namespace GitCommands
);
_SettingsContainer = new SettingsContainer<RepoDistSettings, GitExtSettingsCache>(null, GitExtSettingsCache.FromCache(SettingsFilePath));
Version version = AppVersion;
GitExtensionsVersionString = version.Major.ToString() + '.' + version.Minor.ToString();
if (version.Build > 0)
GitExtensionsVersionString += '.' + version.Build.ToString();
GitLog = new CommandLogger();

2
GitExtSshAskPass/SshAskPass.rc2
View File

@ -35,7 +35,7 @@ BEGIN
VALUE "LegalCopyright", "Copyright 2014"
VALUE "OriginalFilename", "GitExtSshAskPass.exe"
VALUE "ProductName", "Git Extensions"
VALUE "ProductVersion", "2.48"
VALUE "ProductVersion", "2.48RC1"
END
END
BLOCK "VarFileInfo"

2
GitExtensionsShellEx/GitExtensionsShellEx.rc
View File

@ -72,7 +72,7 @@ BEGIN
VALUE "LegalCopyright", "Copyright 2014"
VALUE "OriginalFilename", "GitExtensionsShellEx.dll"
VALUE "ProductName", "Git Extensions"
VALUE "ProductVersion", "2.48"
VALUE "ProductVersion", "2.48RC1"
END
END
BLOCK "VarFileInfo"

2
GitUI/CommandsDialogs/AboutBox.cs
View File

@ -49,7 +49,7 @@ namespace GitUI.CommandsDialogs
base.OnLoad(e);
_NO_TRANSLATE_labelVersionInfo.Text = string.Format("{0}{1}", _NO_TRANSLATE_labelVersionInfo.Text,
GitCommands.AppSettings.GitExtensionsVersionString);
GitCommands.AppSettings.ProductVersion);
}
private readonly string[] _contributersList;

2
GitUI/CommandsDialogs/FormBrowse.cs
View File

@ -3149,7 +3149,7 @@ namespace GitUI.CommandsDialogs
string issueData = "--- GitExtensions";
try
{
issueData += Settings.GitExtensionsVersionString;
issueData += Settings.ProductVersion;
issueData += ", Git " + GitCommandHelpers.VersionInUse.Full;
issueData += ", " + Environment.OSVersion;
var monoVersion = GetMonoVersion();

2
GitUI/FormSplash.cs
View File

@ -65,7 +65,7 @@ namespace GitUI
{
base.OnLoad(e);
_NO_TRANSLATE_versionLabel.Text = string.Format(_version.Text, AppSettings.GitExtensionsVersionString);
_NO_TRANSLATE_versionLabel.Text = string.Format(_version.Text, AppSettings.ProductVersion);
if (EnvUtils.RunningOnUnix())
_NO_TRANSLATE_osLabel.Text = "Unix";

95
Setup/set_version_to.py
View File

@ -19,10 +19,15 @@ if __name__ == '__main__':
commonAssemblyInfo = open(filename, "r").readlines()
for i in range(len(commonAssemblyInfo)):
line = commonAssemblyInfo[i]
if line.find("[assembly: Assembly") != -1 and line.find("Version(") != -1:
data = line.split('"')
data[1] = args.version
commonAssemblyInfo[i] = '"'.join(data)
if line.find("[assembly: Assembly") != -1:
if line.find("AssemblyVersion(") != -1 or line.find("AssemblyFileVersion(") != -1:
data = line.split('"')
data[1] = args.version
commonAssemblyInfo[i] = '"'.join(data)
if line.find("AssemblyInformationalVersion(") != -1:
data = line.split('"')
data[1] = args.text
commonAssemblyInfo[i] = '"'.join(data)
outfile = open(filename, "w")
outfile.writelines(commonAssemblyInfo)
@ -35,25 +40,25 @@ if __name__ == '__main__':
for i in range(len(gitExtensionsShellEx)):
line = gitExtensionsShellEx[i]
if line.find("FILEVERSION") != -1:
data = line.split(' ')
data[2] = ','.join(verData) + '\n'
gitExtensionsShellEx[i] = ' '.join(data)
data = line.split(' ')
data[2] = ','.join(verData) + '\n'
gitExtensionsShellEx[i] = ' '.join(data)
elif line.find("PRODUCTVERSION") != -1:
data = line.split(' ')
data[2] = ','.join(verData) + '\n'
gitExtensionsShellEx[i] = ' '.join(data)
data = line.split(' ')
data[2] = ','.join(verData) + '\n'
gitExtensionsShellEx[i] = ' '.join(data)
elif line.find('"FileVersion"') != -1:
data = line.split(', ', 1)
data[1] = '"' + '.'.join(verSplitted) + '"\n'
gitExtensionsShellEx[i] = ', '.join(data)
data = line.split(', ', 1)
data[1] = '"' + '.'.join(verSplitted) + '"\n'
gitExtensionsShellEx[i] = ', '.join(data)
elif line.find('"ProductVersion"') != -1:
data = line.split(', ', 1)
data[1] = '"' + '.'.join(verSplitted) + '"\n'
gitExtensionsShellEx[i] = ', '.join(data)
data = line.split(', ', 1)
data[1] = '"' + args.text + '"\n'
gitExtensionsShellEx[i] = ', '.join(data)
outfile = open(filename, "w")
outfile.writelines(gitExtensionsShellEx)
filename = "..\GitExtSshAskPass\SshAskPass.rc2 "
filename = "..\GitExtSshAskPass\SshAskPass.rc2"
gitExtSshAskPass = open(filename, "r").readlines()
verData = ["0"] * 4
verSplitted = args.version.split('.')
@ -62,21 +67,21 @@ if __name__ == '__main__':
for i in range(len(gitExtSshAskPass)):
line = gitExtSshAskPass[i]
if line.find("FILEVERSION") != -1:
data = line.split(' ')
data[2] = ','.join(verData) + '\n'
gitExtSshAskPass[i] = ' '.join(data)
data = line.split(' ')
data[2] = ','.join(verData) + '\n'
gitExtSshAskPass[i] = ' '.join(data)
elif line.find("PRODUCTVERSION") != -1:
data = line.split(' ')
data[2] = ','.join(verData) + '\n'
gitExtSshAskPass[i] = ' '.join(data)
data = line.split(' ')
data[2] = ','.join(verData) + '\n'
gitExtSshAskPass[i] = ' '.join(data)
elif line.find('"FileVersion"') != -1:
data = line.split(', ', 1)
data[1] = '"' + '.'.join(verSplitted) + '"\n'
gitExtSshAskPass[i] = ', '.join(data)
data = line.split(', ', 1)
data[1] = '"' + '.'.join(verSplitted) + '"\n'
gitExtSshAskPass[i] = ', '.join(data)
elif line.find('"ProductVersion"') != -1:
data = line.split(', ', 1)
data[1] = '"' + '.'.join(verSplitted) + '"\n'
gitExtSshAskPass[i] = ', '.join(data)
data = line.split(', ', 1)
data[1] = '"' + args.text + '"\n'
gitExtSshAskPass[i] = ', '.join(data)
outfile = open(filename, "w")
outfile.writelines(gitExtSshAskPass)
@ -89,13 +94,13 @@ if __name__ == '__main__':
for i in range(len(makeInstallers)):
line = makeInstallers[i]
if line.find("set numericVersion=") != -1:
data = line.split('=')
data[1] = '.'.join(verSplitted) + '\n'
makeInstallers[i] = '='.join(data)
data = line.split('=')
data[1] = '.'.join(verSplitted) + '\n'
makeInstallers[i] = '='.join(data)
if line.find("set version=") != -1:
data = line.split('=')
data[1] = args.text + '\n'
makeInstallers[i] = '='.join(data)
data = line.split('=')
data[1] = args.text + '\n'
makeInstallers[i] = '='.join(data)
outfile = open(filename, "w")
outfile.writelines(makeInstallers)
@ -104,9 +109,9 @@ if __name__ == '__main__':
for i in range(len(makeInstallers)):
line = makeInstallers[i]
if line.find("set version=") != -1:
data = line.split('=')
data[1] = args.text + '\n'
makeInstallers[i] = '='.join(data)
data = line.split('=')
data[1] = args.text + '\n'
makeInstallers[i] = '='.join(data)
outfile = open(filename, "w")
outfile.writelines(makeInstallers)
@ -115,12 +120,12 @@ if __name__ == '__main__':
for i in range(len(docoConf)):
line = docoConf[i]
if line.find("release = ") != -1:
data = line.split(' = ')
data[1] = '.'.join(verSplitted)
docoConf[i] = " = '".join(data) + "'\n"
data = line.split(' = ')
data[1] = '.'.join(verSplitted)
docoConf[i] = " = '".join(data) + "'\n"
if line.find("version = ") != -1:
data = line.split(' = ')
data[1] = args.text
docoConf[i] = " = '".join(data) + "'\n"
data = line.split(' = ')
data[1] = args.text
docoConf[i] = " = '".join(data) + "'\n"
outfile = open(filename, "w")
outfile.writelines(docoConf)
outfile.writelines(docoConf)

6
TranslationApp/TranslationHelpers.cs
View File

@ -87,7 +87,7 @@ namespace TranslationApp
foreach (var item in oldTranslationItems)
{
// Obsolete should be added only to dictionary
if (!String.IsNullOrEmpty(item.TranslatedValue) &&
if (!String.IsNullOrEmpty(item.TranslatedValue) &&
item.NeutralValue != null && !dict.ContainsKey(item.NeutralValue))
{
dict.Add(item.NeutralValue, item.TranslatedValue);
@ -95,7 +95,7 @@ namespace TranslationApp
}
// update untranslated items
var untranlatedItems =
var untranlatedItems =
from trItem in translateItems
where (String.IsNullOrEmpty(trItem.TranslatedValue)) && dict.ContainsKey(trItem.NeutralValue)
select trItem;
@ -109,7 +109,7 @@ namespace TranslationApp
public static void SaveTranslation(string languageCode, IEnumerable<TranslationItemWithCategory> items, string filename)
{
var foreignTranslation = new Translation(GitCommands.AppSettings.GitExtensionsVersionString, languageCode);
var foreignTranslation = new Translation(GitCommands.AppSettings.ProductVersion, languageCode);
foreach (TranslationItemWithCategory translateItem in items)
{
var item = translateItem.GetTranslationItem();

Write Preview
Loading…
Cancel
Save