Skip to content

Commit c17d59c

Browse files
committed
Merge branch 'topic/fix_release' into 'master'
Add documentation about getting symbolic backtrace. Closes #1135 See merge request eng/ide/ada_language_server!1219
2 parents b8298c7 + 7b4a57c commit c17d59c

File tree

4 files changed

+26
-8
lines changed

4 files changed

+26
-8
lines changed

.github/workflows/build-binaries.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ make -C subprojects/templates-parser setup prefix=$prefix \
7979
ENABLE_SHARED=no \
8080
${DEBUG:+BUILD=debug} build-static install-static
8181

82-
make LIBRARY_TYPE=static all check
82+
make LIBRARY_TYPE=static VERSION=$TAG all check
8383

8484
function fix_rpath ()
8585
{

.github/workflows/pack-binaries.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function make_change_log()
1919

2020
chmod -R -v +x als-*-$DEBUG
2121
for X in Linux macOS Windows ; do mv -v -f als-$X-$DEBUG/* integration/vscode/ada/; done
22-
rm -f -v integration/vscode/ada/{linux,darwin,win32}/*.debug
22+
rm -f -v integration/vscode/ada/{linux,darwin,win32}/*.{debug,dSYM}
2323
pushd integration/vscode/ada
2424
sed -i -e "/version/s/[0-9][0-9.]*/$TAG/" package.json
2525
[ -z "$DEBUG" ] || sed -i -e '/^ "name"/s/ada/ada-debug/' \

Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Server executable file:
22
ROOTDIR=$(shell pwd)
33

4+
# ALS version
5+
VERSION ?=
46
# Location of home dir for tests
57
export ALS_HOME=$(ROOTDIR)/testsuite
68

@@ -74,10 +76,10 @@ all: coverage-instrument
7476
$(GPRBUILD) -P gnat/tester.gpr -p $(BUILD_FLAGS)
7577
$(GPRBUILD) -d -ws -c -u -P gnat/lsp_server.gpr -p $(BUILD_FLAGS) s-memory.adb
7678
$(GPRBUILD) -P gnat/lsp_server.gpr -p $(COVERAGE_BUILD_FLAGS) \
77-
-XVERSION=$(TRAVIS_TAG)
79+
-XVERSION=$(VERSION)
7880
$(GPRBUILD) -P gnat/codec_test.gpr -p $(COVERAGE_BUILD_FLAGS)
7981
$(GPRBUILD) -P gnat/lsp_client.gpr -p $(COVERAGE_BUILD_FLAGS) \
80-
-XVERSION=$(TRAVIS_TAG)
82+
-XVERSION=$(VERSION)
8183
mkdir -p integration/vscode/ada/$(PLATFORM)
8284
cp -f $(ALS)$(EXE) integration/vscode/ada/$(PLATFORM)
8385

@@ -92,7 +94,7 @@ ifneq ($(COVERAGE),)
9294
# Remove artifacts from previous instrumentations, so that stale units that
9395
# are not overriden by new ones don't get in our way.
9496
rm -rf .obj/*/gnatcov-instr
95-
$(COVERAGE_INSTR) -XVERSION=$(TRAVIS_TAG) \
97+
$(COVERAGE_INSTR) -XVERSION=$(VERSION) \
9698
-Pgnat/lsp_server.gpr --projects lsp_server --projects lsp
9799
$(COVERAGE_INSTR) -Pgnat/tester.gpr --projects lsp
98100
$(COVERAGE_INSTR) -Pgnat/codec_test.gpr --projects lsp

doc/HACKING.md

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,22 @@ about memory usage, allowing to track down which parts of the program consumes
3636
the most memory.
3737
This is very useful to resolve unexpected memory consumption issues.
3838

39+
## Getting symbolic backtrace
40+
41+
To get a symbolic backtrace you need the debug information files. For the
42+
release you can download them from
43+
[GitHub Release](https://github.com/AdaCore/ada_language_server/releases)
44+
Assets. Assets contain an archive per platform with the ALS
45+
executable and debug information files (`.debug` file on Linux/Windows and
46+
`.dSYM` directory for Mac OS X). Extract the debug information to the directory
47+
containing ALS (usually this is
48+
`$HOME/.vscode/extensions/adacore.ada-*/{darwin,linux,win32}`)
49+
and run
50+
51+
addr2line ada_language_server <hex backtrace>
52+
53+
On Mac OX X use [atos](https://www.unix.com/man-page/osx/1/atos/) instead.
54+
3955
### Writing tests
4056

4157
To write a functional test for Ada Language Server:
@@ -116,16 +132,16 @@ Release notes
116132
```
117133
118134
Then push it to GitHub with `git push 22.0.3` or `git push --tags`.
119-
The travis CI will publish the extension on the marketplace.
135+
The GitHub CI will publish the extension on the marketplace and the
136+
[Open VSX Registry](https://open-vsx.org). It also makes GitHub Release and
137+
put archives with ALS executables and debug information files.
120138
121139
## Source directories
122140
123141
The repository contains the following folders:
124142
125143
* `doc/` - documentation of the project and LSP extensions
126144
* `gnat/` - GNAT project files
127-
* `integration/appveyor/` - Appveyor CI (Windows) integration scripts
128-
* `integration/travis/` - Travis CI (Linux and Mac OS) integration scripts
129145
* `integration/vscode/ada/` - VS Code extension sources
130146
* `scripts/` - some support scripts
131147
* `ada_language_server/source/ada/` - LSP implementation for Ada language

0 commit comments

Comments
 (0)