Skip to content

Commit 8ec7be9

Browse files
committed
Move base code.
1 parent 5d5d7ad commit 8ec7be9

File tree

5 files changed

+21
-32
lines changed

5 files changed

+21
-32
lines changed

gnat/lsp_base.gpr

+1-16
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,11 @@ with "lsp_common";
1111

1212
project LSP_Base is
1313

14-
for Source_Dirs use
15-
("../source/common",
16-
"../source/uri");
14+
for Source_Dirs use ("../liblsp_base/source/");
1715
for Object_Dir use "../.obj/" & LSP_Common.Superproject & "/lsp_base";
1816

1917
package Compiler renames LSP_Common.Compiler;
2018

21-
package Naming is
22-
case LSP_Common.OS_API is
23-
when "Windows_NT" =>
24-
for Implementation ("LSP.Stdio_Streams.Initialize")
25-
use "lsp-stdio_streams-init_windows.adb";
26-
27-
when others =>
28-
for Implementation ("LSP.Stdio_Streams.Initialize")
29-
use "lsp-stdio_streams-init_others.adb";
30-
31-
end case;
32-
end Naming;
33-
3419
package Pretty_Printer renames LSP_Common.Pretty_Printer;
3520

3621
end LSP_Base;

gnat/lsp_server.gpr

+20-16
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,8 @@
1-
------------------------------------------------------------------------------
2-
-- Language Server Protocol --
3-
-- --
4-
-- Copyright (C) 2018-2023, AdaCore --
5-
-- --
6-
-- This is free software; you can redistribute it and/or modify it under --
7-
-- terms of the GNU General Public License as published by the Free Soft- --
8-
-- ware Foundation; either version 3, or (at your option) any later ver- --
9-
-- sion. This software is distributed in the hope that it will be useful, --
10-
-- but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHAN- --
11-
-- TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public --
12-
-- License for more details. You should have received a copy of the GNU --
13-
-- General Public License distributed with this software; see file --
14-
-- COPYING3. If not, go to http://www.gnu.org/licenses for a complete copy --
15-
-- of the license. --
16-
------------------------------------------------------------------------------
1+
--
2+
-- Copyright (C) 2018-2024, AdaCore
3+
--
4+
-- SPDX-License-Identifier: Apache-2.0
5+
--
176

187
with "gpr2.gpr";
198
with "libadalang";
@@ -24,6 +13,7 @@ with "libgnatdoc.gpr";
2413
with "spawn.gpr";
2514

2615
with "lsp_3_17";
16+
with "lsp_common";
2717

2818
project LSP_Server is
2919

@@ -41,6 +31,7 @@ project LSP_Server is
4131
for Source_Dirs use
4232
("../source/server",
4333
"../source/ada",
34+
"../source/common",
4435
"../source/gpr",
4536
"../source/ada/generated",
4637
"../source/memory");
@@ -49,6 +40,19 @@ project LSP_Server is
4940
for Main use ("lsp-ada_driver.adb");
5041
for Languages use ("Ada", "C++");
5142

43+
package Naming is
44+
case LSP_Common.OS_API is
45+
when "Windows_NT" =>
46+
for Implementation ("LSP.Stdio_Streams.Initialize")
47+
use "lsp-stdio_streams-init_windows.adb";
48+
49+
when others =>
50+
for Implementation ("LSP.Stdio_Streams.Initialize")
51+
use "lsp-stdio_streams-init_others.adb";
52+
53+
end case;
54+
end Naming;
55+
5256
package Compiler is
5357
for Default_Switches ("Ada") use
5458
LSP_3_17.Compiler'Default_Switches ("Ada");
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)