mirror of
https://github.com/digital-asset/daml.git
synced 2024-09-17 15:57:21 +03:00
Connectify user-facing output (#7624)
Together with #7615, this overs all items in #7612. changelog_begin changelog_end
This commit is contained in:
Moritz Kiefer
GitHub
parent
42b7fa5ab9
commit
e09c31899d
@ -20,15 +20,6 @@
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<developers>
|
||||
<developer>
|
||||
<name>Digital Asset SDK Feedback</name>
|
||||
<email>sdk-feedback@digitalasset.com</email>
|
||||
<organization>Digital Asset (Switzerland) GmbH</organization>
|
||||
<organizationUrl>http://www.daml.com</organizationUrl>
|
||||
</developer>
|
||||
</developers>
|
||||
|
||||
<scm>
|
||||
<connection>scm:git:git://github.com/digital-asset/daml.git</connection>
|
||||
<developerConnection>scm:git:ssh://github.com:digital-asset/daml.git</developerConnection>
|
||||
|
||||
@ -3,10 +3,10 @@
|
||||
|
||||
.. _da_theme_licenses:
|
||||
|
||||
DAML SDK Documentation Theme Third-Party Software Notices
|
||||
DAML Connect Documentation Theme Third-Party Software Notices
|
||||
-------------------------------------------------------------------------
|
||||
|
||||
The DAML SDK Documentation Theme includes components from the projects listed below.
|
||||
The DAML Connect Documentation Theme includes components from the projects listed below.
|
||||
Digital Asset relicenses these components under its Software License terms,
|
||||
except that components licensed under terms requiring that such components
|
||||
remain under their original license are being made available to you by Digital
|
||||
|
||||
@ -3,10 +3,10 @@
|
||||
|
||||
.. _sdk_docs_licenses:
|
||||
|
||||
DAML SDK Documentation Third-Party Software Notices
|
||||
DAML Connect Documentation Third-Party Software Notices
|
||||
-------------------------------------------------------------------------
|
||||
|
||||
DAML SDK Documentation includes components from the projects listed below.
|
||||
DAML Connect Documentation includes components from the projects listed below.
|
||||
Digital Asset relicenses these components under its Software License terms,
|
||||
except that components licensed under terms requiring that such components
|
||||
remain under their original license are being made available to you by Digital
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
The standard library
|
||||
====================
|
||||
|
||||
The DAML standard library is a collection of DAML modules that are bundled with the DAML SDK, and can be used to implement DAML applications.
|
||||
The DAML standard library is a collection of DAML modules that are bundled with the SDK, and can be used to implement DAML applications.
|
||||
|
||||
The :ref:`Prelude <module-prelude-6842>` module is imported automatically in every DAML module. Other modules must be imported manually, just like your own project's modules. For example:
|
||||
|
||||
|
||||
@ -75,11 +75,11 @@ overrideSdkVersion pkgConfig = do
|
||||
Just sdkVersion -> do
|
||||
when (pSdkVersion pkgConfig /= PackageSdkVersion sdkVersion) $
|
||||
hPutStrLn stderr $ unwords
|
||||
[ "Warning: Using DAML SDK version"
|
||||
[ "Warning: Using SDK version"
|
||||
, sdkVersion
|
||||
, "from"
|
||||
, sdkVersionEnvVar
|
||||
, "enviroment variable instead of DAML SDK version"
|
||||
, "enviroment variable instead of SDK version"
|
||||
, unPackageSdkVersion (pSdkVersion pkgConfig)
|
||||
, "from"
|
||||
, projectConfigName
|
||||
|
||||
@ -176,7 +176,7 @@ installBundledExtension pathToVsix = do
|
||||
when (exitCode /= ExitSuccess) $ do
|
||||
hPutStr stderr . unlines $
|
||||
[ err
|
||||
, "Failed to install DAML Studio extension from SDK bundle."
|
||||
, "Failed to install DAML Studio extension from current SDK."
|
||||
, "Please open an issue on GitHub with the above message."
|
||||
, "https://github.com/digital-asset/daml/issues/new?template=bug_report.md"
|
||||
]
|
||||
|
||||
@ -66,7 +66,7 @@ and operate on the same major version of the serialization format in
|
||||
a backward compatible way. This document describes DAML-LF major version
|
||||
1, including all its minor versions.
|
||||
|
||||
Starting from DAML SDK 1.0 release, DAML-LF versions older than 1.6 are
|
||||
Starting from SDK 1.0 release, DAML-LF versions older than 1.6 are
|
||||
deprecated. An engine compliant with the present specification must handle
|
||||
all versions newer than or equal to DAML-LF 1.6, no requirement is made on
|
||||
handling older version.
|
||||
|
||||
@ -282,7 +282,7 @@ data SubmitFailure = SubmitFailure
|
||||
-- | Details of the @submit@ command.
|
||||
--
|
||||
-- The @handleFailure@ field is kept on @submit@ for backwards compatibility.
|
||||
-- Older versions of the DAML SDK didn't distinguish @Submit@ and
|
||||
-- Older versions of the SDK didn't distinguish @Submit@ and
|
||||
-- @SubmitMustFail@ in the script runner.
|
||||
data SubmitCmd a = SubmitCmd { party : Party, commands : Commands a, handleFailure : SubmitFailure -> a, locations : [(Text, SrcLoc)] }
|
||||
deriving Functor
|
||||
|
||||
2
deps.bzl
2
deps.bzl
@ -49,7 +49,7 @@ rules_go_version = "0.23.6"
|
||||
rules_go_sha256 = "8663604808d2738dc615a2c3eb70eba54a9a982089dd09f6ffe5d0e75771bc4f"
|
||||
|
||||
# Recent davl.
|
||||
davl_version = "f2d7480d118f32626533d6a150a8ee7552cc0222" # 2020-03-23, "Deploy upgrade to DAML SDK 0.13.56-snapshot.20200318",https://github.com/digital-asset/davl/pull/233/commits.
|
||||
davl_version = "f2d7480d118f32626533d6a150a8ee7552cc0222" # 2020-03-23, "Deploy upgrade to SDK 0.13.56-snapshot.20200318",https://github.com/digital-asset/davl/pull/233/commits.
|
||||
davl_sha256 = "3e8ae2a05724093e33b7f0363381e81a7e8e9655ccb3aa47ad540ea87e814321"
|
||||
|
||||
# Pinned davl relied on by damlc packaging tests.
|
||||
|
||||
@ -7,7 +7,7 @@ Notes on the format of this file:
|
||||
- For lines that start `$`, type them at the terminal.
|
||||
- For lines that start `Alice>` or `Bob>` or `Charlie>`, type them at the relevant `nim` console. You'll end up with three terminals running simultaneously.
|
||||
|
||||
## 0. Setup: Build application and update the DAML SDK
|
||||
## 0. Setup: Build application and update the SDK
|
||||
|
||||
$ cd daml
|
||||
$ bazel build language-support/hs/bindings/examples/nim/...
|
||||
|
||||
@ -39,6 +39,6 @@ lazy val commonSettings = Seq(
|
||||
)
|
||||
|
||||
lazy val applicationDependencies = Seq(
|
||||
"com.daml" %% "bindings-scala" % daSdkVersion,
|
||||
"com.daml" %% "bindings-akka" % daSdkVersion
|
||||
"com.daml" %% "bindings-scala" % damlSdkVersion,
|
||||
"com.daml" %% "bindings-akka" % damlSdkVersion
|
||||
)
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
object Versions {
|
||||
|
||||
private val daSdkVersionKey = "da.sdk.version"
|
||||
private val damlSdkVersionKey = "daml.sdk.version"
|
||||
|
||||
private val errorMsg =
|
||||
s"Error: cannot determine DA SDK version, either specify it with '-D${daSdkVersionKey}=<VERSION>' or use 'daml.yaml' with configured 'sdk-version' field."
|
||||
s"Error: cannot determine SDK version, either specify it with '-D${damlSdkVersionKey}=<VERSION>' or use 'daml.yaml' with configured 'sdk-version' field."
|
||||
|
||||
val daSdkVersion: String = sys.props
|
||||
.get(daSdkVersionKey)
|
||||
val damlSdkVersion: String = sys.props
|
||||
.get(damlSdkVersionKey)
|
||||
.getOrElse(
|
||||
sdkVersionFromFile(new java.io.File("daml.yaml")).fold(
|
||||
error => { println(errorMsg); throw error },
|
||||
@ -17,7 +17,7 @@ object Versions {
|
||||
)
|
||||
)
|
||||
|
||||
println(s"$daSdkVersionKey = ${daSdkVersion: String}")
|
||||
println(s"$damlSdkVersionKey = ${damlSdkVersion: String}")
|
||||
|
||||
private def sdkVersionFromFile(file: java.io.File): Either[io.circe.Error, String] = {
|
||||
import io.circe.yaml.parser
|
||||
|
||||
@ -6,7 +6,7 @@ This example demonstrates how to:
|
||||
- how to exercise a choice and send a corresponding exercise command
|
||||
- subscribe to receive ledger events and decode them into generated Scala ADTs
|
||||
|
||||
All instructions below assume that you have DAML SDK installed. If you have not installed it yet, please follow these instructions: https://docs.daml.com/getting-started/installation.html
|
||||
All instructions below assume that you have DAML Connect SDK installed. If you have not installed it yet, please follow these instructions: https://docs.daml.com/getting-started/installation.html
|
||||
|
||||
## Create a quickstart-scala project
|
||||
```
|
||||
|
||||
@ -52,10 +52,10 @@ lazy val commonSettings = Seq(
|
||||
|
||||
// <doc-ref:dependencies>
|
||||
lazy val codeGenDependencies = Seq(
|
||||
"com.daml" %% "bindings-scala" % daSdkVersion
|
||||
"com.daml" %% "bindings-scala" % damlSdkVersion
|
||||
)
|
||||
|
||||
lazy val applicationDependencies = Seq(
|
||||
"com.daml" %% "bindings-akka" % daSdkVersion
|
||||
"com.daml" %% "bindings-akka" % damlSdkVersion
|
||||
)
|
||||
// </doc-ref:dependencies>
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
object Versions {
|
||||
|
||||
private val daSdkVersionKey = "da.sdk.version"
|
||||
private val damlSdkVersionKey = "daml.sdk.version"
|
||||
|
||||
private val errorMsg =
|
||||
s"Error: cannot determine DA SDK version, either specify it with '-D${daSdkVersionKey}=<VERSION>' or use 'daml.yaml' with configured 'sdk-version' field."
|
||||
s"Error: cannot determine SDK version, either specify it with '-D${damlSdkVersionKey}=<VERSION>' or use 'daml.yaml' with configured 'sdk-version' field."
|
||||
|
||||
val daSdkVersion: String = sys.props
|
||||
.get(daSdkVersionKey)
|
||||
val damlSdkVersion: String = sys.props
|
||||
.get(damlSdkVersionKey)
|
||||
.getOrElse(
|
||||
sdkVersionFromFile(new java.io.File("daml.yaml")).fold(
|
||||
error => { println(errorMsg); throw error },
|
||||
@ -17,7 +17,7 @@ object Versions {
|
||||
)
|
||||
)
|
||||
|
||||
println(s"$daSdkVersionKey = ${daSdkVersion: String}")
|
||||
println(s"$damlSdkVersionKey = ${damlSdkVersion: String}")
|
||||
|
||||
private def sdkVersionFromFile(file: java.io.File): Either[io.circe.Error, String] = {
|
||||
import io.circe.yaml.parser
|
||||
|
||||
@ -794,7 +794,7 @@ writePackageJson packageDir sdkVersion scope dependencies =
|
||||
, "license" .= ("UNLICENSED" :: T.Text)
|
||||
, "main" .= ("lib/index.js" :: T.Text)
|
||||
, "types" .= ("lib/index.d.ts" :: T.Text)
|
||||
, "description" .= ("Generated by `daml codegen js` from DAML SDK " <> versionToText sdkVersion)
|
||||
, "description" .= ("Generated by `daml codegen js` from SDK " <> versionToText sdkVersion)
|
||||
, "dependencies" .= packageJsonDependencies sdkVersion scope dependencies
|
||||
]
|
||||
in
|
||||
|
||||
@ -17,7 +17,7 @@ main = do
|
||||
|
||||
installer :: FilePath -> FilePath -> Action SectionId
|
||||
installer sdkDir logo = do
|
||||
name "DAML SDK"
|
||||
name "DAML Connect SDK"
|
||||
outFile "daml-sdk-installer.exe"
|
||||
installIcon (fromString logo)
|
||||
requestExecutionLevel User
|
||||
@ -32,7 +32,7 @@ installer sdkDir logo = do
|
||||
-- that nsis will cleanup automatically.
|
||||
unsafeInject "InitPluginsDir"
|
||||
iff_ (fileExists "$APPDATA/daml") $ do
|
||||
answer <- messageBox [MB_YESNO] "DAML SDK is already installed. Do you want to remove the installed SDKs before installing this one?"
|
||||
answer <- messageBox [MB_YESNO] "DAML Connect SDK is already installed. Do you want to remove the installed SDKs before installing this one?"
|
||||
iff (answer %== "YES")
|
||||
(rmdir [Recursive] "$APPDATA/daml")
|
||||
(abort "Existing installation detected.")
|
||||
|
||||
Loading…
Reference in New Issue
Block a user