File tree Expand file tree Collapse file tree 2 files changed +6
-4
lines changed Expand file tree Collapse file tree 2 files changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -79,7 +79,7 @@ make -C subprojects/templates-parser setup prefix=$prefix \
79
79
ENABLE_SHARED=no \
80
80
${DEBUG: +BUILD=debug} build-static install-static
81
81
82
- make LIBRARY_TYPE=static all check
82
+ make LIBRARY_TYPE=static VERSION= $TAG all check
83
83
84
84
function fix_rpath ()
85
85
{
Original file line number Diff line number Diff line change 1
1
# Server executable file:
2
2
ROOTDIR =$(shell pwd)
3
3
4
+ # ALS version
5
+ VERSION ?=
4
6
# Location of home dir for tests
5
7
export ALS_HOME =$(ROOTDIR ) /testsuite
6
8
@@ -74,10 +76,10 @@ all: coverage-instrument
74
76
$(GPRBUILD ) -P gnat/tester.gpr -p $(BUILD_FLAGS )
75
77
$(GPRBUILD ) -d -ws -c -u -P gnat/lsp_server.gpr -p $(BUILD_FLAGS ) s-memory.adb
76
78
$(GPRBUILD ) -P gnat/lsp_server.gpr -p $(COVERAGE_BUILD_FLAGS ) \
77
- -XVERSION=$(TRAVIS_TAG )
79
+ -XVERSION=$(VERSION )
78
80
$(GPRBUILD ) -P gnat/codec_test.gpr -p $(COVERAGE_BUILD_FLAGS )
79
81
$(GPRBUILD ) -P gnat/lsp_client.gpr -p $(COVERAGE_BUILD_FLAGS ) \
80
- -XVERSION=$(TRAVIS_TAG )
82
+ -XVERSION=$(VERSION )
81
83
mkdir -p integration/vscode/ada/$(PLATFORM )
82
84
cp -f $(ALS )$(EXE ) integration/vscode/ada/$(PLATFORM )
83
85
@@ -92,7 +94,7 @@ ifneq ($(COVERAGE),)
92
94
# Remove artifacts from previous instrumentations, so that stale units that
93
95
# are not overriden by new ones don't get in our way.
94
96
rm -rf .obj/*/gnatcov-instr
95
- $(COVERAGE_INSTR) -XVERSION=$(TRAVIS_TAG ) \
97
+ $(COVERAGE_INSTR) -XVERSION=$(VERSION ) \
96
98
-Pgnat/lsp_server.gpr --projects lsp_server --projects lsp
97
99
$(COVERAGE_INSTR) -Pgnat/tester.gpr --projects lsp
98
100
$(COVERAGE_INSTR) -Pgnat/codec_test.gpr --projects lsp
You can’t perform that action at this time.
0 commit comments