diff --git a/compiler/damlc/daml-compiler/src/DA/Daml/Compiler/Dar.hs b/compiler/damlc/daml-compiler/src/DA/Daml/Compiler/Dar.hs index 6403966c54bf..65263fd12f41 100644 --- a/compiler/damlc/daml-compiler/src/DA/Daml/Compiler/Dar.hs +++ b/compiler/damlc/daml-compiler/src/DA/Daml/Compiler/Dar.hs @@ -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 <- diff --git a/compiler/damlc/lib/DA/Cli/Damlc.hs b/compiler/damlc/lib/DA/Cli/Damlc.hs index 5bf0bc64286b..95696b6ead25 100644 --- a/compiler/damlc/lib/DA/Cli/Damlc.hs +++ b/compiler/damlc/lib/DA/Cli/Damlc.hs @@ -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 @@ -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