on master help sign in
include mains outside of src/ when reporting number of compiled modules
90bf99cEvan Czaplicki
builder/src/Build.hs+9−10
@@ -685,9 +685,8 @@ compile (Env key root pkg _ _ _) docsNeed local@(Details.Local path time _ _) so
685 return (RNew local iface objects docs)
685 return (RNew local iface objects docs)
686
686
687 Left err ->
687 Left err ->
688− do Reporting.report key Reporting.BDone
689− return $ RProblem $
688+ return $ RProblem $
690− Error.Module (Src.getName modul) path time source err
689+ Error.Module (Src.getName modul) path time source err
691
690
692
691
693
692
@@ -1077,13 +1076,13 @@ checkMain env@(Env _ root _ _ _ _) results pendingMain =
1077 do depsStatus <- checkDeps root results deps
1076 do depsStatus <- checkDeps root results deps
1078 case depsStatus of
1077 case depsStatus of
1079 DepsChange ifaces ->
1078 DepsChange ifaces ->
1080− return $ compileOutside env local source ifaces modul
1079+ compileOutside env local source ifaces modul
1081
1080
1082 DepsSame same cached ->
1081 DepsSame same cached ->
1083 do maybeLoaded <- loadInterfaces root same cached
1082 do maybeLoaded <- loadInterfaces root same cached
1084 case maybeLoaded of
1083 case maybeLoaded of
1085 Nothing -> return ROutsideBlocked
1084 Nothing -> return ROutsideBlocked
1086− Just ifaces -> return $ compileOutside env local source ifaces modul
1085+ Just ifaces -> compileOutside env local source ifaces modul
1087
1086
1088 DepsBlock ->
1087 DepsBlock ->
1089 return ROutsideBlocked
1088 return ROutsideBlocked
@@ -1093,18 +1092,18 @@ checkMain env@(Env _ root _ _ _ _) results pendingMain =
1093 Error.BadImports (toImportErrors env results imports problems)
1092 Error.BadImports (toImportErrors env results imports problems)
1094
1093
1095
1094
1096−compileOutside :: Env -> Details.Local -> B.ByteString -> Map.Map ModuleName.Raw I.Interface -> Src.Module -> MainResult
1095+compileOutside :: Env -> Details.Local -> B.ByteString -> Map.Map ModuleName.Raw I.Interface -> Src.Module -> IO MainResult
1097−compileOutside (Env _ _ pkg _ _ _) (Details.Local path time _ _) source ifaces modul =
1096+compileOutside (Env key _ pkg _ _ _) (Details.Local path time _ _) source ifaces modul =
1098 let
1097 let
1099 name = Src.getName modul
1098 name = Src.getName modul
1100 in
1099 in
1101 case Compile.compile pkg ifaces modul of
1100 case Compile.compile pkg ifaces modul of
1102 Right (Compile.Artifacts canonical annotations objects) ->
1101 Right (Compile.Artifacts canonical annotations objects) ->
1102+ do Reporting.report key Reporting.BDone
1103− ROutsideOk name (I.fromModule pkg canonical annotations) objects
1103+ return $ ROutsideOk name (I.fromModule pkg canonical annotations) objects
1104
1104
1105 Left errors ->
1105 Left errors ->
1106− ROutsideErr $
1107− Error.Module name path time source errors
1106+ return $ ROutsideErr $ Error.Module name path time source errors
1108
1107
1109
1108
1110
1109