Merge pull request livecode#1258 from livecode/feature-better_dependency_error

livecodeali · web-flow · commit e8561d8ca39f · 2016-07-01T10:15:58.000+01:00
[[ IDE ]] Include info about file that causes dependency check error
diff --git a/Toolset/libraries/revidelibrary.8.livecodescript b/Toolset/libraries/revidelibrary.8.livecodescript
@@ -11276,17 +11276,17 @@ private function __ScanFileMTime pFilename, pRecursive, pAllowMissing, \
    if tDirname is empty then
       put "." into tDirname
    end if
-
+   
    if tBasename is empty then
-      throw "Failed to check modification time: invalid filename"
+      throw "Failed to check modification time: invalid filename" && pFilename
    end if
-
+   
    -- Regular file
    local tMTime
    if there is a file pFilename then
       put revIDELastModifiedTimeOfFile(tDirname, tBasename) into tMTime
       if tMTime is empty then
-         throw "Failed to check modification time for file"
+         throw "Failed to check modification time for file" && pFilename
       end if
       if tMTime < xMin then
          put tMTime into xMin
@@ -11305,21 +11305,22 @@ private function __ScanFileMTime pFilename, pRecursive, pAllowMissing, \
          -- List directory contents
          revIDEPushDefaultFolder pFilename
          if the result is not empty then
-            throw "Failed to set default folder"
+            throw "Failed to set default folder" && pFilename
          end if
          
          put files() & return & folders() into tContents
          filter tContents without ".."
-
+         filter tContents without empty
+         
          revIDEPopDefaultFolder pFilename
          if the result is not empty then
-            throw "Failed to set default folder"
+            throw "Failed to set default folder" && pFilename
          end if
-
+         
          if tContents is empty then
             return true
          end if
-
+         
          -- Recursively scan files & folders
          repeat for each line tInnerFilename in tContents
             put pFilename & slash before tInnerFilename
@@ -11330,14 +11331,14 @@ private function __ScanFileMTime pFilename, pRecursive, pAllowMissing, \
          
          return true
       else
-         throw "Failed to check modification time: unexpected folder"
+         throw "Failed to check modification time: unexpected folder" && pFilename
       end if
    end if
    
    -- Missing
    if pAllowMissing then
       return false
    else
-      throw "Failed to check modification time: missing file"
+      throw "Failed to check modification time: missing file" && pFilename
    end if
 end __ScanFileMTime
