aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Gröber <dxld@darkboxed.org>2018-10-21 16:27:22 +0200
committerDaniel Gröber <dxld@darkboxed.org>2018-10-27 20:48:56 +0200
commite91d57a4655d69b306190506c488450f42391fb3 (patch)
tree85cccb972f8786b0c7658c55c39ae6b5c611c879 /src
parente7ee5a69970a6641ea650557611a8fb502d85dc5 (diff)
Add package-id unit-query
Diffstat (limited to 'src')
-rw-r--r--src/CabalHelper/Compiletime/Types.hs3
-rw-r--r--src/CabalHelper/Runtime/Main.hs7
-rw-r--r--src/CabalHelper/Shared/InterfaceTypes.hs2
3 files changed, 10 insertions, 2 deletions
diff --git a/src/CabalHelper/Compiletime/Types.hs b/src/CabalHelper/Compiletime/Types.hs
index 58e90b1..e803ae6 100644
--- a/src/CabalHelper/Compiletime/Types.hs
+++ b/src/CabalHelper/Compiletime/Types.hs
@@ -146,6 +146,9 @@ data UnitInfo = UnitInfo
{ uiUnitId :: !UnitId
-- ^ A unique identifier of this init within the project.
+ , uiPackageId :: !(String, Version)
+ -- ^ The package-name and version this unit belongs to.
+
, uiComponents :: !(Map ChComponentName ChComponentInfo)
-- ^ The components of the unit: libraries, executables, test-suites,
-- benchmarks and so on.
diff --git a/src/CabalHelper/Runtime/Main.hs b/src/CabalHelper/Runtime/Main.hs
index 3a363a3..d0eea1a 100644
--- a/src/CabalHelper/Runtime/Main.hs
+++ b/src/CabalHelper/Runtime/Main.hs
@@ -306,6 +306,11 @@ main = do
print =<< flip mapM cmds $$ \x -> do
case x of
+ "package-id":[] ->
+ return $ Just $ ChResponseVersion $ (,)
+ (display (packageName gpd))
+ (toDataVersion (packageVersion gpd))
+
"flags":[] -> do
return $ Just $ ChResponseFlags $ sort $
map (flagName' &&& flagDefault) $ genPackageFlags gpd
@@ -344,7 +349,7 @@ main = do
"compiler-version":[] -> do
let CompilerId comp ver = compilerId $ compiler lbi
- return $ Just $ ChResponseVersion (show comp) (toDataVersion ver)
+ return $ Just $ ChResponseVersion $ (,) (show comp) (toDataVersion ver)
"package-db-stack":[] -> do
let
diff --git a/src/CabalHelper/Shared/InterfaceTypes.hs b/src/CabalHelper/Shared/InterfaceTypes.hs
index 0539b96..ae72f3f 100644
--- a/src/CabalHelper/Shared/InterfaceTypes.hs
+++ b/src/CabalHelper/Shared/InterfaceTypes.hs
@@ -41,7 +41,7 @@ data ChResponse
| ChResponseList [String]
| ChResponsePkgDbs [ChPkgDb]
| ChResponseLbi String
- | ChResponseVersion String Version
+ | ChResponseVersion (String, Version)
| ChResponseLicenses [(String, [(String, Version)])]
| ChResponseFlags [(String, Bool)]
deriving (Eq, Ord, Read, Show, Generic)