diff --git a/Build/Tools/NAsm/LICENSE b/Build/Tools/NAsm/LICENSE deleted file mode 100644 index f9917f00af..0000000000 --- a/Build/Tools/NAsm/LICENSE +++ /dev/null @@ -1,29 +0,0 @@ -NASM is now licensed under the 2-clause BSD license, also known as the -simplified BSD license. - - Copyright 1996-2010 the NASM Authors - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following - conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Build/Tools/NAsm/nasm.exe b/Build/Tools/NAsm/nasm.exe deleted file mode 100644 index d487bd8207..0000000000 Binary files a/Build/Tools/NAsm/nasm.exe and /dev/null differ diff --git a/Build/Tools/NAsm/ndisasm.exe b/Build/Tools/NAsm/ndisasm.exe deleted file mode 100644 index 887925762f..0000000000 Binary files a/Build/Tools/NAsm/ndisasm.exe and /dev/null differ diff --git a/Build/Tools/NAsm/roff/.gitkeep b/Build/Tools/NAsm/roff/.gitkeep deleted file mode 100644 index 8b13789179..0000000000 --- a/Build/Tools/NAsm/roff/.gitkeep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/Build/Tools/NAsm/roff/ldrdf.exe b/Build/Tools/NAsm/roff/ldrdf.exe deleted file mode 100644 index d60d1fb843..0000000000 Binary files a/Build/Tools/NAsm/roff/ldrdf.exe and /dev/null differ diff --git a/Build/Tools/NAsm/roff/rdf2bin.exe b/Build/Tools/NAsm/roff/rdf2bin.exe deleted file mode 100644 index 1d3835918a..0000000000 Binary files a/Build/Tools/NAsm/roff/rdf2bin.exe and /dev/null differ diff --git a/Build/Tools/NAsm/roff/rdf2com.exe b/Build/Tools/NAsm/roff/rdf2com.exe deleted file mode 100644 index 1d3835918a..0000000000 Binary files a/Build/Tools/NAsm/roff/rdf2com.exe and /dev/null differ diff --git a/Build/Tools/NAsm/roff/rdf2ihx.exe b/Build/Tools/NAsm/roff/rdf2ihx.exe deleted file mode 100644 index 1d3835918a..0000000000 Binary files a/Build/Tools/NAsm/roff/rdf2ihx.exe and /dev/null differ diff --git a/Build/Tools/NAsm/roff/rdf2ith.exe b/Build/Tools/NAsm/roff/rdf2ith.exe deleted file mode 100644 index 1d3835918a..0000000000 Binary files a/Build/Tools/NAsm/roff/rdf2ith.exe and /dev/null differ diff --git a/Build/Tools/NAsm/roff/rdf2srec.exe b/Build/Tools/NAsm/roff/rdf2srec.exe deleted file mode 100644 index 1d3835918a..0000000000 Binary files a/Build/Tools/NAsm/roff/rdf2srec.exe and /dev/null differ diff --git a/Build/Tools/NAsm/roff/rdfdump.exe b/Build/Tools/NAsm/roff/rdfdump.exe deleted file mode 100644 index f25a6bace8..0000000000 Binary files a/Build/Tools/NAsm/roff/rdfdump.exe and /dev/null differ diff --git a/Build/Tools/NAsm/roff/rdflib.exe b/Build/Tools/NAsm/roff/rdflib.exe deleted file mode 100644 index e8a297cbb9..0000000000 Binary files a/Build/Tools/NAsm/roff/rdflib.exe and /dev/null differ diff --git a/Build/Tools/NAsm/roff/rdx.exe b/Build/Tools/NAsm/roff/rdx.exe deleted file mode 100644 index 09f3e3e866..0000000000 Binary files a/Build/Tools/NAsm/roff/rdx.exe and /dev/null differ diff --git a/Build/Tools/NAsm/version.txt b/Build/Tools/NAsm/version.txt deleted file mode 100644 index a501bf15b1..0000000000 --- a/Build/Tools/NAsm/version.txt +++ /dev/null @@ -1,3 +0,0 @@ -2.15.05 - -before updating, test.. diff --git a/Setup/Cosmos.iss b/Setup/Cosmos.iss index d9f7b5d9ed..7506351b56 100644 --- a/Setup/Cosmos.iss +++ b/Setup/Cosmos.iss @@ -82,7 +82,7 @@ Type: filesandordirs; Name: "{app}" [Files] ; Tools Source: ".\Build\Tools\*.exe"; DestDir: "{app}\Build\Tools"; Flags: ignoreversion uninsremovereadonly -Source: ".\Build\Tools\NAsm\*.exe"; DestDir: "{app}\Build\Tools\NAsm"; Flags: ignoreversion uninsremovereadonly +Source: ".\Build\Tools\Yasm\*.exe"; DestDir: "{app}\Build\Tools\Yasm"; Flags: ignoreversion uninsremovereadonly Source: ".\Build\Tools\Cygwin\*"; DestDir: "{app}\Build\Tools\cygwin"; Flags: ignoreversion uninsremovereadonly overwritereadonly Source: ".\Build\Tools\mkisofs\*"; DestDir: "{app}\Build\Tools\mkisofs"; Flags: ignoreversion uninsremovereadonly overwritereadonly Source: ".\Build\VSIP\IL2CPU\*"; DestDir: "{app}\Build\IL2CPU"; Flags: ignoreversion uninsremovereadonly recursesubdirs diff --git a/Tests/Cosmos.TestRunner.Core/Engine.Helpers.cs b/Tests/Cosmos.TestRunner.Core/Engine.Helpers.cs index 37e52b1abd..065657b5d6 100644 --- a/Tests/Cosmos.TestRunner.Core/Engine.Helpers.cs +++ b/Tests/Cosmos.TestRunner.Core/Engine.Helpers.cs @@ -265,11 +265,12 @@ private void RunIL2CPU(string kernelFileName, string outputFile) private void RunNasm(string inputFile, string outputFile, bool isElf) { bool xUsingUserkit = false; - string xNasmPath = Path.Combine(FindCosmosRoot(), "Tools", "NASM"); + //Path to nasm starter + string xNasmPath = Path.Combine(FindCosmosRoot(), "Tools", "Nasm"); if (!Directory.Exists(xNasmPath)) { xUsingUserkit = true; - xNasmPath = Path.Combine(GetCosmosUserkitFolder(), "Build", "NASM"); + xNasmPath = Path.Combine(GetCosmosUserkitFolder(), "Build", "Nasm"); } if (!Directory.Exists(xNasmPath)) { @@ -278,7 +279,7 @@ private void RunNasm(string inputFile, string outputFile, bool isElf) var xArgs = new List { - $"ExePath:{Path.Combine(xUsingUserkit ? GetCosmosUserkitFolder() : FindCosmosRoot(), "Build", "Tools", "NAsm", "nasm.exe")}", + $"ExePath:{Path.Combine(xUsingUserkit ? GetCosmosUserkitFolder() : FindCosmosRoot(), "Build", "Tools", "Yasm", "yasm.exe")}", $"InputFile:{inputFile}", $"OutputFile:{outputFile}", $"IsELF:{isElf}" diff --git a/Tools/NASM/Program.cs b/Tools/NASM/Program.cs index cc548256ab..e2f0b4f431 100644 --- a/Tools/NASM/Program.cs +++ b/Tools/NASM/Program.cs @@ -91,11 +91,13 @@ public static int Run(string[] args, Action logMessage, Action l } string xFormat = IsELF ? "elf" : "bin"; - string xArgs = string.Format("-g -f {0} -o \"{1}\" -D{3}_COMPILATION -O0 \"{2}\"", + string xDebugFormat = IsELF ? "dwarf2" : "null"; + string xArgs = string.Format("-g {4} -f {0} -o \"{1}\" -D{3}_COMPILATION -O0 \"{2}\"", xFormat, Path.Combine(Directory.GetCurrentDirectory(), OutputFile), Path.Combine(Directory.GetCurrentDirectory(), InputFile), - xFormat.ToUpper()); + xFormat.ToUpper(), + xDebugFormat); var xProcess = Process.Start(ExePath, xArgs); diff --git a/build/Tools/Yasm/LICENSE.txt b/build/Tools/Yasm/LICENSE.txt new file mode 100644 index 0000000000..60b9b71d1b --- /dev/null +++ b/build/Tools/Yasm/LICENSE.txt @@ -0,0 +1,74 @@ +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND OTHER CONTRIBUTORS ``AS IS'' +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR OTHER CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +------------------------------------------------------------------------------- +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. Neither the name of the author nor the names of other contributors + may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND OTHER CONTRIBUTORS ``AS IS'' +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR OTHER CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +------------------------------------------------------------------------------- +NASM is now licensed under the 2-clause BSD license, also known as the +simplified BSD license. + + Copyright 1996-2009 the NASM Authors - All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following + conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/build/Tools/Yasm/yasm.exe b/build/Tools/Yasm/yasm.exe new file mode 100644 index 0000000000..b2cc6af610 Binary files /dev/null and b/build/Tools/Yasm/yasm.exe differ diff --git a/source/Cosmos.Build.Tasks/Nasm.cs b/source/Cosmos.Build.Tasks/Nasm.cs index 176cf1284a..d0b4e1d191 100644 --- a/source/Cosmos.Build.Tasks/Nasm.cs +++ b/source/Cosmos.Build.Tasks/Nasm.cs @@ -34,7 +34,7 @@ public string OutputFormat private OutputFormatEnum mOutputFormat; - protected override string ToolName => IsWindows() ? "nasm.exe" : "nasm"; + protected override string ToolName => IsWindows() ? "yasm.exe" : "yasm"; protected override MessageImportance StandardErrorLoggingImportance => MessageImportance.High; protected override MessageImportance StandardOutputLoggingImportance => MessageImportance.High; @@ -77,9 +77,16 @@ protected override string GenerateCommandLineCommands() { var xBuilder = new CommandLineBuilder(); - xBuilder.AppendSwitch("-g"); + if (mOutputFormat == OutputFormatEnum.ELF) + { + xBuilder.AppendSwitch("-g dwarf2"); + } + else + { + xBuilder.AppendSwitch("-g null"); + } - xBuilder.AppendSwitchIfNotNull("-f ", OutputFormat); + xBuilder.AppendSwitchIfNotNull("-f ", OutputFormat.ToLower()); xBuilder.AppendSwitchIfNotNull("-o ", OutputFile); if (mOutputFormat == OutputFormatEnum.ELF) @@ -111,7 +118,7 @@ public override bool Execute() finally { xSW.Stop(); - Log.LogMessage(MessageImportance.High, "Nasm task took {0}", xSW.Elapsed); + Log.LogMessage(MessageImportance.High, "Yasm task took {0}", xSW.Elapsed); } } } diff --git a/source/Cosmos.Build.Tasks/build/Cosmos.Build.targets b/source/Cosmos.Build.Tasks/build/Cosmos.Build.targets index dd129a9e49..0d65c58acd 100644 --- a/source/Cosmos.Build.Tasks/build/Cosmos.Build.targets +++ b/source/Cosmos.Build.Tasks/build/Cosmos.Build.targets @@ -13,8 +13,8 @@ $(MSBuildThisFileDirectory)..\tools\ - $(CosmosToolsPath)nasm\win\ - nasm.exe + $(CosmosToolsPath)yasm\win\ + yasm.exe $(CosmosToolsPath)cygwin\win\ ld.exe diff --git a/source/Cosmos.Build.Tasks/tools/nasm/win/LICENSE b/source/Cosmos.Build.Tasks/tools/nasm/win/LICENSE deleted file mode 100644 index f9917f00af..0000000000 --- a/source/Cosmos.Build.Tasks/tools/nasm/win/LICENSE +++ /dev/null @@ -1,29 +0,0 @@ -NASM is now licensed under the 2-clause BSD license, also known as the -simplified BSD license. - - Copyright 1996-2010 the NASM Authors - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following - conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/source/Cosmos.Build.Tasks/tools/nasm/win/nasm.exe b/source/Cosmos.Build.Tasks/tools/nasm/win/nasm.exe deleted file mode 100644 index d487bd8207..0000000000 Binary files a/source/Cosmos.Build.Tasks/tools/nasm/win/nasm.exe and /dev/null differ diff --git a/source/Cosmos.Build.Tasks/tools/nasm/win/ndisasm.exe b/source/Cosmos.Build.Tasks/tools/nasm/win/ndisasm.exe deleted file mode 100644 index 887925762f..0000000000 Binary files a/source/Cosmos.Build.Tasks/tools/nasm/win/ndisasm.exe and /dev/null differ diff --git a/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/.gitkeep b/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/.gitkeep deleted file mode 100644 index 8b13789179..0000000000 --- a/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/.gitkeep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/ldrdf.exe b/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/ldrdf.exe deleted file mode 100644 index d60d1fb843..0000000000 Binary files a/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/ldrdf.exe and /dev/null differ diff --git a/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/rdf2bin.exe b/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/rdf2bin.exe deleted file mode 100644 index 1d3835918a..0000000000 Binary files a/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/rdf2bin.exe and /dev/null differ diff --git a/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/rdf2com.exe b/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/rdf2com.exe deleted file mode 100644 index 1d3835918a..0000000000 Binary files a/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/rdf2com.exe and /dev/null differ diff --git a/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/rdf2ihx.exe b/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/rdf2ihx.exe deleted file mode 100644 index 1d3835918a..0000000000 Binary files a/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/rdf2ihx.exe and /dev/null differ diff --git a/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/rdf2ith.exe b/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/rdf2ith.exe deleted file mode 100644 index 1d3835918a..0000000000 Binary files a/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/rdf2ith.exe and /dev/null differ diff --git a/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/rdf2srec.exe b/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/rdf2srec.exe deleted file mode 100644 index 1d3835918a..0000000000 Binary files a/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/rdf2srec.exe and /dev/null differ diff --git a/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/rdfdump.exe b/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/rdfdump.exe deleted file mode 100644 index f25a6bace8..0000000000 Binary files a/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/rdfdump.exe and /dev/null differ diff --git a/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/rdflib.exe b/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/rdflib.exe deleted file mode 100644 index e8a297cbb9..0000000000 Binary files a/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/rdflib.exe and /dev/null differ diff --git a/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/rdx.exe b/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/rdx.exe deleted file mode 100644 index 09f3e3e866..0000000000 Binary files a/source/Cosmos.Build.Tasks/tools/nasm/win/rdoff/rdx.exe and /dev/null differ diff --git a/source/Cosmos.Build.Tasks/tools/nasm/win/version.txt b/source/Cosmos.Build.Tasks/tools/nasm/win/version.txt deleted file mode 100644 index bc60569040..0000000000 --- a/source/Cosmos.Build.Tasks/tools/nasm/win/version.txt +++ /dev/null @@ -1,3 +0,0 @@ -2.12.01 - -before updating, test.. \ No newline at end of file diff --git a/source/Cosmos.Build.Tasks/tools/yasm/win/LICENSE.txt b/source/Cosmos.Build.Tasks/tools/yasm/win/LICENSE.txt new file mode 100644 index 0000000000..60b9b71d1b --- /dev/null +++ b/source/Cosmos.Build.Tasks/tools/yasm/win/LICENSE.txt @@ -0,0 +1,74 @@ +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND OTHER CONTRIBUTORS ``AS IS'' +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR OTHER CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +------------------------------------------------------------------------------- +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. Neither the name of the author nor the names of other contributors + may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND OTHER CONTRIBUTORS ``AS IS'' +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR OTHER CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +------------------------------------------------------------------------------- +NASM is now licensed under the 2-clause BSD license, also known as the +simplified BSD license. + + Copyright 1996-2009 the NASM Authors - All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following + conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/source/Cosmos.Build.Tasks/tools/yasm/win/yasm.exe b/source/Cosmos.Build.Tasks/tools/yasm/win/yasm.exe new file mode 100644 index 0000000000..b2cc6af610 Binary files /dev/null and b/source/Cosmos.Build.Tasks/tools/yasm/win/yasm.exe differ