Skip to content

Commit d258654

Browse files
committed
Merge branch 'topic/fix_sid' into 'master'
Avoid overwrite error for `.sid` files Closes #1185 See merge request eng/ide/ada_language_server!1403
2 parents 593ec69 + 738f4f1 commit d258654

15 files changed

+0
-528
lines changed

Makefile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ export ALS=$(ROOTDIR)/.obj/server/ada_language_server$(EXE)
3030

3131
# Tester files
3232
TESTER=$(ROOTDIR)/.obj/tester/tester-run$(EXE)
33-
CODEC_TEST=.obj/codec_test/codec_test$(EXE)
3433

3534
# Env variable to set for update VS Code test references
3635
MOCHA_ALS_UPDATE=
@@ -97,7 +96,6 @@ all: coverage-instrument
9796
$(GPRBUILD) -d -ws -c -u -P gnat/lsp_server.gpr -p $(BUILD_FLAGS) s-memory.adb
9897
$(GPRBUILD) -P gnat/lsp_server.gpr -p $(COVERAGE_BUILD_FLAGS) \
9998
-XVERSION=$(VERSION) -XBUILD_DATE=$(BUILD_DATE)
100-
$(GPRBUILD) -P gnat/codec_test.gpr -p $(COVERAGE_BUILD_FLAGS)
10199
$(GPRBUILD) -P gnat/lsp_client.gpr -p $(COVERAGE_BUILD_FLAGS)
102100
ifdef NODE
103101
mkdir -p integration/vscode/ada/$(NODE_ARCH)/$(NODE_PLATFORM)
@@ -117,15 +115,12 @@ ifneq ($(COVERAGE),)
117115
rm -rf .obj/*/gnatcov-instr
118116
$(COVERAGE_INSTR) -XVERSION=$(VERSION) -XBUILD_DATE=$(BUILD_DATE) \
119117
-Pgnat/lsp_server.gpr --projects lsp_server --projects lsp_3_17
120-
$(COVERAGE_INSTR) -Pgnat/tester.gpr --projects lsp
121-
$(COVERAGE_INSTR) -Pgnat/codec_test.gpr --projects lsp
122118
endif
123119

124120
install:
125121
gprinstall -f -P gnat/lsp_server.gpr -p -r --mode=usage \
126122
--prefix=$(DESTDIR) $(LIBRARY_FLAGS)
127123
gprinstall -f -P gnat/tester.gpr -p --prefix=$(DESTDIR) $(LIBRARY_FLAGS)
128-
gprinstall -f -P gnat/codec_test.gpr -p --prefix=$(DESTDIR) $(LIBRARY_FLAGS)
129124
gprinstall -f -P gnat/lsp_client.gpr -p -r \
130125
--mode=dev \
131126
--prefix=$(DESTDIR) \
@@ -140,7 +135,6 @@ clean:
140135
-$(GPRCLEAN) -P gnat/lsp_3_17.gpr $(LIBRARY_FLAGS)
141136
-$(GPRCLEAN) -P gnat/lsp_server.gpr $(LIBRARY_FLAGS)
142137
-$(GPRCLEAN) -P gnat/tester.gpr $(LIBRARY_FLAGS)
143-
-$(GPRCLEAN) -P gnat/codec_test.gpr $(LIBRARY_FLAGS)
144138
-rm -rf integration/vscode/ada/$(NODE_ARCH)/$(NODE_PLATFORM)
145139

146140
vscode:
@@ -173,7 +167,6 @@ check: all
173167
(cd `dirname $$a ` ; $(TESTER) `basename $$a`) ;\
174168
done; \
175169
fi
176-
${CODEC_TEST} < testsuite/codecs/index.txt
177170

178171
deploy: check
179172
integration/$(USER)/deploy.sh $(NODE_PLATFORM)

gnat/codec_test.gpr

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)