Skip to content

Commit 8d334cb

Browse files
Renaming All to Default
1 parent 54fe0e2 commit 8d334cb

File tree

5 files changed

+46
-47
lines changed

5 files changed

+46
-47
lines changed

DefaultYAMLs/DefaultScriptInfo.yaml

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88
# Language: "c++"
99

1010
# # (Optional) Preferred profiles for the script for each platform.
11-
# # A special profile name "All" can be used to allow any profile.
12-
# # Default profiles are listed in user config file,
11+
# # Profiles are listed in user config file,
1312
# # which can be retreived by running `runcpp2 --show-config-path`
1413
# # Each of the platform dependent settings can be listed under
15-
# # - All
14+
# # - Default
1615
# # - Windows
1716
# # - Linux
1817
# # - MacOS
@@ -25,8 +24,8 @@
2524
# # (Optional) Override the default compile flags for each platform.
2625
# OverrideCompileFlags:
2726
# # Target Platform
28-
# All:
29-
# # Profile with the respective flags to override. ("All" for any profile)
27+
# Default:
28+
# # Profile with the respective flags to override. ("Default" for any profile)
3029
# "g++":
3130
# # (Optional) Flags to be removed from the default compile flags, separated by space
3231
# Remove: ""
@@ -37,8 +36,8 @@
3736
# # (Optional) Override the default link flags for each platform.
3837
# OverrideLinkFlags:
3938
# # Target Platform
40-
# All:
41-
# # Profile with the respective flags to override ("All" for any profile)
39+
# Default:
40+
# # Profile with the respective flags to override ("Default" for any profile)
4241
# "g++":
4342
# # (Optional) Flags to be removed from the default link flags, separated by space
4443
# Remove: ""
@@ -50,18 +49,18 @@
5049
# # (Optional) Other source files (relative to script file path) to be compiled.
5150
# OtherFilesToBeCompiled:
5251
# # Target Platform
53-
# All:
52+
# Default:
5453
# # Target Profile
55-
# All:
54+
# Default:
5655
# - "./AnotherSourceFile.cpp"
5756

5857
# # (Optional) Define cross-compiler defines for each platform and profile.
5958
# # Defines can be specified as just a name or as a name-value pair.
6059
# Defines:
61-
# # Target Platform (All, Windows, Linux, MacOS, or Unix)
62-
# All:
63-
# # Profile name (e.g., "g++", "clang++", "msvc", or "All" for any profile)
64-
# "All":
60+
# # Target Platform (Default, Windows, Linux, MacOS, or Unix)
61+
# Default:
62+
# # Profile name (e.g., "g++", "clang++", "msvc", or "Default" for any profile)
63+
# "Default":
6564
# - "EXAMPLE_DEFINE" # Define without a value
6665
# - "VERSION_MAJOR=1" # Define with a value
6766

@@ -92,7 +91,7 @@
9291
# # (Optional if LibraryType is Header) Link properties of the dependency
9392
# LinkProperties:
9493
# # Properties for searching the library binary for the profile
95-
# # You can also use "All" if all compilers use the same values
94+
# # You can also use "Default" if all compilers use the same values
9695
# "g++":
9796
# # The library names to be searched for when linking against the script.
9897
# # Binaries with linkable extension that contains one of the names will be linked
@@ -107,24 +106,24 @@
107106
#
108107
# # (Optional) Additional link flags for this dependency for each platform
109108
# AdditionalLinkOptions:
110-
# All: []
109+
# Default: []
111110
#
112111
# # (Optional) Setup commands are run once when the dependency is populated
113112
# Setup:
114113
# # Target Platform
115-
# All:
114+
# Default:
116115
# # Setup shell commands for the specified profile.
117-
# # All commands are run in the dependency folder
118-
# # You can also use "All" if all the compilers run the same setup commands
116+
# # Default commands are run in the dependency folder
117+
# # You can also use "Default" if all the compilers run the same setup commands
119118
# "g++":
120119
# - "mkdir build"
121120
#
122121
#
123122
# # (Optional) Build commands are run every time before the script is being built
124123
# Build:
125124
# # Target Platform
126-
# All:
127-
# # Target Profile ("All" for any profile)
125+
# Default:
126+
# # Target Profile ("Default" for any profile)
128127
# "g++":
129128
# - "cd build && cmake .."
130129
# - "cd build && cmake --build ."

DefaultYAMLs/DefaultUserConfig.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ Templates:
4545

4646
# TODO: Add support for custom platform
4747
# Each of the platform dependent settings can be listed under
48-
# - All
48+
# - Default
4949
# - Windows
5050
# - Linux
5151
# - MacOS
5252
# - Unix
5353
FilesTypes: &CommonFilesTypes
5454
ObjectLinkFile:
5555
Prefix:
56-
All: ""
56+
Default: ""
5757
Extension:
5858
Windows: ".obj"
5959
Unix: ".o"
@@ -123,12 +123,12 @@ Profiles:
123123
# (Optional) The commands to run in **shell** before calling the compiler/linker for each platform.
124124
# This is run inside the .runcpp2 directory where the build happens.
125125
# Setup:
126-
# All: []
126+
# Default: []
127127

128128
# (Optional) The commands to run in **shell** after calling the compiler/linker for each platform.
129129
# This is run inside the .runcpp2 directory where the build happens.
130130
# Cleanup:
131-
# All: []
131+
# Default: []
132132

133133
# The file properties for the object files for each platform.
134134
FilesTypes: *CommonFilesTypes
@@ -138,11 +138,11 @@ Profiles:
138138
# (Optional) The command to run together before running each compile command
139139
# in **shell** for each platform
140140
# PreRun:
141-
# All: ""
141+
# Default: ""
142142

143143
# Shell command to use for checking if the executable exists or not
144144
CheckExistence:
145-
All: "g++ -v"
145+
Default: "g++ -v"
146146

147147
# Here are a list of substitution strings for RunParts, Setup and Cleanup
148148
# {Executable}: Compiler executable
@@ -163,7 +163,7 @@ Profiles:
163163
# {OutputFilePath}: (Similar to previous)
164164
CompileTypes:
165165
Executable:
166-
All:
166+
Default:
167167
Flags: "-std=c++17 -Wall -Werror"
168168
Executable: "g++"
169169
RunParts: *g++_CompileRunParts
@@ -174,14 +174,14 @@ Profiles:
174174
# This is run inside the .runcpp2 directory where the build happens.
175175
# Cleanup: []
176176
Static:
177-
All:
177+
Default:
178178
Flags: "-std=c++17 -Wall -Werror"
179179
Executable: "g++"
180180
RunParts: *g++_CompileRunParts
181181
# Setup: []
182182
# Cleanup: []
183183
Shared:
184-
All:
184+
Default:
185185
Flags: "-std=c++17 -Wall -Werror -fpic"
186186
Executable: "g++"
187187
RunParts: *g++_CompileRunParts
@@ -193,11 +193,11 @@ Profiles:
193193
# (Optional) The command to run together before running each link command
194194
# in **shell** for each platform
195195
# PreRun:
196-
# All: ""
196+
# Default: ""
197197

198198
# Shell command to use for checking if the executable exists or not
199199
CheckExistence:
200-
All: "g++ -v"
200+
Default: "g++ -v"
201201

202202
# Here are a list of substitution strings for RunParts, Setup and Cleanup
203203
# {Executable}: Linker executable
@@ -242,7 +242,7 @@ Profiles:
242242
# Setup: []
243243
# Cleanup: []
244244
Static:
245-
All:
245+
Default:
246246
Flags: ""
247247
Executable: "g++"
248248
RunParts: *g++_LinkRunParts

Examples/test.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
77
OtherFilesToBeCompiled:
88
# Target Platform
9-
All:
9+
Default:
1010
# Target Profile
1111
"g++":
1212
- "./OtherSources/AnotherSourceFileGcc.cpp"
13-
All:
13+
Default:
1414
- "./AnotherSourceFile.cpp"
1515
- "./AnotherSourceFile2.cpp"
1616
1717
Defines:
18-
All:
18+
Default:
1919
# Turns into `TEST_DEF=\"Test Define Working\"` in shell
20-
"All": ["TEST_DEF=\\\"Test Define Working\\\""]
20+
"Default": ["TEST_DEF=\\\"Test Define Working\\\""]
2121
2222
Dependencies:
2323
- Name: ssLogger
@@ -28,17 +28,17 @@
2828
LibraryType: Shared
2929
IncludePaths: ["Include"]
3030
LinkProperties:
31-
"All":
31+
"Default":
3232
SearchLibraryNames: ["ssLogger"]
3333
ExcludeLibraryNames: ["ssLogger_SRC"]
3434
SearchDirectories: ["./build", "./build/Debug", "./build/Release"]
3535
Setup:
36-
All:
37-
"All":
36+
Default:
37+
"Default":
3838
- "mkdir build"
3939
Build:
40-
All:
41-
"All":
40+
Default:
41+
"Default":
4242
- "cd build && cmake .. -DssLOG_BUILD_TYPE=SHARED"
4343
- "cd build && cmake --build . --config Release -j 16"
4444
*/

Src/runcpp2/Data/Profile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ void runcpp2::Data::Profile::GetNames(std::vector<std::string>& outNames) const
1111
outNames.push_back(alias);
1212

1313
//Special name all that applies to all profile
14-
outNames.push_back("All");
14+
outNames.push_back("Default");
1515
}
1616

1717
bool runcpp2::Data::Profile::ParseYAML_Node(ryml::ConstNodeRef& profileNode)

Src/runcpp2/PlatformUtil.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ std::string runcpp2::ProcessPath(const std::string& path)
5555
std::vector<std::string> runcpp2::GetPlatformNames()
5656
{
5757
#ifdef _WIN32
58-
return {"Windows", "All"};
58+
return {"Windows", "Default"};
5959
#elif __linux__
60-
return {"Linux", "Unix", "All"};
60+
return {"Linux", "Unix", "Default"};
6161
#elif __APPLE__
62-
return {"MacOS", "Unix", "All"};
62+
return {"MacOS", "Unix", "Default"};
6363
#elif __unix__
64-
return {"Unix", "All"};
64+
return {"Unix", "Default"};
6565
#else
66-
return {"Unknown", "All"};
66+
return {"Unknown", "Default"};
6767
#endif
6868
}
6969

0 commit comments

Comments
 (0)