diff --git a/Samples/C/ConsoleApplication/PackageLock.sml b/Samples/C/ConsoleApplication/PackageLock.sml index bfea2eaf..c70d3b60 100644 --- a/Samples/C/ConsoleApplication/PackageLock.sml +++ b/Samples/C/ConsoleApplication/PackageLock.sml @@ -12,8 +12,8 @@ Closures: { } Tool0: { 'C++': { - 'mwasplund|copy': { Version: '1.0.0' } - 'mwasplund|mkdir': { Version: '1.0.0' } + 'mwasplund|copy': { Version: '1.1.0' } + 'mwasplund|mkdir': { Version: '1.1.0' } } } } \ No newline at end of file diff --git a/Samples/Cpp/BuildExtension/Executable/PackageLock.sml b/Samples/Cpp/BuildExtension/Executable/PackageLock.sml index b3683f2c..d9ae5e60 100644 --- a/Samples/Cpp/BuildExtension/Executable/PackageLock.sml +++ b/Samples/Cpp/BuildExtension/Executable/PackageLock.sml @@ -1,20 +1,20 @@ -Version: 4 +Version: 5 Closures: { Root: { - "C++": [ - { Name: "Samples.SimpleBuildExtension.Executable", Version: "./", Build: "Build0", Tool: "Tool0" } - ] + 'C++': { + 'Samples.SimpleBuildExtension.Executable': { Version: './', Build: 'Build0', Tool: 'Tool0' } + } } Build0: { - Wren: [ - { Name: "Samples.Cpp.BuildExtension.Extension", Version: "../Extension/" } - { Name: "Soup.Cpp", Version: "0.10.1" } - ] + Wren: { + 'amples.Cpp.BuildExtension.Extension': { Version: '../Extension/' } + 'mwasplund|Soup.Cpp': { Version: '0.12.0' } + } } Tool0: { - "C++": [ - { Name: "copy", Version: "1.0.0" } - { Name: "mkdir", Version: "1.0.0" } - ] + 'C++': { + 'mwasplund|copy': { Version: '1.1.0' } + 'mwasplund|mkdir': { Version: '1.1.0' } + } } } \ No newline at end of file diff --git a/Samples/Cpp/BuildExtension/Executable/Recipe.sml b/Samples/Cpp/BuildExtension/Executable/Recipe.sml index f45dc0ab..170b1c0c 100644 --- a/Samples/Cpp/BuildExtension/Executable/Recipe.sml +++ b/Samples/Cpp/BuildExtension/Executable/Recipe.sml @@ -1,13 +1,13 @@ -Name: "Samples.SimpleBuildExtension.Executable" -Language: "C++|0" -Type: "Executable" -Version: "1.0.0" +Name: 'Samples.SimpleBuildExtension.Executable' +Language: 'C++|0' +Type: 'Executable' +Version: '1.0.0' Source: [ - "Main.cpp" + 'Main.cpp' ] Dependencies: { Build: [ - "../Extension/" + '../Extension/' ] } \ No newline at end of file diff --git a/Samples/Cpp/BuildExtension/Extension/PackageLock.sml b/Samples/Cpp/BuildExtension/Extension/PackageLock.sml index 3b5690c4..f0f4c4ef 100644 --- a/Samples/Cpp/BuildExtension/Extension/PackageLock.sml +++ b/Samples/Cpp/BuildExtension/Extension/PackageLock.sml @@ -2,19 +2,19 @@ Version: 5 Closures: { Root: { Wren: { - "mwasplund|Soup.Build.Utils": { Version: "0.6.0", Build: "Build0", Tool: "Tool0" } - "Samples.Cpp.BuildExtension.Extension": { Version: "../Extension", Build: "Build0", Tool: "Tool0" } + 'mwasplund|Soup.Build.Utils': { Version: '0.7.0', Build: 'Build0', Tool: 'Tool0' } + 'Samples.Cpp.BuildExtension.Extension': { Version: './', Build: 'Build0', Tool: 'Tool0' } } } Build0: { Wren: { - "mwasplund|Soup.Wren": { Version: "0.3.0" } + 'mwasplund|Soup.Wren': { Version: '0.4.2' } } } Tool0: { - "C++": { - "mwasplund|copy": { Version: "1.0.0" } - "mwasplund|mkdir": { Version: "1.0.0" } + 'C++': { + 'mwasplund|copy': { Version: '1.1.0' } + 'mwasplund|mkdir': { Version: '1.1.0' } } } } \ No newline at end of file diff --git a/Samples/Cpp/BuildExtension/Extension/Recipe.sml b/Samples/Cpp/BuildExtension/Extension/Recipe.sml index 330821db..82255e31 100644 --- a/Samples/Cpp/BuildExtension/Extension/Recipe.sml +++ b/Samples/Cpp/BuildExtension/Extension/Recipe.sml @@ -1,12 +1,12 @@ -Name: "Samples.Cpp.BuildExtension.Extension" -Language: "Wren|0" -Version: "1.0.0" +Name: 'Samples.Cpp.BuildExtension.Extension' +Language: 'Wren|0' +Version: '1.0.0' Source: [ - "CustomBuildTask.wren" + 'CustomBuildTask.wren' ] Dependencies: { Runtime: [ - "mwasplund|Soup.Build.Utils@0" + 'mwasplund|Soup.Build.Utils@0' ] } \ No newline at end of file diff --git a/Samples/Cpp/ConsoleApplication/PackageLock.sml b/Samples/Cpp/ConsoleApplication/PackageLock.sml index 6409e893..ea6cface 100644 --- a/Samples/Cpp/ConsoleApplication/PackageLock.sml +++ b/Samples/Cpp/ConsoleApplication/PackageLock.sml @@ -12,8 +12,8 @@ Closures: { } Tool0: { 'C++': { - 'mwasplund|copy': { Version: '1.0.0' } - 'mwasplund|mkdir': { Version: '1.0.0' } + 'mwasplund|copy': { Version: '1.1.0' } + 'mwasplund|mkdir': { Version: '1.1.0' } } } } \ No newline at end of file diff --git a/Samples/Cpp/DirectX/PackageLock.sml b/Samples/Cpp/DirectX/PackageLock.sml index a4906206..19ec4399 100644 --- a/Samples/Cpp/DirectX/PackageLock.sml +++ b/Samples/Cpp/DirectX/PackageLock.sml @@ -1,19 +1,19 @@ Version: 5 Closures: { Root: { - "C++": { - "Samples.Cpp.DirectX": { Version: "../DirectX", Build: "Build0", Tool: "Tool0" } + 'C++': { + 'Samples.Cpp.DirectX': { Version: './', Build: 'Build0', Tool: 'Tool0' } } } Build0: { Wren: { - "mwasplund|Soup.Cpp": { Version: "0.11.0" } + 'mwasplund|Soup.Cpp': { Version: '0.12.0' } } } Tool0: { - "C++": { - "mwasplund|copy": { Version: "1.0.0" } - "mwasplund|mkdir": { Version: "1.0.0" } + 'C++': { + 'mwasplund|copy': { Version: '1.1.0' } + 'mwasplund|mkdir': { Version: '1.1.0' } } } } \ No newline at end of file diff --git a/Samples/Cpp/DirectX/Recipe.sml b/Samples/Cpp/DirectX/Recipe.sml index af70b152..c1ba769a 100644 --- a/Samples/Cpp/DirectX/Recipe.sml +++ b/Samples/Cpp/DirectX/Recipe.sml @@ -1,22 +1,22 @@ -Name: "Samples.Cpp.DirectX" -Language: "C++|0" -Type: "Windows" -Version: "1.0.0" +Name: 'Samples.Cpp.DirectX' +Language: 'C++|0' +Type: 'Windows' +Version: '1.0.0' Partitions: [ - { Source: "D3D12HelloTriangle.cpp", Imports: [ "DXSample.cpp", "DXSampleHelper.cpp", "Win32Application.cpp" ] } - { Source: "DXSample.cpp", Imports: [ "DXSampleHelper.cpp" ] } - { Source: "DXSampleHelper.cpp" } - { Source: "Win32Application.cpp", Imports: [ "DXSample.cpp", "DXSampleHelper.cpp" ] } + { Source: 'D3D12HelloTriangle.cpp', Imports: [ 'DXSample.cpp', 'DXSampleHelper.cpp', 'Win32Application.cpp' ] } + { Source: 'DXSample.cpp', Imports: [ 'DXSampleHelper.cpp' ] } + { Source: 'DXSampleHelper.cpp' } + { Source: 'Win32Application.cpp', Imports: [ 'DXSample.cpp', 'DXSampleHelper.cpp' ] } ] -Interface: "Interface.cpp" +Interface: 'Interface.cpp' Source: [ - "Main.cpp" + 'Main.cpp' ] PlatformLibraries: [ - "D3D12.lib" - "D3DCompiler.lib" - "DXGI.lib" + 'D3D12.lib' + 'D3DCompiler.lib' + 'DXGI.lib' ] RuntimeDependencies: [ - "Shaders.hlsl" + 'Shaders.hlsl' ] \ No newline at end of file diff --git a/Samples/Cpp/DynamicLibrary/Application/PackageLock.sml b/Samples/Cpp/DynamicLibrary/Application/PackageLock.sml index eefd2cae..b8a5ce2c 100644 --- a/Samples/Cpp/DynamicLibrary/Application/PackageLock.sml +++ b/Samples/Cpp/DynamicLibrary/Application/PackageLock.sml @@ -1,20 +1,20 @@ Version: 5 Closures: { Root: { - "C++": { - "Samples.Cpp.DynamicLibrary.Application": { Version: "../Application", Build: "Build0", Tool: "Tool0" } - "Samples.Cpp.DynamicLibrary.Library": { Version: "../Library/", Build: "Build0", Tool: "Tool0" } + 'C++': { + 'Samples.Cpp.DynamicLibrary.Application': { Version: '../Application', Build: 'Build0', Tool: 'Tool0' } + 'Samples.Cpp.DynamicLibrary.Library': { Version: '../Library/', Build: 'Build0', Tool: 'Tool0' } } } Build0: { Wren: { - "mwasplund|Soup.Cpp": { Version: "0.11.0" } + 'mwasplund|Soup.Cpp': { Version: '0.12.0' } } } Tool0: { - "C++": { - "mwasplund|copy": { Version: "1.0.0" } - "mwasplund|mkdir": { Version: "1.0.0" } + 'C++': { + 'mwasplund|copy': { Version: '1.1.0' } + 'mwasplund|mkdir': { Version: '1.1.0' } } } } \ No newline at end of file diff --git a/Samples/Cpp/DynamicLibrary/Application/Recipe.sml b/Samples/Cpp/DynamicLibrary/Application/Recipe.sml index 7e4c0432..bcdde300 100644 --- a/Samples/Cpp/DynamicLibrary/Application/Recipe.sml +++ b/Samples/Cpp/DynamicLibrary/Application/Recipe.sml @@ -1,13 +1,13 @@ -Name: "Samples.Cpp.DynamicLibrary.Application" -Language: "C++|0" -Type: "Executable" -Version: "1.0.0" +Name: 'Samples.Cpp.DynamicLibrary.Application' +Language: 'C++|0' +Type: 'Executable' +Version: '1.0.0' Source: [ - "Main.cpp" + 'Main.cpp' ] Dependencies: { Runtime: [ - "../Library/" + '../Library/' ] } \ No newline at end of file diff --git a/Samples/Cpp/DynamicLibrary/Library/Recipe.sml b/Samples/Cpp/DynamicLibrary/Library/Recipe.sml index a32a0498..5501a067 100644 --- a/Samples/Cpp/DynamicLibrary/Library/Recipe.sml +++ b/Samples/Cpp/DynamicLibrary/Library/Recipe.sml @@ -1,21 +1,21 @@ -Name: "Samples.Cpp.DynamicLibrary.Library" -Language: "C++|0" -Version: "1.0.0" -Type: "DynamicLibrary" +Name: 'Samples.Cpp.DynamicLibrary.Library' +Language: 'C++|0' +Version: '1.0.0' +Type: 'DynamicLibrary' Defines: [ - "EXPORT_LIBRARY" + 'EXPORT_LIBRARY' ] Source: [ - "Library.cpp" + 'Library.cpp' ] IncludePaths: [ - "public/" + 'public/' ] PublicHeaders: [ { - Root: "public/" + Root: 'public/' Files: [ - "Library.h" + 'Library.h' ] } ] \ No newline at end of file diff --git a/Samples/Cpp/HeaderLibrary/Application/PackageLock.sml b/Samples/Cpp/HeaderLibrary/Application/PackageLock.sml index 4da2d2ac..08b1b2e6 100644 --- a/Samples/Cpp/HeaderLibrary/Application/PackageLock.sml +++ b/Samples/Cpp/HeaderLibrary/Application/PackageLock.sml @@ -1,20 +1,20 @@ Version: 5 Closures: { Root: { - "C++": { - "Samples.Cpp.HeaderLibrary.Application": { Version: "../Application", Build: "Build0", Tool: "Tool0" } - "Samples.Cpp.HeaderLibrary.Library": { Version: "../Library/", Build: "Build0", Tool: "Tool0" } + 'C++': { + 'Samples.Cpp.HeaderLibrary.Application': { Version: '../Application', Build: 'Build0', Tool: 'Tool0' } + 'Samples.Cpp.HeaderLibrary.Library': { Version: '../Library/', Build: 'Build0', Tool: 'Tool0' } } } Build0: { Wren: { - "mwasplund|Soup.Cpp": { Version: "0.11.0" } + 'mwasplund|Soup.Cpp': { Version: '0.12.0' } } } Tool0: { - "C++": { - "mwasplund|copy": { Version: "1.0.0" } - "mwasplund|mkdir": { Version: "1.0.0" } + 'C++': { + 'mwasplund|copy': { Version: '1.1.0' } + 'mwasplund|mkdir': { Version: '1.1.0' } } } } \ No newline at end of file diff --git a/Samples/Cpp/HeaderLibrary/Application/Recipe.sml b/Samples/Cpp/HeaderLibrary/Application/Recipe.sml index 0dd62d73..13904666 100644 --- a/Samples/Cpp/HeaderLibrary/Application/Recipe.sml +++ b/Samples/Cpp/HeaderLibrary/Application/Recipe.sml @@ -1,13 +1,13 @@ -Name: "Samples.Cpp.HeaderLibrary.Application" -Language: "C++|0" -Type: "Executable" -Version: "1.0.0" +Name: 'Samples.Cpp.HeaderLibrary.Application' +Language: 'C++|0' +Type: 'Executable' +Version: '1.0.0' Source: [ - "Main.cpp" + 'Main.cpp' ] Dependencies: { Runtime: [ - "../Library/" + '../Library/' ] } \ No newline at end of file diff --git a/Samples/Cpp/HeaderLibrary/Library/Recipe.sml b/Samples/Cpp/HeaderLibrary/Library/Recipe.sml index 7ce2cd4f..56ffe3fe 100644 --- a/Samples/Cpp/HeaderLibrary/Library/Recipe.sml +++ b/Samples/Cpp/HeaderLibrary/Library/Recipe.sml @@ -1,14 +1,14 @@ -Name: "Samples.Cpp.HeaderLibrary.Library" -Language: "C++|0" -Version: "1.0.0" +Name: 'Samples.Cpp.HeaderLibrary.Library' +Language: 'C++|0' +Version: '1.0.0' IncludePaths: [ - "public/" + 'public/' ] PublicHeaders: [ { - Root: "./" + Root: './' Files: [ - "Library.h" + 'Library.h' ] } ] \ No newline at end of file diff --git a/Samples/Cpp/ModuleDynamicLibrary/Application/PackageLock.sml b/Samples/Cpp/ModuleDynamicLibrary/Application/PackageLock.sml index 61419230..cb85021f 100644 --- a/Samples/Cpp/ModuleDynamicLibrary/Application/PackageLock.sml +++ b/Samples/Cpp/ModuleDynamicLibrary/Application/PackageLock.sml @@ -1,20 +1,20 @@ Version: 5 Closures: { Root: { - "C++": { - "Samples.Cpp.ModuleDynamicLibrary.Application": { Version: "../Application", Build: "Build0", Tool: "Tool0" } - "Samples.Cpp.ModuleDynamicLibrary.Library": { Version: "../Library/", Build: "Build0", Tool: "Tool0" } + 'C++': { + 'Samples.Cpp.ModuleDynamicLibrary.Application': { Version: '../Application', Build: 'Build0', Tool: 'Tool0' } + 'Samples.Cpp.ModuleDynamicLibrary.Library': { Version: '../Library/', Build: 'Build0', Tool: 'Tool0' } } } Build0: { Wren: { - "mwasplund|Soup.Cpp": { Version: "0.11.0" } + 'mwasplund|Soup.Cpp': { Version: '0.12.0' } } } Tool0: { - "C++": { - "mwasplund|copy": { Version: "1.0.0" } - "mwasplund|mkdir": { Version: "1.0.0" } + 'C++': { + 'mwasplund|copy': { Version: '1.1.0' } + 'mwasplund|mkdir': { Version: '1.1.0' } } } } \ No newline at end of file diff --git a/Samples/Cpp/ModuleDynamicLibrary/Application/Recipe.sml b/Samples/Cpp/ModuleDynamicLibrary/Application/Recipe.sml index b6ec0369..8ebeb8f6 100644 --- a/Samples/Cpp/ModuleDynamicLibrary/Application/Recipe.sml +++ b/Samples/Cpp/ModuleDynamicLibrary/Application/Recipe.sml @@ -1,13 +1,13 @@ -Name: "Samples.Cpp.ModuleDynamicLibrary.Application" -Language: "C++|0" -Type: "Executable" -Version: "1.0.0" +Name: 'Samples.Cpp.ModuleDynamicLibrary.Application' +Language: 'C++|0' +Type: 'Executable' +Version: '1.0.0' Source: [ - "Main.cpp" + 'Main.cpp' ] Dependencies: { Runtime: [ - "../Library/" + '../Library/' ] } \ No newline at end of file diff --git a/Samples/Cpp/ModuleDynamicLibrary/Library/Recipe.sml b/Samples/Cpp/ModuleDynamicLibrary/Library/Recipe.sml index a44b1c48..a98af04a 100644 --- a/Samples/Cpp/ModuleDynamicLibrary/Library/Recipe.sml +++ b/Samples/Cpp/ModuleDynamicLibrary/Library/Recipe.sml @@ -1,5 +1,5 @@ -Name: "Samples.Cpp.ModuleDynamicLibrary.Library" -Language: "C++|0" -Version: "1.0.0" -Interface: "Module.cpp" -Type: "DynamicLibrary" \ No newline at end of file +Name: 'Samples.Cpp.ModuleDynamicLibrary.Library' +Language: 'C++|0' +Version: '1.0.0' +Interface: 'Module.cpp' +Type: 'DynamicLibrary' \ No newline at end of file diff --git a/Samples/Cpp/ModuleInterface/PackageLock.sml b/Samples/Cpp/ModuleInterface/PackageLock.sml index 0961e2a0..cca38a42 100644 --- a/Samples/Cpp/ModuleInterface/PackageLock.sml +++ b/Samples/Cpp/ModuleInterface/PackageLock.sml @@ -1,19 +1,19 @@ Version: 5 Closures: { Root: { - "C++": { - "Samples.Cpp.ModuleInterface": { Version: "../ModuleInterface", Build: "Build0", Tool: "Tool0" } + 'C++': { + 'Samples.Cpp.ModuleInterface': { Version: '../ModuleInterface', Build: 'Build0', Tool: 'Tool0' } } } Build0: { Wren: { - "mwasplund|Soup.Cpp": { Version: "0.11.0" } + 'mwasplund|Soup.Cpp': { Version: '0.12.0' } } } Tool0: { - "C++": { - "mwasplund|copy": { Version: "1.0.0" } - "mwasplund|mkdir": { Version: "1.0.0" } + 'C++': { + 'mwasplund|copy': { Version: '1.1.0' } + 'mwasplund|mkdir': { Version: '1.1.0' } } } } \ No newline at end of file diff --git a/Samples/Cpp/ModuleInterface/Recipe.sml b/Samples/Cpp/ModuleInterface/Recipe.sml index 4adc3f8f..5c1e0574 100644 --- a/Samples/Cpp/ModuleInterface/Recipe.sml +++ b/Samples/Cpp/ModuleInterface/Recipe.sml @@ -1,8 +1,8 @@ -Name: "Samples.Cpp.ModuleInterface" -Language: "C++|0" -Type: "Executable" -Version: "1.0.0" -Interface: "Module.cpp" +Name: 'Samples.Cpp.ModuleInterface' +Language: 'C++|0' +Type: 'Executable' +Version: '1.0.0' +Interface: 'Module.cpp' Source: [ - "Main.cpp" + 'Main.cpp' ] \ No newline at end of file diff --git a/Samples/Cpp/ParseJsonFile/PackageLock.sml b/Samples/Cpp/ParseJsonFile/PackageLock.sml index f76d8f94..35ebdec1 100644 --- a/Samples/Cpp/ParseJsonFile/PackageLock.sml +++ b/Samples/Cpp/ParseJsonFile/PackageLock.sml @@ -1,20 +1,20 @@ Version: 5 Closures: { Root: { - "C++": { - "mwasplund|json11": { Version: "1.1.0", Build: "Build0", Tool: "Tool0" } - "Samples.Cpp.ParseJsonFile": { Version: "../ParseJsonFile", Build: "Build0", Tool: "Tool0" } + 'C++': { + 'mwasplund|json11': { Version: '1.1.1', Build: 'Build0', Tool: 'Tool0' } + 'Samples.Cpp.ParseJsonFile': { Version: '../ParseJsonFile', Build: 'Build0', Tool: 'Tool0' } } } Build0: { Wren: { - "mwasplund|Soup.Cpp": { Version: "0.11.0" } + 'mwasplund|Soup.Cpp': { Version: '0.12.0' } } } Tool0: { - "C++": { - "mwasplund|copy": { Version: "1.0.0" } - "mwasplund|mkdir": { Version: "1.0.0" } + 'C++': { + 'mwasplund|copy': { Version: '1.1.0' } + 'mwasplund|mkdir': { Version: '1.1.0' } } } } \ No newline at end of file diff --git a/Samples/Cpp/ParseJsonFile/Recipe.sml b/Samples/Cpp/ParseJsonFile/Recipe.sml index 5969fdf4..d0fb648f 100644 --- a/Samples/Cpp/ParseJsonFile/Recipe.sml +++ b/Samples/Cpp/ParseJsonFile/Recipe.sml @@ -1,13 +1,13 @@ -Name: "Samples.Cpp.ParseJsonFile" -Language: "C++|0" -Version: "1.0.0" -Type: "Executable" +Name: 'Samples.Cpp.ParseJsonFile' +Language: 'C++|0' +Version: '1.0.0' +Type: 'Executable' Source: [ - "Main.cpp" + 'Main.cpp' ] Dependencies: { Runtime: [ - "mwasplund|json11@1" + 'mwasplund|json11@1' ] } \ No newline at end of file diff --git a/Samples/Cpp/StaticLibrary/Application/PackageLock.sml b/Samples/Cpp/StaticLibrary/Application/PackageLock.sml index 652e6add..53fadbe7 100644 --- a/Samples/Cpp/StaticLibrary/Application/PackageLock.sml +++ b/Samples/Cpp/StaticLibrary/Application/PackageLock.sml @@ -1,20 +1,20 @@ Version: 5 Closures: { Root: { - "C++": { - "Samples.Cpp.StaticLibrary.Application": { Version: "../Application", Build: "Build0", Tool: "Tool0" } - "Samples.Cpp.StaticLibrary.Library": { Version: "../Library/", Build: "Build0", Tool: "Tool0" } + 'C++': { + 'Samples.Cpp.StaticLibrary.Application': { Version: '../Application', Build: 'Build0', Tool: 'Tool0' } + 'Samples.Cpp.StaticLibrary.Library': { Version: '../Library/', Build: 'Build0', Tool: 'Tool0' } } } Build0: { Wren: { - "mwasplund|Soup.Cpp": { Version: "0.11.0" } + 'mwasplund|Soup.Cpp': { Version: '0.12.0' } } } Tool0: { - "C++": { - "mwasplund|copy": { Version: "1.0.0" } - "mwasplund|mkdir": { Version: "1.0.0" } + 'C++': { + 'mwasplund|copy': { Version: '1.1.0' } + 'mwasplund|mkdir': { Version: '1.1.0' } } } } \ No newline at end of file diff --git a/Samples/Cpp/StaticLibrary/Application/Recipe.sml b/Samples/Cpp/StaticLibrary/Application/Recipe.sml index be1a9d59..27c0feea 100644 --- a/Samples/Cpp/StaticLibrary/Application/Recipe.sml +++ b/Samples/Cpp/StaticLibrary/Application/Recipe.sml @@ -1,13 +1,13 @@ -Name: "Samples.Cpp.StaticLibrary.Application" -Language: "C++|0" -Type: "Executable" -Version: "1.0.0" +Name: 'Samples.Cpp.StaticLibrary.Application' +Language: 'C++|0' +Type: 'Executable' +Version: '1.0.0' Source: [ - "Main.cpp" + 'Main.cpp' ] Dependencies: { Runtime: [ - "../Library/" + '../Library/' ] } \ No newline at end of file diff --git a/Samples/Cpp/StaticLibrary/Library/Recipe.sml b/Samples/Cpp/StaticLibrary/Library/Recipe.sml index c74be550..bceeee26 100644 --- a/Samples/Cpp/StaticLibrary/Library/Recipe.sml +++ b/Samples/Cpp/StaticLibrary/Library/Recipe.sml @@ -1,5 +1,5 @@ -Name: "Samples.Cpp.StaticLibrary.Library" -Language: "C++|0" -Version: "1.0.0" -Interface: "Module.cpp" -Type: "StaticLibrary" \ No newline at end of file +Name: 'Samples.Cpp.StaticLibrary.Library' +Language: 'C++|0' +Version: '1.0.0' +Interface: 'Module.cpp' +Type: 'StaticLibrary' \ No newline at end of file diff --git a/Samples/Cpp/WindowsApplication/PackageLock.sml b/Samples/Cpp/WindowsApplication/PackageLock.sml index 020408ec..ba3b1e56 100644 --- a/Samples/Cpp/WindowsApplication/PackageLock.sml +++ b/Samples/Cpp/WindowsApplication/PackageLock.sml @@ -1,19 +1,19 @@ Version: 5 Closures: { Root: { - "C++": { - "Samples.Cpp.WindowsApplication": { Version: "../WindowsApplication", Build: "Build0", Tool: "Tool0" } + 'C++': { + 'Samples.Cpp.WindowsApplication': { Version: '../WindowsApplication', Build: 'Build0', Tool: 'Tool0' } } } Build0: { Wren: { - "mwasplund|Soup.Cpp": { Version: "0.11.0" } + 'mwasplund|Soup.Cpp': { Version: '0.12.0' } } } Tool0: { - "C++": { - "mwasplund|copy": { Version: "1.0.0" } - "mwasplund|mkdir": { Version: "1.0.0" } + 'C++': { + 'mwasplund|copy': { Version: '1.1.0' } + 'mwasplund|mkdir': { Version: '1.1.0' } } } } \ No newline at end of file diff --git a/Samples/Cpp/WindowsApplication/Recipe.sml b/Samples/Cpp/WindowsApplication/Recipe.sml index 4eda538a..2d5035dc 100644 --- a/Samples/Cpp/WindowsApplication/Recipe.sml +++ b/Samples/Cpp/WindowsApplication/Recipe.sml @@ -1,8 +1,8 @@ -Name: "Samples.Cpp.WindowsApplication" -Language: "C++|0" -Type: "Windows" -Version: "1.0.0" -Resources: "WindowsProject.rc" +Name: 'Samples.Cpp.WindowsApplication' +Language: 'C++|0' +Type: 'Windows' +Version: '1.0.0' +Resources: 'WindowsProject.rc' Source: [ - "WindowsProject.cpp" + 'WindowsProject.cpp' ] \ No newline at end of file diff --git a/Scripts/Linux/soup b/Scripts/Linux/soup index e400bb94..84355387 100755 --- a/Scripts/Linux/soup +++ b/Scripts/Linux/soup @@ -13,39 +13,31 @@ GLOBAL_OUT_DIR=~/.soup/out CONFIG_HASH=Oltq7cGwk0Rbgy1I-3mCMDDE5yM -SOUP_VERSION="0.36.0" -COPY_VERSION="1.0.0" -MKDIR_VERSION="1.0.0" -SOUP_CPP_VERSION="0.8.2" -SOUP_CSHARP_VERSION="0.9.0" -SOUP_WREN_VERSION="0.2.0" +OWNER=mwasplund + +SOUP_VERSION="0.37.0" +COPY_VERSION="1.1.0" +MKDIR_VERSION="1.1.0" +SOUP_WREN_VERSION="0.4.1" # Cleanup previous runs rm -rf $RUN_DIR mkdir -p $RUN_DIR -cp -p $OUT_DIR/Cpp/Soup/$SOUP_VERSION/$CONFIG_HASH/bin/Soup.exe $RUN_DIR/soup -cp -p $OUT_DIR/Cpp/Soup/$SOUP_VERSION/$CONFIG_HASH/bin/Soup.Generate.exe $RUN_DIR/generate - -mkdir -p $RUN_DIR/BuiltIn/copy/$COPY_VERSION -cp -p $SOURCE_DIR/Tools/Copy/Recipe.sml $RUN_DIR/BuiltIn/copy/$COPY_VERSION/Recipe.sml -cp -p -R $OUT_DIR/Cpp/copy/$COPY_VERSION/$CONFIG_HASH/ $RUN_DIR/BuiltIn/copy/$COPY_VERSION/out/ - -mkdir -p $RUN_DIR/BuiltIn/mkdir/$MKDIR_VERSION -cp -p $SOURCE_DIR/Tools/Mkdir/Recipe.sml $RUN_DIR/BuiltIn/mkdir/$MKDIR_VERSION/Recipe.sml -cp -p -R $OUT_DIR/Cpp/mkdir/$MKDIR_VERSION/$CONFIG_HASH/ $RUN_DIR/BuiltIn/mkdir/$MKDIR_VERSION/out/ +cp -p $OUT_DIR/Cpp/Local/Soup/$SOUP_VERSION/$CONFIG_HASH/bin/Soup.exe $RUN_DIR/soup +cp -p $OUT_DIR/Cpp/Local/Soup/$SOUP_VERSION/$CONFIG_HASH/bin/Soup.Generate.exe $RUN_DIR/generate -mkdir -p $RUN_DIR/BuiltIn/Soup.Cpp/$SOUP_CPP_VERSION -cp -p $GLOBAL_PACKAGES_DIR/Wren/Soup.Cpp/$SOUP_CPP_VERSION/Recipe.sml $RUN_DIR/BuiltIn/Soup.Cpp/$SOUP_CPP_VERSION/Recipe.sml -cp -p -R $GLOBAL_OUT_DIR/Wren/Soup.Cpp/$SOUP_CPP_VERSION/$CONFIG_HASH/ $RUN_DIR/BuiltIn/Soup.Cpp/$SOUP_CPP_VERSION/out/ +mkdir -p $RUN_DIR/BuiltIn/$OWNER/copy/$COPY_VERSION +cp -p $SOURCE_DIR/Tools/Copy/Recipe.sml $RUN_DIR/BuiltIn/$OWNER/copy/$COPY_VERSION/Recipe.sml +cp -p -R $OUT_DIR/Cpp/Local/copy/$COPY_VERSION/$CONFIG_HASH/ $RUN_DIR/BuiltIn/$OWNER/copy/$COPY_VERSION/out/ -mkdir -p $RUN_DIR/BuiltIn/Soup.CSharp/$SOUP_CSHARP_VERSION -cp -p $GLOBAL_PACKAGES_DIR/Wren/Soup.CSharp/$SOUP_CSHARP_VERSION/Recipe.sml $RUN_DIR/BuiltIn/Soup.CSharp/$SOUP_CSHARP_VERSION/Recipe.sml -cp -p -R $GLOBAL_OUT_DIR/Wren/Soup.CSharp/$SOUP_CSHARP_VERSION/$CONFIG_HASH/ $RUN_DIR/BuiltIn/Soup.CSharp/$SOUP_CSHARP_VERSION/out/ +mkdir -p $RUN_DIR/BuiltIn/$OWNER/mkdir/$MKDIR_VERSION +cp -p $SOURCE_DIR/Tools/Mkdir/Recipe.sml $RUN_DIR/BuiltIn/$OWNER/mkdir/$MKDIR_VERSION/Recipe.sml +cp -p -R $OUT_DIR/Cpp/Local/mkdir/$MKDIR_VERSION/$CONFIG_HASH/ $RUN_DIR/BuiltIn/$OWNER/mkdir/$MKDIR_VERSION/out/ -mkdir -p $RUN_DIR/BuiltIn/Soup.Wren/$SOUP_WREN_VERSION -cp -p $GLOBAL_PACKAGES_DIR/Wren/Soup.Wren/$SOUP_WREN_VERSION/Recipe.sml $RUN_DIR/BuiltIn/Soup.Wren/$SOUP_WREN_VERSION/Recipe.sml -cp -p -R $GLOBAL_OUT_DIR/Wren/Soup.Wren/$SOUP_WREN_VERSION/$CONFIG_HASH/ $RUN_DIR/BuiltIn/Soup.Wren/$SOUP_WREN_VERSION/out/ +mkdir -p $RUN_DIR/BuiltIn/$OWNER/Soup.Wren/$SOUP_WREN_VERSION +cp -p $GLOBAL_PACKAGES_DIR/Wren/$OWNER/Soup.Wren/$SOUP_WREN_VERSION/Recipe.sml $RUN_DIR/BuiltIn/$OWNER/Soup.Wren/$SOUP_WREN_VERSION/Recipe.sml +cp -p -R $GLOBAL_OUT_DIR/Wren/$OWNER/Soup.Wren/$SOUP_WREN_VERSION/$CONFIG_HASH/ $RUN_DIR/BuiltIn/$OWNER/Soup.Wren/$SOUP_WREN_VERSION/out/ cp -p -R $ROOT_DIR/Source/out/msbuild/bin/Soup.Build.PackageManager/Release/net8.0/linux-x64/publish/ $RUN_DIR/PackageManager diff --git a/Scripts/Linux/soupd b/Scripts/Linux/soupd index a5eecff8..aeb9d933 100755 --- a/Scripts/Linux/soupd +++ b/Scripts/Linux/soupd @@ -13,39 +13,31 @@ GLOBAL_OUT_DIR=~/.soup/out CONFIG_HASH=J_HqSstV55vlb-x6RWC_hLRFRDU +OWNER=mwasplund + SOUP_VERSION="0.37.0" -COPY_VERSION="1.0.0" -MKDIR_VERSION="1.0.0" -SOUP_CPP_VERSION="0.8.2" -SOUP_CSHARP_VERSION="0.9.0" -SOUP_WREN_VERSION="0.2.0" +COPY_VERSION="1.1.0" +MKDIR_VERSION="1.1.0" +SOUP_WREN_VERSION="0.4.1" # Cleanup previous runs rm -rf $RUN_DIR mkdir -p $RUN_DIR -cp -p $OUT_DIR/Cpp/Soup/$SOUP_VERSION/$CONFIG_HASH/bin/Soup.exe $RUN_DIR/soup -cp -p $OUT_DIR/Cpp/Soup/$SOUP_VERSION/$CONFIG_HASH/bin/Soup.Generate.exe $RUN_DIR/generate - -mkdir -p $RUN_DIR/BuiltIn/copy/$COPY_VERSION -cp -p $SOURCE_DIR/Tools/Copy/Recipe.sml $RUN_DIR/BuiltIn/copy/$COPY_VERSION/Recipe.sml -cp -p -R $OUT_DIR/Cpp/copy/$COPY_VERSION/$CONFIG_HASH/ $RUN_DIR/BuiltIn/copy/$COPY_VERSION/out/ - -mkdir -p $RUN_DIR/BuiltIn/mkdir/$MKDIR_VERSION -cp -p $SOURCE_DIR/Tools/Mkdir/Recipe.sml $RUN_DIR/BuiltIn/mkdir/$MKDIR_VERSION/Recipe.sml -cp -p -R $OUT_DIR/Cpp/mkdir/$MKDIR_VERSION/$CONFIG_HASH/ $RUN_DIR/BuiltIn/mkdir/$MKDIR_VERSION/out/ +cp -p $OUT_DIR/Cpp/Local/Soup/$SOUP_VERSION/$CONFIG_HASH/bin/Soup.exe $RUN_DIR/soup +cp -p $OUT_DIR/Cpp/Local/Soup/$SOUP_VERSION/$CONFIG_HASH/bin/Soup.Generate.exe $RUN_DIR/generate -mkdir -p $RUN_DIR/BuiltIn/Soup.Cpp/$SOUP_CPP_VERSION -cp -p $GLOBAL_PACKAGES_DIR/Wren/Soup.Cpp/$SOUP_CPP_VERSION/Recipe.sml $RUN_DIR/BuiltIn/Soup.Cpp/$SOUP_CPP_VERSION/Recipe.sml -cp -p -R $GLOBAL_OUT_DIR/Wren/Soup.Cpp/$SOUP_CPP_VERSION/$CONFIG_HASH/ $RUN_DIR/BuiltIn/Soup.Cpp/$SOUP_CPP_VERSION/out/ +mkdir -p $RUN_DIR/BuiltIn/$OWNER/copy/$COPY_VERSION +cp -p $SOURCE_DIR/Tools/Copy/Recipe.sml $RUN_DIR/BuiltIn/$OWNER/copy/$COPY_VERSION/Recipe.sml +cp -p -R $OUT_DIR/Cpp/Local/copy/$COPY_VERSION/$CONFIG_HASH/ $RUN_DIR/BuiltIn/$OWNER/copy/$COPY_VERSION/out/ -mkdir -p $RUN_DIR/BuiltIn/Soup.CSharp/$SOUP_CSHARP_VERSION -cp -p $GLOBAL_PACKAGES_DIR/Wren/Soup.CSharp/$SOUP_CSHARP_VERSION/Recipe.sml $RUN_DIR/BuiltIn/Soup.CSharp/$SOUP_CSHARP_VERSION/Recipe.sml -cp -p -R $GLOBAL_OUT_DIR/Wren/Soup.CSharp/$SOUP_CSHARP_VERSION/$CONFIG_HASH/ $RUN_DIR/BuiltIn/Soup.CSharp/$SOUP_CSHARP_VERSION/out/ +mkdir -p $RUN_DIR/BuiltIn/$OWNER/mkdir/$MKDIR_VERSION +cp -p $SOURCE_DIR/Tools/Mkdir/Recipe.sml $RUN_DIR/BuiltIn/$OWNER/mkdir/$MKDIR_VERSION/Recipe.sml +cp -p -R $OUT_DIR/Cpp/Local/mkdir/$MKDIR_VERSION/$CONFIG_HASH/ $RUN_DIR/BuiltIn/$OWNER/mkdir/$MKDIR_VERSION/out/ -mkdir -p $RUN_DIR/BuiltIn/Soup.Wren/$SOUP_WREN_VERSION -cp -p $GLOBAL_PACKAGES_DIR/Wren/Soup.Wren/$SOUP_WREN_VERSION/Recipe.sml $RUN_DIR/BuiltIn/Soup.Wren/$SOUP_WREN_VERSION/Recipe.sml -cp -p -R $GLOBAL_OUT_DIR/Wren/Soup.Wren/$SOUP_WREN_VERSION/$CONFIG_HASH/ $RUN_DIR/BuiltIn/Soup.Wren/$SOUP_WREN_VERSION/out/ +mkdir -p $RUN_DIR/BuiltIn/$OWNER/Soup.Wren/$SOUP_WREN_VERSION +cp -p $GLOBAL_PACKAGES_DIR/Wren/$OWNER/Soup.Wren/$SOUP_WREN_VERSION/Recipe.sml $RUN_DIR/BuiltIn/$OWNER/Soup.Wren/$SOUP_WREN_VERSION/Recipe.sml +cp -p -R $GLOBAL_OUT_DIR/Wren/$OWNER/Soup.Wren/$SOUP_WREN_VERSION/$CONFIG_HASH/ $RUN_DIR/BuiltIn/$OWNER/Soup.Wren/$SOUP_WREN_VERSION/out/ cp -p -R $ROOT_DIR/Source/out/msbuild/bin/Soup.Build.PackageManager/Release/net8.0/linux-x64/publish/ $RUN_DIR/PackageManager diff --git a/Scripts/Windows/soup.cmd b/Scripts/Windows/soup.cmd index cd471fa5..15b43ea3 100644 --- a/Scripts/Windows/soup.cmd +++ b/Scripts/Windows/soup.cmd @@ -13,8 +13,8 @@ SET ConfigHash=Oltq7cGwk0Rbgy1I-3mCMDDE5yM SET PKG_OWNER=mwasplund SET SOUP_VERSION=0.37.0 -SET COPY_VERSION=1.0.0 -SET MKDIR_VERSION=1.0.0 +SET COPY_VERSION=1.1.0 +SET MKDIR_VERSION=1.1.0 SET SOUP_WREN_VERSION=0.4.1 REM - Use a copy of the final binary in case we are re-buiding itself diff --git a/Scripts/Windows/soupd.cmd b/Scripts/Windows/soupd.cmd index 19b23701..362aa23e 100644 --- a/Scripts/Windows/soupd.cmd +++ b/Scripts/Windows/soupd.cmd @@ -13,8 +13,8 @@ SET ConfigHash=OZlIVjblazFuKXg-raWUNoGEnG4 SET PKG_OWNER=mwasplund SET SOUP_VERSION=0.37.0 -SET COPY_VERSION=1.0.0 -SET MKDIR_VERSION=1.0.0 +SET COPY_VERSION=1.1.0 +SET MKDIR_VERSION=1.1.0 SET SOUP_WREN_VERSION=0.4.1 REM - Use a copy of the final binary in case we are re-buiding itself diff --git a/Source/Client/CLI/PackageLock.sml b/Source/Client/CLI/PackageLock.sml index ccaa728b..0a1074fa 100644 --- a/Source/Client/CLI/PackageLock.sml +++ b/Source/Client/CLI/PackageLock.sml @@ -6,12 +6,12 @@ Closures: { mkdir: { Version: '../../Tools/Mkdir/', Build: 'Build0', Tool: 'Tool0' } 'Monitor.Host': { Version: '../../Monitor/Host/', Build: 'Build0', Tool: 'Tool0' } 'Monitor.Shared': { Version: '../../Monitor/Shared/', Build: 'Build0', Tool: 'Tool0' } - 'mwasplund|CryptoPP': { Version: '1.2.1', Build: 'Build0', Tool: 'Tool0' } - 'mwasplund|Detours': { Version: '4.0.11', Build: 'Build0', Tool: 'Tool0' } - 'mwasplund|Opal': { Version: '0.10.0', Build: 'Build0', Tool: 'Tool0' } + 'mwasplund|CryptoPP': { Version: '1.2.2', Build: 'Build0', Tool: 'Tool0' } + 'mwasplund|Detours': { Version: '4.0.12', Build: 'Build0', Tool: 'Tool0' } + 'mwasplund|Opal': { Version: '0.10.1', Build: 'Build0', Tool: 'Tool0' } 'mwasplund|reflex': { Version: '1.0.4', Build: 'Build0', Tool: 'Tool0' } 'mwasplund|Soup.Test.Assert': { Version: '0.4.0', Build: 'Build0', Tool: 'Tool0' } - 'mwasplund|wren': { Version: '1.0.4', Build: 'Build0', Tool: 'Tool0' } + 'mwasplund|wren': { Version: '1.0.5', Build: 'Build0', Tool: 'Tool0' } Soup: { Version: '../CLI', Build: 'Build0', Tool: 'Tool0' } 'Soup.Core': { Version: '../Core/', Build: 'Build1', Tool: 'Tool0' } 'Soup.Generate': { Version: '../../Generate/', Build: 'Build0', Tool: 'Tool0' } @@ -39,8 +39,8 @@ Closures: { } Tool0: { 'C++': { - 'mwasplund|copy': { Version: '1.0.0' } - 'mwasplund|mkdir': { Version: '1.0.0' } + 'mwasplund|copy': { Version: '1.1.0' } + 'mwasplund|mkdir': { Version: '1.1.0' } } } } \ No newline at end of file diff --git a/Source/Client/Core/Source/Build/BuildEngine.h b/Source/Client/Core/Source/Build/BuildEngine.h index 879cdf9f..0349f990 100644 --- a/Source/Client/Core/Source/Build/BuildEngine.h +++ b/Source/Client/Core/Source/Build/BuildEngine.h @@ -53,11 +53,11 @@ namespace Soup::Core { { PackageName("mwasplund", "copy"), - SemanticVersion(1, 0, 0) + SemanticVersion(1, 1, 0) }, { PackageName("mwasplund", "mkdir"), - SemanticVersion(1, 0, 0) + SemanticVersion(1, 1, 0) }, } }, diff --git a/Source/Client/Core/Source/Recipe/PackageReference.h b/Source/Client/Core/Source/Recipe/PackageReference.h index 18d3480f..efbf7800 100644 --- a/Source/Client/Core/Source/Recipe/PackageReference.h +++ b/Source/Client/Core/Source/Recipe/PackageReference.h @@ -30,9 +30,16 @@ namespace Soup::Core // Reuse regex between runs static auto nameRegex = std::regex(R"(^(?:\[([\w#+]+)\])?(?:([A-Za-z][\w.]*)\|)?([A-Za-z][\w.]*)(?:@(\d+(?:.\d+)?(?:.\d+)?))?$)"); + auto parseValue = value; + if (parseValue.starts_with("C++|")) + { + parseValue = "[C++]mwasplund|" + parseValue.substr(4); + Log::Info("Replace C++| -> " + parseValue); + } + // Attempt to parse Named reference auto nameMatch = std::smatch(); - if (std::regex_match(value, nameMatch, nameRegex)) + if (std::regex_match(parseValue, nameMatch, nameRegex)) { // The package is a published reference std::optional language = std::nullopt; diff --git a/Source/Client/Core/Source/SML/SMLParser.cpp b/Source/Client/Core/Source/SML/SMLParser.cpp index 6ba4c563..8211b3d9 100644 --- a/Source/Client/Core/Source/SML/SMLParser.cpp +++ b/Source/Client/Core/Source/SML/SMLParser.cpp @@ -607,7 +607,7 @@ class SMLParser : public SML::Lexer } case SMLToken::Integer: { - auto integer = std::stoll(text()); + int64_t integer = std::stoll(text()); value = SMLValue(integer); return true; } diff --git a/Source/Client/Core/Source/SML/SMLParser.l b/Source/Client/Core/Source/SML/SMLParser.l index 0e0f23b2..fd0a8bd6 100644 --- a/Source/Client/Core/Source/SML/SMLParser.l +++ b/Source/Client/Core/Source/SML/SMLParser.l @@ -386,7 +386,7 @@ private: } case SMLToken::Integer: { - auto integer = std::stoll(text()); + int64_t integer = std::stoll(text()); value = SMLValue(integer); return true; } diff --git a/Source/Client/Tools/PackageLock.sml b/Source/Client/Tools/PackageLock.sml index b73965cc..d96cd386 100644 --- a/Source/Client/Tools/PackageLock.sml +++ b/Source/Client/Tools/PackageLock.sml @@ -4,13 +4,13 @@ Closures: { 'C++': { 'Monitor.Host': { Version: '../../Monitor/Host/', Build: 'Build0', Tool: 'Tool0' } 'Monitor.Shared': { Version: '../../Monitor/Shared/', Build: 'Build0', Tool: 'Tool0' } - 'mwasplund|CryptoPP': { Version: '1.2.1', Build: 'Build0', Tool: 'Tool0' } - 'mwasplund|Detours': { Version: '4.0.11', Build: 'Build0', Tool: 'Tool0' } + 'mwasplund|CryptoPP': { Version: '1.2.2', Build: 'Build0', Tool: 'Tool0' } + 'mwasplund|Detours': { Version: '4.0.12', Build: 'Build0', Tool: 'Tool0' } 'mwasplund|json11': { Version: '1.1.1', Build: 'Build0', Tool: 'Tool0' } - 'mwasplund|Opal': { Version: '0.10.0', Build: 'Build0', Tool: 'Tool0' } + 'mwasplund|Opal': { Version: '0.10.1', Build: 'Build0', Tool: 'Tool0' } 'mwasplund|reflex': { Version: '1.0.4', Build: 'Build0', Tool: 'Tool0' } 'mwasplund|Soup.Test.Assert': { Version: '0.4.0', Build: 'Build0', Tool: 'Tool0' } - 'mwasplund|wren': { Version: '1.0.4', Build: 'Build0', Tool: 'Tool0' } + 'mwasplund|wren': { Version: '1.0.5', Build: 'Build0', Tool: 'Tool0' } 'Soup.Core': { Version: '../Core/', Build: 'Build1', Tool: 'Tool0' } SoupTools: { Version: '../Tools', Build: 'Build0', Tool: 'Tool0' } } @@ -28,8 +28,8 @@ Closures: { } Tool0: { 'C++': { - 'mwasplund|copy': { Version: '1.0.0' } - 'mwasplund|mkdir': { Version: '1.0.0' } + 'mwasplund|copy': { Version: '1.1.0' } + 'mwasplund|mkdir': { Version: '1.1.0' } } } } \ No newline at end of file diff --git a/Source/Generate/GenerateEngine.h b/Source/Generate/GenerateEngine.h index f860a4a1..7a20b418 100644 --- a/Source/Generate/GenerateEngine.h +++ b/Source/Generate/GenerateEngine.h @@ -235,6 +235,13 @@ namespace Soup::Core::Generate MacroManager& generateSubGraphMacroManager, const ValueTable& inputTable) { + auto hackMacros = std::map({ + { "/(TARGET_Soup.Wren)/", "/(TARGET_mwasplund|Soup.Wren)/" }, + { "/(TARGET_mkdir)/", "/(TARGET_mwasplund|mkdir)/" }, + { "/(TARGET_copy)/", "/(TARGET_mwasplund|copy)/" }, + }); + auto hackMacroManager = MacroManager(hackMacros); + auto sharedDependenciesTable = ValueTable(); auto dependencyTableValue = inputTable.find("Dependencies"); if (dependencyTableValue != inputTable.end()) @@ -258,6 +265,9 @@ namespace Soup::Core::Generate throw std::runtime_error("Failed to load shared state file."); } + // Hack + sharedStateTable = ResolveMacros(hackMacroManager, sharedStateTable); + // Ensure SubGraph macros are unique if (isSubGraphType) { diff --git a/Source/Generate/PackageLock.sml b/Source/Generate/PackageLock.sml index 64b443bd..46754f08 100644 --- a/Source/Generate/PackageLock.sml +++ b/Source/Generate/PackageLock.sml @@ -21,8 +21,8 @@ Closures: { } Tool0: { "C++": [ - { Name: "copy", Version: "1.0.0" } - { Name: "mkdir", Version: "1.0.0" } + { Name: "copy", Version: "1.1.0" } + { Name: "mkdir", Version: "1.1.0" } ] } } \ No newline at end of file diff --git a/Source/Monitor/Client/PackageLock.sml b/Source/Monitor/Client/PackageLock.sml index 8427a4d6..5e16e8f4 100644 --- a/Source/Monitor/Client/PackageLock.sml +++ b/Source/Monitor/Client/PackageLock.sml @@ -4,8 +4,8 @@ Closures: { 'C++': { 'Monitor.Client': { Version: '../Client', Build: 'Build0', Tool: 'Tool0' } 'Monitor.Shared': { Version: '../Shared/', Build: 'Build0', Tool: 'Tool0' } - 'mwasplund|Detours': { Version: '4.0.11', Build: 'Build0', Tool: 'Tool0' } - 'mwasplund|Opal': { Version: '0.10.0', Build: 'Build0', Tool: 'Tool0' } + 'mwasplund|Detours': { Version: '4.0.12', Build: 'Build0', Tool: 'Tool0' } + 'mwasplund|Opal': { Version: '0.10.1', Build: 'Build0', Tool: 'Tool0' } } } Build0: { @@ -15,8 +15,8 @@ Closures: { } Tool0: { 'C++': { - 'mwasplund|copy': { Version: '1.0.0' } - 'mwasplund|mkdir': { Version: '1.0.0' } + 'mwasplund|copy': { Version: '1.1.0' } + 'mwasplund|mkdir': { Version: '1.1.0' } } } } \ No newline at end of file