Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rider IDE project model support #248

Open
wants to merge 37 commits into
base: main
Choose a base branch
from
Open

Rider IDE project model support #248

Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
6849d31
Add rider project model generator
SmelJey Jul 26, 2021
3a4f3b4
Add Rider Json documentation
SmelJey Jul 27, 2021
05296e4
Change Rider-related files naming
SmelJey Jul 28, 2021
6cd9476
[RiderJson] Change root.json file format: add solution configuration …
SmelJey Jul 29, 2021
7b95ba4
[RiderJson] Add solution name specifier for RiderJson generator
SmelJey Jul 29, 2021
06e0948
[RiderJson] Change EnvironmentDefinitions source to IPlatformVcxproj.…
SmelJey Jul 30, 2021
8f141dc
[RiderJson] Add sample for RiderJson, add output directory specifier.
SmelJey Aug 2, 2021
da41113
[RiderJson] Extract build commands from toolchain to separate object.…
SmelJey Aug 9, 2021
1bd69a5
[RiderJson] Add PrivateDependencyModules, SourceRoot and SourceExtens…
SmelJey Aug 9, 2021
da92139
[RiderJson] Change RiderJson solution file extension, extract solutio…
SmelJey Aug 16, 2021
34c4741
[RiderJson] Resolve $(ProjectDir) variable in build commands, add mis…
SmelJey Aug 17, 2021
77fb6dd
[RiderJson] Add "TargetPath" to configuration json for fastbuild, ren…
SmelJey Aug 19, 2021
3f994fc
[RiderJson] Fix incorrect IntermediateDirectory and OutputDirectory o…
SmelJey Aug 20, 2021
4440a0e
[RiderJson] Add $(ProjectDir) and $(SolutionName) resolving in fastbu…
SmelJey Aug 20, 2021
f8d828f
[RiderJson] Add Architecture field to ToolchainInfo.
SmelJey Aug 23, 2021
8fb09f6
[RiderJson] Make RiderJson generation accessible via command line arg…
SmelJey Oct 13, 2021
9207f62
[RiderJson] Add rdjson files to output log
SmelJey Oct 19, 2021
fdc6245
[RiderJson] Fix projects dependencies calculating (at the same way as…
SmelJey Oct 22, 2021
bbb91c8
[RiderJson] Add msbuild commands to output json
SmelJey Oct 25, 2021
2615444
[RiderJson] Fix invalid ProjectDirectory in RiderGenerationContext
SmelJey Oct 26, 2021
288e87c
[RiderJson] Fix clean command for FastBuild
SmelJey Oct 26, 2021
6d26fb4
[RiderJson] Add SolutionFolder to RdJson output
SmelJey Oct 27, 2021
188eda4
[RiderJson] Fix rdjson generation for non-generate projects
SmelJey Nov 3, 2021
3d6cff3
[RiderJson] Fix defines, change Compiler option
SmelJey Nov 10, 2021
e7d4954
[RiderJson] Make distinguishable [Generate] and other projects.
SmelJey Nov 10, 2021
20d92c3
[RiderJson] Update RdJson format (source files and output type)
SmelJey Nov 10, 2021
97f13c8
[RiderJson] Fix clang compiler detection
SmelJey Nov 11, 2021
570a552
[RiderJson] Add RiderJson generation params as command line args
SmelJey Nov 15, 2021
5f0afbe
[RiderJson] Add source regexes and filters info to the output
SmelJey Nov 29, 2021
4828c38
[RiderJson] Rename OutputType
SmelJey Apr 17, 2022
dae5772
[RiderJson] Fix start arguments in RiderJsonProject
SmelJey Apr 17, 2022
d9154ad
[RiderJson] Fix RiderJson generation when there are non-cpp projects
SmelJey Jun 27, 2022
1e19ea1
Extract FastBuild build arguments to FastBuildMakeCommandGenerator
SmelJey Jun 29, 2022
1e7d149
[RiderJson] Fix system include paths for win32
SmelJey Sep 16, 2022
62991c0
[RiderJson] Move RiderJson classes to separate folder
SmelJey Jan 26, 2023
747f63e
Add C++20 flag
DecoyRS Jan 31, 2023
ed90d61
[RiderJson] Add DevEnv value for Rider and cleanup
SmelJey Mar 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Sharpmake.Generators/Rider/RiderJson.Util.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public static class CppLanguageStandard
{
public const string Cpp14 = "Cpp14";
public const string Cpp17 = "Cpp17";
public const string Cpp20 = "Cpp20";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you break out this change and submit a small PR with just this change? That one we can merge directly and doesn't have to be part of the Rider one.

public const string Latest = "Latest";

public const string Default = Cpp14;
Expand Down Expand Up @@ -107,6 +108,7 @@ public static string GetCppStandard(this IGenerationContext context)
Options.Option(Options.Vc.Compiler.CppLanguageStandard.GNU14, () => res = CppLanguageStandard.Cpp14),
Options.Option(Options.Vc.Compiler.CppLanguageStandard.CPP17, () => res = CppLanguageStandard.Cpp17),
Options.Option(Options.Vc.Compiler.CppLanguageStandard.GNU17, () => res = CppLanguageStandard.Cpp17),
Options.Option(Options.Vc.Compiler.CppLanguageStandard.CPP20, () => res = CppLanguageStandard.Cpp20),
Options.Option(Options.Vc.Compiler.CppLanguageStandard.Latest, () => res = CppLanguageStandard.Latest)
);
return res;
Expand Down Expand Up @@ -147,7 +149,9 @@ public static string GetCppStandard(this IGenerationContext context)
Options.Option(Options.XCode.Compiler.CppLanguageStandard.CPP14, () => res = CppLanguageStandard.Cpp14),
Options.Option(Options.XCode.Compiler.CppLanguageStandard.GNU14, () => res = CppLanguageStandard.Cpp14),
Options.Option(Options.XCode.Compiler.CppLanguageStandard.CPP17, () => res = CppLanguageStandard.Cpp17),
Options.Option(Options.XCode.Compiler.CppLanguageStandard.GNU17, () => res = CppLanguageStandard.Cpp17)
Options.Option(Options.XCode.Compiler.CppLanguageStandard.GNU17, () => res = CppLanguageStandard.Cpp17),
Options.Option(Options.XCode.Compiler.CppLanguageStandard.CPP20, () => res = CppLanguageStandard.Cpp20),
Options.Option(Options.XCode.Compiler.CppLanguageStandard.GNU20, () => res = CppLanguageStandard.Cpp20)
);
return res;
}
Expand Down