mirror of
https://github.com/digital-asset/daml.git
synced 2024-10-10 19:48:31 +03:00
Move code in daml-tools outside of daml-foundations (#2033)
This commit is contained in:
parent
33695b9961
commit
bb3a98bf61
@ -9,6 +9,7 @@ echo \
|
||||
-i"${BAZEL_GENFILES}" \
|
||||
-i"${BAZEL_GENFILES}"/compiler/scenario-service/protos \
|
||||
-i"${BAZEL_GENFILES}"/daml-lf/archive \
|
||||
-icompiler/damlc/lib \
|
||||
-icompiler/daml-lf-ast/src \
|
||||
-icompiler/daml-lf-proto/src \
|
||||
-icompiler/daml-lf-reader/src \
|
||||
@ -23,6 +24,5 @@ echo \
|
||||
-idaml-foundations/daml-ghc/ghc-compiler/src \
|
||||
-idaml-foundations/daml-ghc/ide/src \
|
||||
-idaml-foundations/daml-ghc/language-server/src \
|
||||
-idaml-foundations/daml-tools/daml-cli \
|
||||
-ilibs-haskell/bazel-runfiles/src \
|
||||
-ilibs-haskell/da-hs-base/src
|
||||
|
@ -181,7 +181,7 @@ Lastly, there are some aliases defined here. For example,
|
||||
```
|
||||
alias(
|
||||
name = "damlc",
|
||||
actual = "//daml-foundations/daml-tools/damlc-app"
|
||||
actual = "//compiler/damlc"
|
||||
)
|
||||
```
|
||||
|
||||
|
2
BAZEL.md
2
BAZEL.md
@ -986,7 +986,7 @@ typescript projects. It works in conjunction with rules_nodejs to provide access
|
||||
npm packages.
|
||||
|
||||
Please refer to the documentation in the above url for usage.
|
||||
For an example, please see `daml-foundations/daml-tools/daml-extension/BUILD.bazel`.
|
||||
For an example, please see `compiler/daml-extension/BUILD.bazel`.
|
||||
|
||||
## Protocol buffers in Bazel
|
||||
|
||||
|
6
BUILD
6
BUILD
@ -170,17 +170,17 @@ genrule(
|
||||
|
||||
alias(
|
||||
name = "damlc",
|
||||
actual = "//daml-foundations/daml-tools/damlc-app:damlc-app",
|
||||
actual = "//compiler/damlc:damlc",
|
||||
)
|
||||
|
||||
alias(
|
||||
name = "damlc@ghci",
|
||||
actual = "//daml-foundations/daml-tools/damlc-app:damlc-app@ghci",
|
||||
actual = "//compiler/damlc:damlc@ghci",
|
||||
)
|
||||
|
||||
alias(
|
||||
name = "damlc-dist",
|
||||
actual = "//daml-foundations/daml-tools/damlc-app:damlc-dist",
|
||||
actual = "//compiler/damlc:damlc-dist",
|
||||
)
|
||||
|
||||
alias(
|
||||
|
@ -2,7 +2,7 @@ workspace(
|
||||
name = "com_github_digital_asset_daml",
|
||||
managed_directories = {
|
||||
"@npm": ["node_modules"],
|
||||
"@daml_extension_deps": ["daml-foundations/daml-tools/daml-extension/node_modules"],
|
||||
"@daml_extension_deps": ["compiler/daml-extension/node_modules"],
|
||||
"@navigator_frontend_deps": ["navigator/frontend/node_modules"],
|
||||
},
|
||||
)
|
||||
@ -749,8 +749,8 @@ ts_setup_workspace()
|
||||
# TODO use fine-grained managed dependency
|
||||
yarn_install(
|
||||
name = "daml_extension_deps",
|
||||
package_json = "//daml-foundations/daml-tools/daml-extension:package.json",
|
||||
yarn_lock = "//daml-foundations/daml-tools/daml-extension:yarn.lock",
|
||||
package_json = "//compiler/daml-extension:package.json",
|
||||
yarn_lock = "//compiler/daml-extension:yarn.lock",
|
||||
)
|
||||
|
||||
# TODO use fine-grained managed dependency
|
||||
|
@ -176,7 +176,7 @@ jobs:
|
||||
if [[ "${GITHUB#v}" != "$MARKET" ]] && git merge-base --is-ancestor 798e96c9b9034eac85ace786b9e1955cf380285c $GITHUB; then
|
||||
echo "Publishing $GITHUB to VSCode Marketplace"
|
||||
git checkout $GITHUB
|
||||
cd daml-foundations/daml-tools/daml-extension
|
||||
cd compiler/daml-extension
|
||||
yarn
|
||||
vsce publish ${GITHUB#v} -p $MARKETPLACE_TOKEN
|
||||
else
|
||||
|
2
build.sh
2
build.sh
@ -34,5 +34,5 @@ bazel query 'deps(//...)' > /dev/null
|
||||
# Check that we can load damlc in ghci
|
||||
da-ghci --data yes //:repl -e '()'
|
||||
# Check that our IDE works on our codebase
|
||||
./compiler/hie-core/hie-core-daml.sh daml-foundations/daml-tools/damlc-app/src/Main.hs 2>&1 | tee ide-log
|
||||
./compiler/hie-core/hie-core-daml.sh compiler/damlc/exe/Main.hs 2>&1 | tee ide-log
|
||||
grep -q "Files that failed: 0" ide-log
|
||||
|
Before Width: | Height: | Size: 143 KiB After Width: | Height: | Size: 143 KiB |
@ -4,7 +4,7 @@
|
||||
"description": "DAML editing and analysis tools",
|
||||
"version": "__VERSION__",
|
||||
"publisher": "DigitalAssetHoldingsLLC",
|
||||
"repository": "https://github.com/digital-asset/daml/tree/master/daml-foundations/daml-tools/daml-extension",
|
||||
"repository": "https://github.com/digital-asset/daml/tree/master/compiler/daml-extension",
|
||||
"icon": "images/daml-studio.png",
|
||||
"engines": {
|
||||
"vscode": "^1.32.0"
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user