Projects now hard-depend on their 'Uses' targets. [fixes #4]

Dandielo · Dandielo · commit b11cf78033d0 · 2021-12-14T19:27:15.000+01:00
diff --git a/scripts/fastbuild/definition_project.bff b/scripts/fastbuild/definition_project.bff
@@ -86,6 +86,8 @@ ForEach( .Project in .Projects )
                 Using( .Properties )
                 Using( .Public )
 
+                ^ProjectRequires + .Uses
+
                 .IncludeDirs + {
                     '$ProjectBaseDir$/public'
                 }
@@ -95,6 +97,8 @@ ForEach( .Project in .Projects )
                 Using( .Properties )
                 Using( .Private )
 
+                ^ProjectRequires + .Uses
+
                 .IncludeResDirs + {
                     '$ProjectBaseDir$/resource'
                 }
diff --git a/scripts/fastbuild/targets_build.bff b/scripts/fastbuild/targets_build.bff
@@ -82,6 +82,8 @@ ForEach( .Pipeline in .AvailablePipelines )
         // Check if we the project has all requirements covered
         .ProjectRequirementsSatisfied = true
         {
+            .AvailableTags + .PipelineEnabledProjects
+
             ForEach( .Requirement in .ProjectRequires )
             {
                 If ( .Requirement not in .AvailableTags )
@@ -232,9 +234,9 @@ ForEach( .Pipeline in .AvailablePipelines )
                                 ForEach( .Dependency in .Uses )
                                 {
                                     .DependencyStruct = 'PublicProperties_$Step$_$Dependency$_$PipelineName$_$PipelinePlatform$_$PipelineConfig$_$PipelineToolchainStruct$'
-                                    .PipelineProperties_Public_Empty_Extension = 
+                                    .PipelineProperties_Public_Empty_Extension =
                                     [
-                                        .'$DependencyStruct$' = 
+                                        .'$DependencyStruct$' =
                                         [
                                             Using( .EmptyProperties )
                                             .HasLinkTarget = false
@@ -285,9 +287,9 @@ ForEach( .Pipeline in .AvailablePipelines )
                                 ForEach( .Dependency in .Uses )
                                 {
                                     .DependencyStruct = 'PublicProperties_$Step$_$Dependency$_$PipelineName$_$PipelinePlatform$_$PipelineConfig$_$PipelineToolchainStruct$'
-                                    .PipelineProperties_Private_Empty_Extension = 
+                                    .PipelineProperties_Private_Empty_Extension =
                                     [
-                                        .'$DependencyStruct$' = 
+                                        .'$DependencyStruct$' =
                                         [
                                             Using( .EmptyProperties )
                                             .HasLinkTarget = false
@@ -338,9 +340,9 @@ ForEach( .Pipeline in .AvailablePipelines )
                                 ForEach( .Dependency in .Uses )
                                 {
                                     .DependencyStruct = 'PublicProperties_$Step$_$Dependency$_$PipelineName$_$PipelinePlatform$_$PipelineConfig$_$PipelineToolchainStruct$'
-                                    .PipelineProperties_Private_Empty_Extension = 
+                                    .PipelineProperties_Private_Empty_Extension =
                                     [
-                                        .'$DependencyStruct$' = 
+                                        .'$DependencyStruct$' =
                                         [
                                             Using( .EmptyProperties )
                                             .HasLinkTarget = false

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,8 @@ ForEach( .Pipeline in .AvailablePipelines )`
`82`	`82`	`// Check if we the project has all requirements covered`
`83`	`83`	`.ProjectRequirementsSatisfied = true`
`84`	`84`	`{`
	`85`	`+ .AvailableTags + .PipelineEnabledProjects`
	`86`	`+`
`85`	`87`	`ForEach( .Requirement in .ProjectRequires )`
`86`	`88`	`{`
`87`	`89`	`If ( .Requirement not in .AvailableTags )`
`@@ -232,9 +234,9 @@ ForEach( .Pipeline in .AvailablePipelines )`
`232`	`234`	`ForEach( .Dependency in .Uses )`
`233`	`235`	`{`
`234`	`236`	`.DependencyStruct = 'PublicProperties_$Step$_$Dependency$_$PipelineName$_$PipelinePlatform$_$PipelineConfig$_$PipelineToolchainStruct$'`
`235`		`- .PipelineProperties_Public_Empty_Extension =`
	`237`	`+ .PipelineProperties_Public_Empty_Extension =`
`236`	`238`	`[`
`237`		`- .'$DependencyStruct$' =`
	`239`	`+ .'$DependencyStruct$' =`
`238`	`240`	`[`
`239`	`241`	`Using( .EmptyProperties )`
`240`	`242`	`.HasLinkTarget = false`
`@@ -285,9 +287,9 @@ ForEach( .Pipeline in .AvailablePipelines )`
`285`	`287`	`ForEach( .Dependency in .Uses )`
`286`	`288`	`{`
`287`	`289`	`.DependencyStruct = 'PublicProperties_$Step$_$Dependency$_$PipelineName$_$PipelinePlatform$_$PipelineConfig$_$PipelineToolchainStruct$'`
`288`		`- .PipelineProperties_Private_Empty_Extension =`
	`290`	`+ .PipelineProperties_Private_Empty_Extension =`
`289`	`291`	`[`
`290`		`- .'$DependencyStruct$' =`
	`292`	`+ .'$DependencyStruct$' =`
`291`	`293`	`[`
`292`	`294`	`Using( .EmptyProperties )`
`293`	`295`	`.HasLinkTarget = false`
`@@ -338,9 +340,9 @@ ForEach( .Pipeline in .AvailablePipelines )`
`338`	`340`	`ForEach( .Dependency in .Uses )`
`339`	`341`	`{`
`340`	`342`	`.DependencyStruct = 'PublicProperties_$Step$_$Dependency$_$PipelineName$_$PipelinePlatform$_$PipelineConfig$_$PipelineToolchainStruct$'`
`341`		`- .PipelineProperties_Private_Empty_Extension =`
	`343`	`+ .PipelineProperties_Private_Empty_Extension =`
`342`	`344`	`[`
`343`		`- .'$DependencyStruct$' =`
	`345`	`+ .'$DependencyStruct$' =`
`344`	`346`	`[`
`345`	`347`	`Using( .EmptyProperties )`
`346`	`348`	`.HasLinkTarget = false`