diff options
author | Justin Clark-Casey (justincc) | 2011-07-01 21:47:30 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-07-01 21:47:30 +0100 |
commit | 759e855566a08d965059ca08d4f4510d335f1c7d (patch) | |
tree | a3aa9008a055ffb63e1ba67d04d12af6fc2ce7f6 | |
parent | fix build break I just introduced (diff) | |
download | opensim-SC-759e855566a08d965059ca08d4f4510d335f1c7d.zip opensim-SC-759e855566a08d965059ca08d4f4510d335f1c7d.tar.gz opensim-SC-759e855566a08d965059ca08d4f4510d335f1c7d.tar.bz2 opensim-SC-759e855566a08d965059ca08d4f4510d335f1c7d.tar.xz |
refactor: rename gitCommitFileName to manualVersionFileName since bin/.version doesn't necessary have to be a git hash
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 21e1e09..98a92dd 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -460,21 +460,20 @@ namespace OpenSim.Framework.Servers | |||
460 | // elsewhere as well | 460 | // elsewhere as well |
461 | string svnRevisionFileName = "svn_revision"; | 461 | string svnRevisionFileName = "svn_revision"; |
462 | string svnFileName = ".svn/entries"; | 462 | string svnFileName = ".svn/entries"; |
463 | string gitCommitFileName = ".version"; | 463 | string manualVersionFileName = ".version"; |
464 | string inputLine; | 464 | string inputLine; |
465 | int strcmp; | 465 | int strcmp; |
466 | 466 | ||
467 | if (File.Exists(gitCommitFileName)) | 467 | if (File.Exists(manualVersionFileName)) |
468 | { | 468 | { |
469 | StreamReader CommitFile = File.OpenText(gitCommitFileName); | 469 | StreamReader CommitFile = File.OpenText(manualVersionFileName); |
470 | buildVersion = CommitFile.ReadLine(); | 470 | buildVersion = CommitFile.ReadLine(); |
471 | CommitFile.Close(); | 471 | CommitFile.Close(); |
472 | m_version += buildVersion ?? ""; | 472 | m_version += buildVersion ?? ""; |
473 | } | 473 | } |
474 | |||
475 | // Remove the else logic when subversion mirror is no longer used | ||
476 | else | 474 | else |
477 | { | 475 | { |
476 | // Remove the else logic when subversion mirror is no longer used | ||
478 | if (File.Exists(svnRevisionFileName)) | 477 | if (File.Exists(svnRevisionFileName)) |
479 | { | 478 | { |
480 | StreamReader RevisionFile = File.OpenText(svnRevisionFileName); | 479 | StreamReader RevisionFile = File.OpenText(svnRevisionFileName); |