diff options
author | Jeff Ames | 2008-03-17 20:55:21 +0000 |
---|---|---|
committer | Jeff Ames | 2008-03-17 20:55:21 +0000 |
commit | 79209c429705beb57ad9b787718856ab2c9fd37c (patch) | |
tree | 6f459e172985bce8ffbfc09a5b9a4594dd881a62 /Prebuild/src/Core/Nodes/SolutionNode.cs | |
parent | * More almost completely unproductive log message fiddling (diff) | |
download | opensim-SC_OLD-79209c429705beb57ad9b787718856ab2c9fd37c.zip opensim-SC_OLD-79209c429705beb57ad9b787718856ab2c9fd37c.tar.gz opensim-SC_OLD-79209c429705beb57ad9b787718856ab2c9fd37c.tar.bz2 opensim-SC_OLD-79209c429705beb57ad9b787718856ab2c9fd37c.tar.xz |
Merged changes in Prebuild trunk up to r258 into OpenSim's Prebuild.
Hopefully this should make merging upstream easier.
Building with NAnt should still work, but Visual Studio is untested.
Diffstat (limited to '')
-rw-r--r-- | Prebuild/src/Core/Nodes/SolutionNode.cs | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/Prebuild/src/Core/Nodes/SolutionNode.cs b/Prebuild/src/Core/Nodes/SolutionNode.cs index 3ea53a4..9473fe6 100644 --- a/Prebuild/src/Core/Nodes/SolutionNode.cs +++ b/Prebuild/src/Core/Nodes/SolutionNode.cs | |||
@@ -27,7 +27,7 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O | |||
27 | /* | 27 | /* |
28 | * $Source$ | 28 | * $Source$ |
29 | * $Author: jendave $ | 29 | * $Author: jendave $ |
30 | * $Date: 2006-02-28 17:15:42 +0100 (ti, 28 feb 2006) $ | 30 | * $Date: 2006-03-01 01:15:42 +0900 (Wed, 01 Mar 2006) $ |
31 | * $Revision: 92 $ | 31 | * $Revision: 92 $ |
32 | */ | 32 | */ |
33 | #endregion | 33 | #endregion |
@@ -53,11 +53,11 @@ namespace Prebuild.Core.Nodes | |||
53 | #region Fields | 53 | #region Fields |
54 | 54 | ||
55 | private string m_Name = "unknown"; | 55 | private string m_Name = "unknown"; |
56 | private string m_Version = "1.0.0"; | ||
57 | private string m_Path = ""; | 56 | private string m_Path = ""; |
58 | private string m_FullPath = ""; | 57 | private string m_FullPath = ""; |
59 | private string m_ActiveConfig = "Debug"; | 58 | private string m_ActiveConfig = "Debug"; |
60 | 59 | private string m_Version = "1.0.0"; | |
60 | |||
61 | private OptionsNode m_Options; | 61 | private OptionsNode m_Options; |
62 | private FilesNode m_Files; | 62 | private FilesNode m_Files; |
63 | private Hashtable m_Configurations; | 63 | private Hashtable m_Configurations; |
@@ -111,18 +111,6 @@ namespace Prebuild.Core.Nodes | |||
111 | } | 111 | } |
112 | 112 | ||
113 | /// <summary> | 113 | /// <summary> |
114 | /// Gets the version. | ||
115 | /// </summary> | ||
116 | /// <value>The version.</value> | ||
117 | public string Version | ||
118 | { | ||
119 | get | ||
120 | { | ||
121 | return m_Version; | ||
122 | } | ||
123 | } | ||
124 | |||
125 | /// <summary> | ||
126 | /// Gets the path. | 114 | /// Gets the path. |
127 | /// </summary> | 115 | /// </summary> |
128 | /// <value>The path.</value> | 116 | /// <value>The path.</value> |
@@ -147,6 +135,18 @@ namespace Prebuild.Core.Nodes | |||
147 | } | 135 | } |
148 | 136 | ||
149 | /// <summary> | 137 | /// <summary> |
138 | /// Gets the version. | ||
139 | /// </summary> | ||
140 | /// <value>The version.</value> | ||
141 | public string Version | ||
142 | { | ||
143 | get | ||
144 | { | ||
145 | return m_Version; | ||
146 | } | ||
147 | } | ||
148 | |||
149 | /// <summary> | ||
150 | /// Gets the options. | 150 | /// Gets the options. |
151 | /// </summary> | 151 | /// </summary> |
152 | /// <value>The options.</value> | 152 | /// <value>The options.</value> |
@@ -181,7 +181,7 @@ namespace Prebuild.Core.Nodes | |||
181 | ArrayList tmp = new ArrayList(ConfigurationsTable.Values); | 181 | ArrayList tmp = new ArrayList(ConfigurationsTable.Values); |
182 | tmp.Sort(); | 182 | tmp.Sort(); |
183 | return tmp; | 183 | return tmp; |
184 | } | 184 | } |
185 | } | 185 | } |
186 | 186 | ||
187 | /// <summary> | 187 | /// <summary> |
@@ -245,9 +245,9 @@ namespace Prebuild.Core.Nodes | |||
245 | public override void Parse(XmlNode node) | 245 | public override void Parse(XmlNode node) |
246 | { | 246 | { |
247 | m_Name = Helper.AttributeValue(node, "name", m_Name); | 247 | m_Name = Helper.AttributeValue(node, "name", m_Name); |
248 | m_Version = Helper.AttributeValue(node, "version", m_Version); | ||
249 | m_ActiveConfig = Helper.AttributeValue(node, "activeConfig", m_ActiveConfig); | 248 | m_ActiveConfig = Helper.AttributeValue(node, "activeConfig", m_ActiveConfig); |
250 | m_Path = Helper.AttributeValue(node, "path", m_Path); | 249 | m_Path = Helper.AttributeValue(node, "path", m_Path); |
250 | m_Version = Helper.AttributeValue(node, "version", m_Version); | ||
251 | 251 | ||
252 | m_FullPath = m_Path; | 252 | m_FullPath = m_Path; |
253 | try | 253 | try |