diff options
author | UbitUmarov | 2017-08-30 22:24:07 +0100 |
---|---|---|
committer | UbitUmarov | 2017-08-30 22:24:07 +0100 |
commit | 41e8b9f91ff73fd4d18aae1e467446563f94c33f (patch) | |
tree | 363e12392f731fdcd2b60356ec946cd4ad93cd5a /Prebuild/src/Core/Targets/AutotoolsTarget.cs | |
parent | Merge branch 'master' into httptests (diff) | |
download | opensim-SC-41e8b9f91ff73fd4d18aae1e467446563f94c33f.zip opensim-SC-41e8b9f91ff73fd4d18aae1e467446563f94c33f.tar.gz opensim-SC-41e8b9f91ff73fd4d18aae1e467446563f94c33f.tar.bz2 opensim-SC-41e8b9f91ff73fd4d18aae1e467446563f94c33f.tar.xz |
update Prebuild with WhiteCore version
Diffstat (limited to 'Prebuild/src/Core/Targets/AutotoolsTarget.cs')
-rw-r--r-- | Prebuild/src/Core/Targets/AutotoolsTarget.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Prebuild/src/Core/Targets/AutotoolsTarget.cs b/Prebuild/src/Core/Targets/AutotoolsTarget.cs index c52c4f1..485e4dd 100644 --- a/Prebuild/src/Core/Targets/AutotoolsTarget.cs +++ b/Prebuild/src/Core/Targets/AutotoolsTarget.cs | |||
@@ -51,10 +51,10 @@ POSSIBILITY OF SUCH DAMAGE. | |||
51 | distribute, sublicense, and/or sell copies of the Software, and to | 51 | distribute, sublicense, and/or sell copies of the Software, and to |
52 | permit persons to whom the Software is furnished to do so, subject to | 52 | permit persons to whom the Software is furnished to do so, subject to |
53 | the following conditions: | 53 | the following conditions: |
54 | 54 | ||
55 | The above copyright notice and this permission notice shall be | 55 | The above copyright notice and this permission notice shall be |
56 | included in all copies or substantial portions of the Software. | 56 | included in all copies or substantial portions of the Software. |
57 | 57 | ||
58 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | 58 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, |
59 | EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | 59 | EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF |
60 | MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | 60 | MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
@@ -156,7 +156,7 @@ namespace Prebuild.Core.Targets | |||
156 | 156 | ||
157 | 157 | ||
158 | /// <summary> | 158 | /// <summary> |
159 | /// | 159 | /// |
160 | /// </summary> | 160 | /// </summary> |
161 | [Target("autotools")] | 161 | [Target("autotools")] |
162 | public class AutotoolsTarget : ITarget | 162 | public class AutotoolsTarget : ITarget |
@@ -650,7 +650,7 @@ namespace Prebuild.Core.Targets | |||
650 | string tempAssemblyFile = Path.Combine(Path.GetTempPath(), project.Name + "-temp.dll"); | 650 | string tempAssemblyFile = Path.Combine(Path.GetTempPath(), project.Name + "-temp.dll"); |
651 | System.CodeDom.Compiler.CompilerParameters cparam = | 651 | System.CodeDom.Compiler.CompilerParameters cparam = |
652 | new System.CodeDom.Compiler.CompilerParameters(args, tempAssemblyFile); | 652 | new System.CodeDom.Compiler.CompilerParameters(args, tempAssemblyFile); |
653 | 653 | ||
654 | System.CodeDom.Compiler.CompilerResults cr = | 654 | System.CodeDom.Compiler.CompilerResults cr = |
655 | cscp.CompileAssemblyFromFile(cparam, sources); | 655 | cscp.CompileAssemblyFromFile(cparam, sources); |
656 | 656 | ||
@@ -673,11 +673,11 @@ namespace Prebuild.Core.Targets | |||
673 | if (File.Exists(tempAssemblyFile)) | 673 | if (File.Exists(tempAssemblyFile)) |
674 | File.Delete(tempAssemblyFile); | 674 | File.Delete(tempAssemblyFile); |
675 | } | 675 | } |
676 | catch | 676 | catch |
677 | { | 677 | { |
678 | Console.WriteLine("Error! '{0}'", e); | 678 | Console.WriteLine("Error! '{0}'", e); |
679 | } | 679 | } |
680 | 680 | ||
681 | } | 681 | } |
682 | 682 | ||
683 | // Tell the user if there's a problem copying the file | 683 | // Tell the user if there's a problem copying the file |
@@ -977,7 +977,7 @@ namespace Prebuild.Core.Targets | |||
977 | 977 | ||
978 | if(autotoolsStream == null) { | 978 | if(autotoolsStream == null) { |
979 | 979 | ||
980 | /* | 980 | /* |
981 | * try without the default namespace prepended, in | 981 | * try without the default namespace prepended, in |
982 | * case prebuild.exe assembly was compiled with | 982 | * case prebuild.exe assembly was compiled with |
983 | * something other than Visual Studio .NET | 983 | * something other than Visual Studio .NET |