msbuild: more robust handling of NDA property sheets

msbuild/default.props

@@ -65,6 +65,8 @@
   </PropertyGroup>
 
   <Import Project="$(LolEngineDir)msbuild/nda.props" />
+
+  <!-- Needs to be imported after nda.props -->
   <Import Project="$(LolEngineDir)msbuild/kore.props" />
 
   <!-- Override settings with the user’s build.config file -->

msbuild/default.targets

@@ -15,8 +15,7 @@
     <Import Project="$(LolEngineDir)msbuild/features.targets" />
     <Import Project="$(LolEngineDir)msbuild/kore.targets" />
     <Import Project="$(LolEngineDir)msbuild/kore/shaders.targets" />
-    <Import Project="$(LolNdaDirectory)/msbuild/platform.targets"
-            Condition="'$(LolNdaDirectory)'!='' and exists('$(LolNdaDirectory)/msbuild/platform.targets')" />
+    <Import Project="$(LolNdaPlatformTargets)" Condition="'$(LolNdaPlatformTargetsFound)'=='true'" />
   </ImportGroup>
 
   <!-- Re-add our sanity checks first, in case Microsoft.Cpp.targets meddled with the task priorities. -->

msbuild/kore.props

@@ -90,8 +90,7 @@
      - Kore support for NDA platforms
    -->
 
-  <Import Project="$(LolNdaDirectory)/msbuild/kore.props"
-          Condition="'$(LolNdaDirectory)'!='' and exists('$(LolNdaDirectory)/msbuild/kore.props')" />
+  <Import Project="$(LolNdaKoreProps)" Condition="'$(LolNdaKorePropsFound)'=='true'" />
 
   <!--
      - Compile and link with Kore if enabled
@@ -127,7 +126,7 @@
            Text="project $(ProjectName) configured for Kore but '$(KoreDirectory)/make' was not found; is the repository up to date?" />
 
     <Error Condition="'$(LolNdaPlatform)'!='' and '$(KoreNdaDirectory)'==''"
-           Text="NDA platform '$(Platform)' selected, but '$(LolNdaDirectory)/msbuild/config.props' did not define %24(KoreNdaDirectory); is the '$(LolNdaRepository)' repository up-to-date?" />
+           Text="NDA platform '$(Platform)' selected, but '$(LolNdaPlatformProps)' did not define %24(KoreNdaDirectory); is the '$(LolNdaRepository)' repository up-to-date?" />
 
     <Error Condition="'$(KoreNdaDirectory)'!='' and !exists('$(KoreNdaDirectory)/kincfile.js')"
            Text="NDA platform '$(Platform)' selected, but '$(KoreNdaDirectory)/kincfile.js' was not found; are the '$(LolNdaDirectory)' submodules up-to-date?" />

msbuild/nda.props

@@ -16,14 +16,20 @@
      - because it does not support subpaths. -->
   <PropertyGroup>
     <LolNdaRepository>lol-$(LolNdaPlatform)</LolNdaRepository>
-    <_Temp>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), $(LolNdaRepository)/msbuild/config.props))</_Temp>
+    <_Temp>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), $(LolNdaRepository)/msbuild/platform.props))</_Temp>
     <LolNdaDirectory Condition="'$(_Temp)'!=''">$(_Temp)/$(LolNdaRepository)</LolNdaDirectory>
 
-    <LolNdaConfigProps>$(LolNdaDirectory)/msbuild/config.props</LolNdaConfigProps>
-    <LolNdaConfigPropsFound Condition="exists('$(LolNdaConfigProps)')">true</LolNdaConfigPropsFound>
+    <LolNdaPlatformProps>$(LolNdaDirectory)/msbuild/platform.props</LolNdaPlatformProps>
+    <LolNdaPlatformPropsFound>$([System.IO.File]::Exists($(LolNdaPlatformProps)))</LolNdaPlatformPropsFound>
+
+    <LolNdaKoreProps>$(LolNdaDirectory)/msbuild/kore.props</LolNdaKoreProps>
+    <LolNdaKorePropsFound>$([System.IO.File]::Exists($(LolNdaKoreProps)))</LolNdaKorePropsFound>
+
+    <LolNdaPlatformTargets>$(LolNdaDirectory)/msbuild/platform.targets</LolNdaPlatformTargets>
+    <LolNdaPlatformTargetsFound>$([System.IO.File]::Exists($(LolNdaPlatformTargets)))</LolNdaPlatformTargetsFound>
   </PropertyGroup>
 
-  <Import Project="$(LolNdaConfigProps)" Condition="$(LolNdaConfigPropsFound)" />
+  <Import Project="$(LolNdaPlatformProps)" Condition="'$(LolNdaPlatformPropsFound)'=='true'" />
 
   <!--
      - Sanity checks
@@ -34,8 +40,8 @@
     <Error Condition="'$(LolNdaPlatform)'!='' and '$(LolNdaDirectory)'==''"
            Text="NDA platform $(LolNdaPlatform) selected but support repository $(LolNdaRepository) was not found" />
 
-    <Error Condition="'$(LolNdaPlatform)'!='' and !$(LolNdaConfigPropsFound)"
-           Text="NDA platform '$(Platform)' selected, but '$(LolNdaConfigProps)' was not found; is the '$(LolNdaRepository)' repository up-to-date?" />
+    <Error Condition="'$(LolNdaPlatform)'!='' and !$(LolNdaPlatformPropsFound)"
+           Text="NDA platform '$(Platform)' selected, but '$(LolNdaPlatformProps)' was not found; is the '$(LolNdaRepository)' repository up-to-date?" />
 
   </Target>
 

msbuild/vars.props

@@ -65,21 +65,14 @@
   </PropertyGroup>
 
   <!--
-     - Build tasks
+     - Build tasks and rules
    -->
 
   <ImportGroup Label="PropertySheets">
     <Import Project="$(LolEngineDir)msbuild/embed/task.props" />
+    <Import Project="$(LolEngineDir)msbuild/rules.props" />
   </ImportGroup>
 
-  <!--
-     - Build rules
-   -->
-
-  <Import Project="$(LolNdaDirectory)/msbuild/rules.props"
-          Condition="'$(LolNdaDirectory)'!='' and exists('$(LolNdaDirectory)/msbuild/rules.props')" />
-  <Import Project="$(LolEngineDir)msbuild/rules.props" />
-
   <ItemDefinitionGroup />
 
   <!--