[mono-runtimes] Make sure we either download *or* build mono (#2318)

If we, for some reason, build Mono from sources, we do not want to try to download it later on. This may happen if you bump `external/mono` to the HEAD of a release branch, build locally before the Mono Archive is created on CI, then try to rebuild locally after the Mono Archive has been created on CI.
dotnet · Oct 22, 2018 · f1359d9 · f1359d9
1 parent 87b0c44
commit f1359d9
Showing 1 changed file with 18 additions and 17 deletions.
diff --git a/src/mono-runtimes/mono-runtimes.targets b/src/mono-runtimes/mono-runtimes.targets
@@ -51,7 +51,6 @@
   <PropertyGroup>
     <ForceBuildDependsOn>
       _DownloadArchive;
-      _Autogen;
       _Build;
       _InstallRuntimes;
       _InstallLlvm;
@@ -147,7 +146,7 @@
     <Touch Files="$(LlvmSourceFullPath)\CMakeLists.txt" Time="$(_LlvmCommitTime)" />
   </Target>
 
-  <Target Name="_PrepareLlvmItems">
+  <Target Name="_GetLlvmOutputItems">
     <ItemGroup>
       <_LlvmSourceBinary Include="@(_LlvmRuntime->'$(MonoSourceFullPath)\sdks\out\llvm-%(Identity)\bin\opt%(ExeSuffix)')" Condition=" '%(_LlvmRuntime.InstallBinaries)' == 'true' " />
       <_LlvmTargetBinary Include="@(_LlvmRuntime->'$(_MSBuildDir)\%(InstallPath)opt%(ExeSuffix)')" Condition=" '%(_LlvmRuntime.InstallBinaries)' == 'true' " />
@@ -169,16 +168,6 @@
         Files="@(_LlvmTargetBinary)" />
   </Target>
 
-  <Target Name="_Autogen"
-      DependsOnTargets="_SetAutogenShTimeToLastCommitTimestamp"
-      Inputs="$(MonoSourceFullPath)\autogen.sh"
-      Outputs="$(MonoSourceFullPath)\configure">
-    <Exec
-        Command="make DISABLE_IOS=1 configure-mono"
-        WorkingDirectory="$(MonoSourceFullPath)\sdks\builds"
-    />
-  </Target>
-
   <Target Name="_GetMonoGitCommitHash">
     <GitCommitHash
         WorkingDirectory="$(MonoSourceFullPath)"
@@ -284,7 +273,7 @@
 
   <Target Name="_DownloadArchive"
       DependsOnTargets="_GetMonoGitCommitHash"
-      Condition=" !Exists('$(MonoSourceFullPath)\sdks\out\.stamp-$(_MonoArchiveName)-download') " >
+      Condition=" !Exists('$(MonoSourceFullPath)\sdks\out\.stamp-$(_MonoArchiveName)-build') And !Exists('$(MonoSourceFullPath)\sdks\out\.stamp-$(_MonoArchiveName)-download') " >
     <MakeDir
         Directories="$(MonoSourceFullPath)\sdks\out"
     />
@@ -308,15 +297,18 @@
 
   <Target Name="_Build"
       Condition=" '@(_MonoRuntime)' != '' Or '@(_MonoCrossRuntime)' != '' Or '@(_MonoBcl)' != '' Or '@(_LlvmRuntime)' != '' "
-      DependsOnTargets="_SetAutogenShTimeToLastCommitTimestamp;_GetRuntimesOutputItems;_PrepareLlvmItems;_GetMonoGitCommitHash;_DownloadArchive"
-      Inputs="$(LlvmSourceFullPath)\CMakeLists.txt;$(MonoSourceFullPath)\autogen.sh"
-      Outputs="@(_RuntimeSource);@(_RuntimeBinarySource);@(_CrossRuntimeBinarySource);@(_ProfilerSource);@(_MonoPosixHelperSource);@(_RuntimeEglibHeaderSource);@(_MonoBtlsSource);@(_BclTestOutput);@(_BclProfileItems);@(_LlvmSourceBinary)">
+      DependsOnTargets="_GetMonoGitCommitHash;_DownloadArchive">
     <Exec
         Condition=" !Exists('$(MonoSourceFullPath)\sdks\out\.stamp-$(_MonoArchiveName)-download') "
         Command="make DISABLE_IOS=1 $(MakeConcurrency) @(_MonoRuntime->'package-android-%(Identity)', ' ') @(_MonoCrossRuntime->'package-android-%(Identity)', ' ') @(_MonoBcl->'package-android-%(Identity)', ' ') @(_LlvmRuntime->'provision-llvm-%(Identity)', ' ') $(_MonoSdksParameters)"
         IgnoreStandardErrorWarningFormat="True"
         WorkingDirectory="$(MonoSourceFullPath)\sdks\builds"
     />
+    <Touch
+        Condition=" !Exists('$(MonoSourceFullPath)\sdks\out\.stamp-$(_MonoArchiveName)-download') "
+        Files="$(MonoSourceFullPath)\sdks\out\.stamp-$(_MonoArchiveName)-build"
+        AlwaysCreate="True"
+    />
   </Target>
 
   <Target Name="_InstallRuntimes"
@@ -571,7 +563,7 @@
   </Target>
 
   <Target Name="GetMonoBundleItems"
-      DependsOnTargets="_GetRuntimesOutputItems;_PrepareLlvmItems">
+      DependsOnTargets="_GetRuntimesOutputItems;_GetLlvmOutputItems">
     <ItemGroup>
       <BundleItem Include="@(_BclInstalledItem)" />
       <BundleItem Include="@(_MonoDocInstalledItems)" />
@@ -598,11 +590,13 @@
       <BundleItem Include="@(_BclTestOutput)" />
     </ItemGroup>
   </Target>
+
   <Target Name="ForceBuild"
       DependsOnTargets="GetMonoBundleItems;$(ForceBuildDependsOn)"
       Inputs="$(MonoSourceFullPath)\autogen.sh;$(LlvmSourceFullPath)\CMakeLists.txt"
       Outputs="@(BundleItem)">
   </Target>
+
   <Target Name="_BuildUnlessCached"
       DependsOnTargets="_SetAutogenShTimeToLastCommitTimestamp;GetMonoBundleItems"
       Inputs="$(MonoSourceFullPath)\autogen.sh;$(LlvmSourceFullPath)\CMakeLists.txt"
@@ -616,6 +610,7 @@
         Targets="ForceBuild"
     />
   </Target>
+
   <Target Name="_CleanRuntimes"
       AfterTargets="Clean">
     <Exec
@@ -624,6 +619,12 @@
         IgnoreStandardErrorWarningFormat="True"
         WorkingDirectory="$(MonoSourceFullPath)\sdks\builds"
     />
+
+    <ItemGroup>
+      <_StampFiles Include="$(MonoSourceFullPath)\sdks\out\.stamp-android-$(_MonoSdksConfiguration)-*-$(HostOS)-build"/>
+      <_StampFiles Include="$(MonoSourceFullPath)\sdks\out\.stamp-android-$(_MonoSdksConfiguration)-*-$(HostOS)-download"/>
+    </ItemGroup>
+    <Delete Files="@(_StampFiles)" />
   </Target>
 
   <Target Name="CoreCompile"