luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Force update on change to last modified time of artifacts or cached descriptor. 

This is part 2 of the fix for #532.  It may also fix issues when working with
multiple local projects via 'publish-local' and binary dependencies.
This commit is contained in:
Mark Harrah 2012-08-29 11:13:48 -04:00
parent 7ed0c85097
commit 9a0b59b597
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ivy/IvyRetrieve.scala
View File

@ -48,7 +48,7 @@ object IvyRetrieve
} }
def updateReport(report: ResolveReport, cachedDescriptor: File): UpdateReport = def updateReport(report: ResolveReport, cachedDescriptor: File): UpdateReport =
new UpdateReport(cachedDescriptor, reports(report) map configurationReport, updateStats(report)) new UpdateReport(cachedDescriptor, reports(report) map configurationReport, updateStats(report), Map.empty) recomputeStamps()
def updateStats(report: ResolveReport): UpdateStats = def updateStats(report: ResolveReport): UpdateStats =
new UpdateStats(report.getResolveTime, report.getDownloadTime, report.getDownloadSize, false) new UpdateStats(report.getResolveTime, report.getDownloadTime, report.getDownloadSize, false)
def configurationReport(confReport: ConfigurationResolveReport): ConfigurationReport = def configurationReport(confReport: ConfigurationResolveReport): ConfigurationReport =

2
ivy/ResolutionCache.scala
View File

@ -54,7 +54,7 @@ private[sbt] object ResolutionCache
private val ReportFileName = "report.xml" private val ReportFileName = "report.xml"
// base name (name except for extension) of resolution report file // base name (name except for extension) of resolution report file
private val ResolvedName = "resolved" private val ResolvedName = "resolved.xml"
// Cache name // Cache name
private val Name = "sbt-resolution-cache" private val Name = "sbt-resolution-cache"

17
ivy/UpdateReport.scala
View File

@ -13,15 +13,19 @@ package sbt
* @param stats information about the update that produced this report * @param stats information about the update that produced this report
* @see sbt.RichUpdateReport * @see sbt.RichUpdateReport
*/ */
final class UpdateReport(val cachedDescriptor: File, val configurations: Seq[ConfigurationReport], val stats: UpdateStats) final class UpdateReport(val cachedDescriptor: File, val configurations: Seq[ConfigurationReport], val stats: UpdateStats, private[sbt] val stamps: Map[File,Long])
{ {
@deprecated("Use the variant that provides timestamps of files.", "0.13.0")
def this(cachedDescriptor: File, configurations: Seq[ConfigurationReport], stats: UpdateStats) =
this(cachedDescriptor, configurations, stats, Map.empty)
override def toString = "Update report:\n\t" + stats + "\n" + configurations.mkString override def toString = "Update report:\n\t" + stats + "\n" + configurations.mkString
/** All resolved modules in all configurations. */ /** All resolved modules in all configurations. */
def allModules: Seq[ModuleID] = configurations.flatMap(_.allModules).distinct def allModules: Seq[ModuleID] = configurations.flatMap(_.allModules).distinct
def retrieve(f: (String, ModuleID, Artifact, File) => File): UpdateReport = def retrieve(f: (String, ModuleID, Artifact, File) => File): UpdateReport =
new UpdateReport(cachedDescriptor, configurations map { _ retrieve f}, stats ) new UpdateReport(cachedDescriptor, configurations map { _ retrieve f}, stats, stamps )
/** Gets the report for the given configuration, or `None` if the configuration was not resolved.*/ /** Gets the report for the given configuration, or `None` if the configuration was not resolved.*/
def configuration(s: String) = configurations.find(_.configuration == s) def configuration(s: String) = configurations.find(_.configuration == s)
@ -71,6 +75,13 @@ object UpdateReport
/** Provides extra methods for filtering the contents of an `UpdateReport` and for obtaining references to a selected subset of the underlying files. */ /** Provides extra methods for filtering the contents of an `UpdateReport` and for obtaining references to a selected subset of the underlying files. */
final class RichUpdateReport(report: UpdateReport) final class RichUpdateReport(report: UpdateReport)
{ {
def recomputeStamps(): UpdateReport =
{
val files = report.cachedDescriptor +: allFiles
val stamps = files.map(f => (f, f.lastModified)).toMap
new UpdateReport(report.cachedDescriptor, report.configurations, report.stats, stamps)
}
import DependencyFilter._ import DependencyFilter._
/** Obtains all successfully retrieved files in all configurations and modules. */ /** Obtains all successfully retrieved files in all configurations and modules. */
def allFiles: Seq[File] = matching(DependencyFilter.allPass) def allFiles: Seq[File] = matching(DependencyFilter.allPass)
@ -123,7 +134,7 @@ object UpdateReport
val newModules = modules map { modReport => f(configuration, modReport) } val newModules = modules map { modReport => f(configuration, modReport) }
new ConfigurationReport(configuration, newModules, evicted) new ConfigurationReport(configuration, newModules, evicted)
} }
new UpdateReport(report.cachedDescriptor, newConfigurations, report.stats) new UpdateReport(report.cachedDescriptor, newConfigurations, report.stats, report.stamps)
} }
} }
} }