diff options
author | lbsa71 | 2009-02-19 12:48:38 +0000 |
---|---|---|
committer | lbsa71 | 2009-02-19 12:48:38 +0000 |
commit | dd9640cda82bca8125289f292238ea6b447cc6e9 (patch) | |
tree | 5f558fa38e4c03b05eb5b91cc9db7ff2363c0b48 /Prebuild/src/Core/Nodes/FilesNode.cs | |
parent | reverted last revision, until we decide how to handle capturing IM's (diff) | |
download | opensim-SC_OLD-dd9640cda82bca8125289f292238ea6b447cc6e9.zip opensim-SC_OLD-dd9640cda82bca8125289f292238ea6b447cc6e9.tar.gz opensim-SC_OLD-dd9640cda82bca8125289f292238ea6b447cc6e9.tar.bz2 opensim-SC_OLD-dd9640cda82bca8125289f292238ea6b447cc6e9.tar.xz |
=== PREBUILD UPSTREAMS UPDATE : POTENTIAL BREAKAGE ===
* Applied upstreams changes to allow for auditing and debugging in our various environments.
* This should, in theory, bring back 'multiple ref dirs'.
* Temporarily Removed xmlns because prebuild-1.7 schema does not allow for multiple solutions per prebuild node (This will be a moot issue once the Prebuild node is moved out of prebuild.xml)
* Autotools target: Various minor fixes
* MonoDevelop Target : No changes.
* Nant Target: Various minor fixes, support for net-3.5 and mono-2.0/3.5 targets
* Sharpdevelop targets: No changes.
* VS Targets: Refactored into using VSGenericTarget, and supports 2.0-3.5
* XCode Target: No changes.
--- Regressions and outstanding issues ---
* The Solution is assigned a random Guid - will lead to unnecessary reloads and loss of user settings.
--- New features of Prebuild 2.0.4 ---
* (Better) support for Web, WinForms and Database Projects and build actions
* Conditional Framework Version compilation support (1.1, 2.0-3.5)
* ArrayList -> List<>, ICollection -> IList
(this means Prebuild can generate 1.1 solutions, but can't itself be built under 1.1 - how very meta)
* Added <?include file="sub_prebuild.xml" ?> preprocessor directive.
Diffstat (limited to '')
-rw-r--r-- | Prebuild/src/Core/Nodes/FilesNode.cs | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/Prebuild/src/Core/Nodes/FilesNode.cs b/Prebuild/src/Core/Nodes/FilesNode.cs index 7c1dd19..dc306c2 100644 --- a/Prebuild/src/Core/Nodes/FilesNode.cs +++ b/Prebuild/src/Core/Nodes/FilesNode.cs | |||
@@ -23,15 +23,6 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O | |||
23 | */ | 23 | */ |
24 | #endregion | 24 | #endregion |
25 | 25 | ||
26 | #region CVS Information | ||
27 | /* | ||
28 | * $Source$ | ||
29 | * $Author: borrillis $ | ||
30 | * $Date: 2007-05-25 01:03:16 +0900 (Fri, 25 May 2007) $ | ||
31 | * $Revision: 243 $ | ||
32 | */ | ||
33 | #endregion | ||
34 | |||
35 | using System; | 26 | using System; |
36 | using System.Collections; | 27 | using System.Collections; |
37 | using System.Collections.Specialized; | 28 | using System.Collections.Specialized; |
@@ -39,6 +30,7 @@ using System.Xml; | |||
39 | 30 | ||
40 | using Prebuild.Core.Attributes; | 31 | using Prebuild.Core.Attributes; |
41 | using Prebuild.Core.Interfaces; | 32 | using Prebuild.Core.Interfaces; |
33 | using System.IO; | ||
42 | 34 | ||
43 | namespace Prebuild.Core.Nodes | 35 | namespace Prebuild.Core.Nodes |
44 | { | 36 | { |
@@ -224,8 +216,8 @@ namespace Prebuild.Core.Nodes | |||
224 | if (!m_Files.Contains(file)) | 216 | if (!m_Files.Contains(file)) |
225 | { | 217 | { |
226 | m_Files.Add(file); | 218 | m_Files.Add(file); |
227 | m_BuildActions[ file ] = matchNode.BuildAction; | 219 | m_BuildActions[ file ] = matchNode.BuildAction == null ? GetBuildActionByFileName(file) : matchNode.BuildAction; |
228 | m_SubTypes[ file ] = matchNode.SubType; | 220 | m_SubTypes[file] = matchNode.SubType == null ? GetSubTypeByFileName(file) : matchNode.SubType.Value; |
229 | m_ResourceNames[ file ] = matchNode.ResourceName; | 221 | m_ResourceNames[ file ] = matchNode.ResourceName; |
230 | this.m_PreservePaths[ file ] = matchNode.PreservePath; | 222 | this.m_PreservePaths[ file ] = matchNode.PreservePath; |
231 | this.m_Links[ file ] = matchNode.IsLink; | 223 | this.m_Links[ file ] = matchNode.IsLink; |