|
@@ -89,6 +89,7 @@ namespace Prebuild.Core
|
|
|
|
|
|
readonly List<SolutionNode> m_Solutions = new List<SolutionNode>();
|
|
readonly List<SolutionNode> m_Solutions = new List<SolutionNode>();
|
|
string m_Target;
|
|
string m_Target;
|
|
|
|
+ bool cmdlineTargetFramework;
|
|
FrameworkVersion m_TargetFramework; //Overrides all project settings
|
|
FrameworkVersion m_TargetFramework; //Overrides all project settings
|
|
string m_Conditionals; //Adds to all project settings
|
|
string m_Conditionals; //Adds to all project settings
|
|
public string ForcedConditionals { get { return m_Conditionals; } }
|
|
public string ForcedConditionals { get { return m_Conditionals; } }
|
|
@@ -327,6 +328,7 @@ namespace Prebuild.Core
|
|
m_Log.Write("C.J. Adams-Collier ([email protected]),");
|
|
m_Log.Write("C.J. Adams-Collier ([email protected]),");
|
|
m_Log.Write("John Hurliman ([email protected]),");
|
|
m_Log.Write("John Hurliman ([email protected]),");
|
|
m_Log.Write("WhiteCore build 2015 ([email protected]),");
|
|
m_Log.Write("WhiteCore build 2015 ([email protected]),");
|
|
|
|
+ m_Log.Write("OpenSim build 2017 Ubit Umarov,");
|
|
m_Log.Write ("");
|
|
m_Log.Write ("");
|
|
m_Log.Write("See 'prebuild /usage' for help");
|
|
m_Log.Write("See 'prebuild /usage' for help");
|
|
m_Log.Write();
|
|
m_Log.Write();
|
|
@@ -602,7 +604,7 @@ namespace Prebuild.Core
|
|
dataNode = preNode;
|
|
dataNode = preNode;
|
|
|
|
|
|
dataNode.Parent = parent;
|
|
dataNode.Parent = parent;
|
|
- if (dataNode is ProjectNode)
|
|
|
|
|
|
+ if (cmdlineTargetFramework && dataNode is ProjectNode)
|
|
{
|
|
{
|
|
((ProjectNode)dataNode).FrameworkVersion = m_TargetFramework;
|
|
((ProjectNode)dataNode).FrameworkVersion = m_TargetFramework;
|
|
}
|
|
}
|
|
@@ -663,7 +665,10 @@ namespace Prebuild.Core
|
|
m_Target = m_CommandLine["target"];
|
|
m_Target = m_CommandLine["target"];
|
|
m_Conditionals = m_CommandLine["conditionals"];
|
|
m_Conditionals = m_CommandLine["conditionals"];
|
|
if(m_CommandLine["targetframework"] != null)
|
|
if(m_CommandLine["targetframework"] != null)
|
|
|
|
+ {
|
|
m_TargetFramework = (FrameworkVersion)Enum.Parse (typeof (FrameworkVersion), m_CommandLine["targetframework"]);
|
|
m_TargetFramework = (FrameworkVersion)Enum.Parse (typeof (FrameworkVersion), m_CommandLine["targetframework"]);
|
|
|
|
+ cmdlineTargetFramework = true;
|
|
|
|
+ }
|
|
m_Clean = m_CommandLine["clean"];
|
|
m_Clean = m_CommandLine["clean"];
|
|
string removeDirs = m_CommandLine["removedir"];
|
|
string removeDirs = m_CommandLine["removedir"];
|
|
if(removeDirs != null && removeDirs.Length == 0)
|
|
if(removeDirs != null && removeDirs.Length == 0)
|