Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
samuel-williams-da committed Dec 11, 2023
1 parent 8c76efb commit f704435
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
4 changes: 3 additions & 1 deletion compiler/damlc/daml-compiler/src/DA/Daml/Compiler/Dar.hs
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,9 @@ buildDar service PackageConfigFields {..} ifDir dalfInput = do
, Just pkgId
)

-- Takes maybe list of dar paths, name version, path
-- | Takes a list of paths to dars, composite package name and composite package version
-- Merges together all the dars without usage checks, generates a main package with 0 modules
-- Generated package uses latest LF version with matching Major version to the dars given, and the current builtin sdk version.
buildCompositeDar :: [FilePath] -> LF.PackageName -> LF.PackageVersion -> IO (Zip.ZipArchive ())
buildCompositeDar darPaths name version = do
dars <-
Expand Down
6 changes: 0 additions & 6 deletions compiler/damlc/lib/DA/Cli/Damlc.hs
Original file line number Diff line number Diff line change
Expand Up @@ -974,11 +974,6 @@ data MultiPackageBuildMode a
| AllWithComposite [a] -- Usually empty
| Composite [a] -- Should be non empty

instance Show a => Show (MultiPackageBuildMode a) where
show (SinglePackage _) = "Single package"
show (AllWithComposite xs) = "All " <> show xs
show (Composite xs) = "Just " <> show xs

toMaybePackageConfig :: MultiPackageBuildMode a -> Maybe PackageConfigFields
toMaybePackageConfig (SinglePackage pkgConfig) = Just pkgConfig
toMaybePackageConfig _ = Nothing
Expand Down Expand Up @@ -1029,7 +1024,6 @@ execBuild
buildMulti buildMode multiPackageConfigPath =
withMultiPackageConfig multiPackageConfigPath $ \multiPackageConfig -> do
realisedBuildMode <- realiseMultiBuildMode multiPackageConfig buildMode
-- Use the thing above

putStrLn $ "Running multi-package build of " <> case realisedBuildMode of
SinglePackage pkgConfig -> T.unpack $ LF.unPackageName $ pName pkgConfig
Expand Down

0 comments on commit f704435

Please sign in to comment.