lotek/opensim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

a few more changes missing on prebuild source

Browse Source
This commit is contained in:
UbitUmarov
2022-11-10 09:37:05 +00:00
parent 007b295269
commit 3f0fcbf3c6
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Prebuild/src/Core/Targets/AutotoolsTarget.cs
View File

@@ -166,7 +166,6 @@ namespace Prebuild.Core.Targets
Kernel m_Kernel;
XmlDocument autotoolsDoc;
XmlUrlResolver xr;
System.Security.Policy.Evidence e;
readonly Dictionary<string, SystemPackage> assemblyPathToPackage = new Dictionary<string, SystemPackage>();
readonly Dictionary<string, string> assemblyFullNameToPath = new Dictionary<string, string>();
readonly Dictionary<string, SystemPackage> packagesHash = new Dictionary<string, SystemPackage>();
@@ -969,9 +968,7 @@ namespace Prebuild.Core.Targets
RunInitialization();
const string streamName = "autotools.xml";
string fqStreamName = String.Format("Prebuild.data.{0}",
streamName
);
string fqStreamName = String.Format("Prebuild.data.{0}", streamName );
// Retrieve stream for the autotools template XML
Stream autotoolsStream = Assembly.GetExecutingAssembly()
@@ -979,7 +976,6 @@ namespace Prebuild.Core.Targets
if (autotoolsStream == null)
{
/*
* try without the default namespace prepended, in
* case prebuild.exe assembly was compiled with
@@ -992,9 +988,7 @@ namespace Prebuild.Core.Targets
{
string errStr =
String.Format("Could not find embedded resource file:\n" +
"'{0}' or '{1}'",
streamName, fqStreamName
);
"'{0}' or '{1}'", streamName, fqStreamName );
m_Kernel.Log.Write(errStr);
@@ -1006,9 +1000,6 @@ namespace Prebuild.Core.Targets
xr = new System.Xml.XmlUrlResolver();
xr.Credentials = CredentialCache.DefaultCredentials;
// Create a default evidence - no need to limit access
e = new System.Security.Policy.Evidence();
// Load the autotools XML
autotoolsDoc = new XmlDocument();
autotoolsDoc.Load(autotoolsStream);

13
Prebuild/src/Core/Targets/VSGenericTarget.cs
View File

@@ -720,8 +720,17 @@ namespace Prebuild.Core.Targets
ps.WriteLine(" <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>");
ps.WriteLine(" <ConfigurationOverrideFile>");
ps.WriteLine(" </ConfigurationOverrideFile>");
ps.WriteLine(" <DefineConstants>{0}</DefineConstants>",
conf.Options["CompilerDefines"].ToString() == "" ? this.kernel.ForcedConditionals : conf.Options["CompilerDefines"] + ";" + kernel.ForcedConditionals);
if (string.IsNullOrEmpty(conf.Options["CompilerDefines"].ToString()))
{
ps.WriteLine(" <DefineConstants>{0}</DefineConstants>", kernel.ForcedConditionals);
}
else
{
if (string.IsNullOrEmpty(kernel.ForcedConditionals))
ps.WriteLine(" <DefineConstants>{0}</DefineConstants>", conf.Options["CompilerDefines"]);
else
ps.WriteLine(" <DefineConstants>{0}</DefineConstants>", conf.Options["CompilerDefines"] + ";" + kernel.ForcedConditionals);
}
ps.WriteLine(" <DocumentationFile>{0}</DocumentationFile>", Helper.NormalizePath(conf.Options["XmlDocFile"].ToString()));
ps.WriteLine(" <DebugSymbols>{0}</DebugSymbols>", conf.Options["DebugInformation"]);
ps.WriteLine(" <FileAlignment>{0}</FileAlignment>", conf.Options["FileAlignment"]);