Skip to content

Commit

Permalink
Merge branch 'dev/launch_settings_refactor' into 'main'
Browse files Browse the repository at this point in the history
moved Sharpmake.Application's launchSettings.json into two separate files for...

See merge request Sharpmake/sharpmake!492
  • Loading branch information
baudronp committed Jan 18, 2024
2 parents da5d652 + 01fa1b6 commit 669d240
Show file tree
Hide file tree
Showing 5 changed files with 200 additions and 166 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ samples/**/*.csproj
samples/**/*.sln
samples/**/projects/*
samples/**/codebase/temp/*
Sharpmake.Application/Properties/launchSettings.json
Sharpmake.FunctionalTests/**/projects/*
Sharpmake.FunctionalTests/**/blob/*
Sharpmake.FunctionalTests/**/sharpmake_debug*.vs*.*
Sharpmake.FunctionalTests/**/sharpmake_package*.vs*.csproj
Sharpmake.FunctionalTests/**/launchSettings.json
!**/reference/**

## Ignore Visual Studio temporary files, build results, and
Expand Down
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,15 @@ The Sharpmake source code also comes with samples that you can study.
## Building and running Sharpmake

Building and running Sharpmake is quite straightforward:

- Clone the Git repository
- Open the `Sharpmake.sln` solution located in the root folder
- Hit the run button (by default it will run the first sample)
- If you want to debug Sharpmake using a _sample_:
1. Set the `Samples` project as the Startup Project
2. Choose from the dropdown list which sample you want to run
- If you want to debug Sharpmake using a _functional test_:
1. Set the `Sharpmake.FunctionalTests` project as the Startup Project
2. Choose from the dropdown list which functional test you want to run

## More Platforms

Expand Down
164 changes: 0 additions & 164 deletions Sharpmake.Application/Properties/launchSettings.json

This file was deleted.

38 changes: 38 additions & 0 deletions Sharpmake.FunctionalTests/Properties/launchSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"profiles": {
"FunctionalTest (FastBuildFunctionalTest)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources('FastBuildFunctionalTest.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\FastBuildFunctionalTest"
},
"FunctionalTest (NoAllFastBuildProjectFunctionalTest)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources('NoAllFastBuildProjectFunctionalTest.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\NoAllFastBuildProjectFunctionalTest"
},
"FunctionalTest (OnlyNeededFastBuildTest)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources('OnlyNeededFastBuildTest.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\OnlyNeededFastBuildTest"
},
"FunctionalTest (SharpmakePackageFunctionalTest)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources('SharpmakePackageFunctionalTest.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\SharpmakePackageFunctionalTest"
},
"FunctionalTest (functional_test.py)": {
"commandName": "Executable",
"executablePath": "python",
"commandLineArgs": "$(ProjectDir)\\..\\functional_test.py"
},
"FunctionalTest (regression_test.py)": {
"commandName": "Executable",
"executablePath": "python",
"commandLineArgs": "$(ProjectDir)\\..\\regression_test.py"
}
}
}
154 changes: 154 additions & 0 deletions samples/Properties/launchSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
{
"profiles": {
"Sample (CompileCommandDatabase)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'CompileCommandDatabase.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\CompileCommandDatabase"
},
"Sample (ConfigureOrder)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'main.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\ConfigureOrder"
},
"Sample (CPPCLI)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'CLRTest.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\CPPCLI"
},
"Sample (CSharpHelloWorld)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'HelloWorld.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\CSharpHelloWorld"
},
"Sample (CSharpImports)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'CSharpImports.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\CSharpImports"
},
"Sample (CSharpVsix)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'CSharpVsix.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\CSharpVsix"
},
"Sample (CSharpWCF)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'CSharpWCF.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\CSharpWCF"
},
"Sample (CustomBuildStep)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'CustomBuildStep.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\CustomBuildStep"
},
"Sample (FastBuildSimpleExecutable)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'FastBuildSimpleExecutable.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\FastBuildSimpleExecutable"
},
"Sample (HelloAndroid)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'HelloAndroid.Main.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\HelloAndroid"
},
"Sample (HelloAndroidAgde)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'HelloAndroidAgde.Main.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\HelloAndroidAgde"
},
"Sample (HelloClangCl)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'HelloClangCl.Main.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\HelloClangCl"
},
"Sample (HelloEvents)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'HelloEvents.Main.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\HelloEvents"
},
"Sample (HelloLinux)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'HelloLinux.Main.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\HelloLinux"
},
"Sample (HelloRust)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'HelloRust.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\HelloRust"
},
"Sample (HelloWorld)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'HelloWorld.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\HelloWorld"
},
"Sample (HelloXCode)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'HelloXCode.Main.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\HelloXCode"
},
"Sample (NetCore/DotNetCoreFrameworkHelloWorld)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'HelloWorld.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\NetCore\\DotNetCoreFrameworkHelloWorld"
},
"Sample (NetCore/DotNetFrameworkHelloWorld)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'HelloWorld.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\NetCore\\DotNetFrameworkHelloWorld"
},
"Sample (NetCore/DotNetMultiFrameworksHelloWorld)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'HelloWorld.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\NetCore\\DotNetMultiFrameworksHelloWorld"
},
"Sample (NetCore/DotNetOSMultiFrameworksHelloWorld)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'HelloWorld.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\NetCore\\DotNetOSMultiFrameworksHelloWorld"
},
"Sample (PackageReferences)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'PackageReferences.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\PackageReferences"
},
"Sample (QTFileCustomBuild)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'QTFileCustomBuild.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\QTFileCustomBuild"
},
"Sample (SimpleExeLibDependency)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'SimpleExeLibDependency.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\SimpleExeLibDependency"
},
"Sample (vcpkg)": {
"commandName": "Executable",
"executablePath": "$(ProjectDir)\\..\\Sharpmake.Application\\bin\\$(Configuration)\\$(TargetFramework)\\Sharpmake.Application.exe",
"commandLineArgs": "/sources(@'main.sharpmake.cs')",
"workingDirectory": "$(ProjectDir)\\vcpkg\\sharpmake"
}
}
}

0 comments on commit 669d240

Please sign in to comment.