Skip to content

Commit 9fcb053

Browse files
Build dependencies when watch & updating places to use DefaultPlatform
1 parent 4e66cd0 commit 9fcb053

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

DefaultYAMLs/DefaultScriptInfo.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ Dependencies:
131131
# (Optional if LibraryType is Header) Link properties of the dependency
132132
LinkProperties:
133133
# Properties for searching the library binary for each platform
134-
Default:
134+
DefaultPlatform:
135135
# Profile-specific properties
136136
"g++":
137137
# The library names to be searched for when linking against the script.
@@ -151,7 +151,7 @@ Dependencies:
151151
# (Optional) Setup commands are run once when the dependency is populated
152152
Setup:
153153
# Target Platform
154-
Default:
154+
DefaultPlatform:
155155
# Setup shell commands for the specified profile.
156156
# Default commands are run in the dependency folder
157157
# You can also use "DefaultProfile" if all the compilers run the same setup commands
@@ -162,7 +162,7 @@ Dependencies:
162162
# (Optional) Build commands are run every time before the script is being built
163163
Build:
164164
# Target Platform
165-
Default:
165+
DefaultPlatform:
166166
# Target Profile ("DefaultProfile" for any profile)
167167
"g++":
168168
- "cd build && cmake .."

Src/runcpp2/runcpp2.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,11 +1012,6 @@ runcpp2::StartPipeline( const std::string& scriptPath,
10121012
return PipelineResult::DEPENDENCIES_FAILED;
10131013
}
10141014

1015-
//NOTE: We don't need to build and copy the dependencies for watch since we
1016-
// only need to compile the script
1017-
if(currentOptions.count(CmdOptions::WATCH) > 0)
1018-
break;
1019-
10201015
if(!BuildDependencies( profiles.at(profileIndex),
10211016
scriptInfo,
10221017
availableDependencies,
@@ -1262,7 +1257,7 @@ runcpp2::StartPipeline( const std::string& scriptPath,
12621257

12631258
if(currentOptions.count(CmdOptions::BUILD) == 0)
12641259
{
1265-
//TODO(NOW): Move copying to before post build
1260+
//Move copying to before post build
12661261
std::vector<std::string> copiedPaths;
12671262
if(!CopyFiles(buildDir, filesToCopyPaths, copiedPaths))
12681263
{

0 commit comments

Comments
 (0)