refactor: rename gitCommitFileName to manualVersionFileName since bin/.version doesn't necessary have to be a git hash
parent
e41093635a
commit
759e855566
|
@ -460,21 +460,20 @@ namespace OpenSim.Framework.Servers
|
||||||
// elsewhere as well
|
// elsewhere as well
|
||||||
string svnRevisionFileName = "svn_revision";
|
string svnRevisionFileName = "svn_revision";
|
||||||
string svnFileName = ".svn/entries";
|
string svnFileName = ".svn/entries";
|
||||||
string gitCommitFileName = ".version";
|
string manualVersionFileName = ".version";
|
||||||
string inputLine;
|
string inputLine;
|
||||||
int strcmp;
|
int strcmp;
|
||||||
|
|
||||||
if (File.Exists(gitCommitFileName))
|
if (File.Exists(manualVersionFileName))
|
||||||
{
|
{
|
||||||
StreamReader CommitFile = File.OpenText(gitCommitFileName);
|
StreamReader CommitFile = File.OpenText(manualVersionFileName);
|
||||||
buildVersion = CommitFile.ReadLine();
|
buildVersion = CommitFile.ReadLine();
|
||||||
CommitFile.Close();
|
CommitFile.Close();
|
||||||
m_version += buildVersion ?? "";
|
m_version += buildVersion ?? "";
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remove the else logic when subversion mirror is no longer used
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
// Remove the else logic when subversion mirror is no longer used
|
||||||
if (File.Exists(svnRevisionFileName))
|
if (File.Exists(svnRevisionFileName))
|
||||||
{
|
{
|
||||||
StreamReader RevisionFile = File.OpenText(svnRevisionFileName);
|
StreamReader RevisionFile = File.OpenText(svnRevisionFileName);
|
||||||
|
|
Loading…
Reference in New Issue