diff options
Diffstat (limited to '')
-rw-r--r-- | Prebuild/src/Core/Kernel.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Prebuild/src/Core/Kernel.cs b/Prebuild/src/Core/Kernel.cs index 535913e..218f28e 100644 --- a/Prebuild/src/Core/Kernel.cs +++ b/Prebuild/src/Core/Kernel.cs | |||
@@ -89,6 +89,7 @@ namespace Prebuild.Core | |||
89 | 89 | ||
90 | readonly List<SolutionNode> m_Solutions = new List<SolutionNode>(); | 90 | readonly List<SolutionNode> m_Solutions = new List<SolutionNode>(); |
91 | string m_Target; | 91 | string m_Target; |
92 | bool cmdlineTargetFramework; | ||
92 | FrameworkVersion m_TargetFramework; //Overrides all project settings | 93 | FrameworkVersion m_TargetFramework; //Overrides all project settings |
93 | string m_Conditionals; //Adds to all project settings | 94 | string m_Conditionals; //Adds to all project settings |
94 | public string ForcedConditionals { get { return m_Conditionals; } } | 95 | public string ForcedConditionals { get { return m_Conditionals; } } |
@@ -327,6 +328,7 @@ namespace Prebuild.Core | |||
327 | m_Log.Write("C.J. Adams-Collier (cjac@colliertech.org),"); | 328 | m_Log.Write("C.J. Adams-Collier (cjac@colliertech.org),"); |
328 | m_Log.Write("John Hurliman (john.hurliman@intel.com),"); | 329 | m_Log.Write("John Hurliman (john.hurliman@intel.com),"); |
329 | m_Log.Write("WhiteCore build 2015 (greythane@gmail.com),"); | 330 | m_Log.Write("WhiteCore build 2015 (greythane@gmail.com),"); |
331 | m_Log.Write("OpenSim build 2017 Ubit Umarov,"); | ||
330 | m_Log.Write (""); | 332 | m_Log.Write (""); |
331 | m_Log.Write("See 'prebuild /usage' for help"); | 333 | m_Log.Write("See 'prebuild /usage' for help"); |
332 | m_Log.Write(); | 334 | m_Log.Write(); |
@@ -602,7 +604,7 @@ namespace Prebuild.Core | |||
602 | dataNode = preNode; | 604 | dataNode = preNode; |
603 | 605 | ||
604 | dataNode.Parent = parent; | 606 | dataNode.Parent = parent; |
605 | if (dataNode is ProjectNode) | 607 | if (cmdlineTargetFramework && dataNode is ProjectNode) |
606 | { | 608 | { |
607 | ((ProjectNode)dataNode).FrameworkVersion = m_TargetFramework; | 609 | ((ProjectNode)dataNode).FrameworkVersion = m_TargetFramework; |
608 | } | 610 | } |
@@ -663,7 +665,10 @@ namespace Prebuild.Core | |||
663 | m_Target = m_CommandLine["target"]; | 665 | m_Target = m_CommandLine["target"]; |
664 | m_Conditionals = m_CommandLine["conditionals"]; | 666 | m_Conditionals = m_CommandLine["conditionals"]; |
665 | if(m_CommandLine["targetframework"] != null) | 667 | if(m_CommandLine["targetframework"] != null) |
668 | { | ||
666 | m_TargetFramework = (FrameworkVersion)Enum.Parse (typeof (FrameworkVersion), m_CommandLine["targetframework"]); | 669 | m_TargetFramework = (FrameworkVersion)Enum.Parse (typeof (FrameworkVersion), m_CommandLine["targetframework"]); |
670 | cmdlineTargetFramework = true; | ||
671 | } | ||
667 | m_Clean = m_CommandLine["clean"]; | 672 | m_Clean = m_CommandLine["clean"]; |
668 | string removeDirs = m_CommandLine["removedir"]; | 673 | string removeDirs = m_CommandLine["removedir"]; |
669 | if(removeDirs != null && removeDirs.Length == 0) | 674 | if(removeDirs != null && removeDirs.Length == 0) |