Skip to content

Commit

Permalink
Finalize migration (#234)
Browse files Browse the repository at this point in the history
* Fix warning

* Update versions

* Small update

* update script

* Update tool versions

* Update samples
  • Loading branch information
mwasplund authored Jan 6, 2024
1 parent bf1b449 commit 67589b7
Show file tree
Hide file tree
Showing 39 changed files with 244 additions and 243 deletions.
4 changes: 2 additions & 2 deletions Samples/C/ConsoleApplication/PackageLock.sml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }
}
}
}
24 changes: 12 additions & 12 deletions Samples/Cpp/BuildExtension/Executable/PackageLock.sml
Original file line number Diff line number Diff line change
@@ -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' }
}
}
}
12 changes: 6 additions & 6 deletions Samples/Cpp/BuildExtension/Executable/Recipe.sml
Original file line number Diff line number Diff line change
@@ -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/'
]
}
12 changes: 6 additions & 6 deletions Samples/Cpp/BuildExtension/Extension/PackageLock.sml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }
}
}
}
10 changes: 5 additions & 5 deletions Samples/Cpp/BuildExtension/Extension/Recipe.sml
Original file line number Diff line number Diff line change
@@ -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'
]
}
4 changes: 2 additions & 2 deletions Samples/Cpp/ConsoleApplication/PackageLock.sml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }
}
}
}
12 changes: 6 additions & 6 deletions Samples/Cpp/DirectX/PackageLock.sml
Original file line number Diff line number Diff line change
@@ -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' }
}
}
}
28 changes: 14 additions & 14 deletions Samples/Cpp/DirectX/Recipe.sml
Original file line number Diff line number Diff line change
@@ -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'
]
14 changes: 7 additions & 7 deletions Samples/Cpp/DynamicLibrary/Application/PackageLock.sml
Original file line number Diff line number Diff line change
@@ -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' }
}
}
}
12 changes: 6 additions & 6 deletions Samples/Cpp/DynamicLibrary/Application/Recipe.sml
Original file line number Diff line number Diff line change
@@ -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/'
]
}
18 changes: 9 additions & 9 deletions Samples/Cpp/DynamicLibrary/Library/Recipe.sml
Original file line number Diff line number Diff line change
@@ -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'
]
}
]
14 changes: 7 additions & 7 deletions Samples/Cpp/HeaderLibrary/Application/PackageLock.sml
Original file line number Diff line number Diff line change
@@ -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' }
}
}
}
12 changes: 6 additions & 6 deletions Samples/Cpp/HeaderLibrary/Application/Recipe.sml
Original file line number Diff line number Diff line change
@@ -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/'
]
}
12 changes: 6 additions & 6 deletions Samples/Cpp/HeaderLibrary/Library/Recipe.sml
Original file line number Diff line number Diff line change
@@ -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'
]
}
]
14 changes: 7 additions & 7 deletions Samples/Cpp/ModuleDynamicLibrary/Application/PackageLock.sml
Original file line number Diff line number Diff line change
@@ -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' }
}
}
}
12 changes: 6 additions & 6 deletions Samples/Cpp/ModuleDynamicLibrary/Application/Recipe.sml
Original file line number Diff line number Diff line change
@@ -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/'
]
}
Loading

0 comments on commit 67589b7

Please sign in to comment.