Skip to content

Commit 79c9f03

Browse files
committed
Merge branch 'topic/vadim/alire' into 'main'
Rename file to be overwritten by Alire. See merge request eng/shared/vss-text!12
2 parents bc5f86e + 00a5bd6 commit 79c9f03

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--
2-
-- Copyright (C) 2020-2024, AdaCore
2+
-- Copyright (C) 2020-2025, AdaCore
33
--
44
-- SPDX-License-Identifier: Apache-2.0
55
--
@@ -15,7 +15,7 @@
1515
-- are explicitly marked by "pragma Ada_2022;". Alire defaults to Ada2022 and
1616
-- override this setting.
1717

18-
abstract project Vss_Config is
18+
abstract project Vss_Text_Config is
1919
Crate_Version := "wavefront";
2020
Crate_Name := "vss";
2121

@@ -124,4 +124,4 @@ abstract project Vss_Config is
124124
Ada_Compiler_Switches := External_Ada_Compiler_Switches & Development_Ada_Compiler_Switches;
125125
end case;
126126

127-
end Vss_Config;
127+
end Vss_Text_Config;

gnat/vss_common.gpr

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
-- Configuration project for all subprojects of the VSS.
88

9-
with "../config/vss_config.gpr";
9+
with "../config/vss_text_config.gpr";
1010

1111
abstract project VSS_Common is
1212

@@ -29,18 +29,18 @@ abstract project VSS_Common is
2929
Ada_Coverage_Switches := ();
3030
Linker_Options := ();
3131

32-
Library_Dir := "../.libs/" & VSS_Config.Build_Profile & "/" & Library_Kind;
33-
Object_Dir := "../.objs/" & VSS_Config.Build_Profile & "/" & Library_Kind;
34-
Tests_Object_Dir := "../../.objs/" & VSS_Config.Build_Profile & "/tests";
35-
Tools_Object_Dir := "../../.objs/" & VSS_Config.Build_Profile & "/tools";
32+
Library_Dir := "../.libs/" & VSS_Text_Config.Build_Profile & "/" & Library_Kind;
33+
Object_Dir := "../.objs/" & VSS_Text_Config.Build_Profile & "/" & Library_Kind;
34+
Tests_Object_Dir := "../../.objs/" & VSS_Text_Config.Build_Profile & "/tests";
35+
Tools_Object_Dir := "../../.objs/" & VSS_Text_Config.Build_Profile & "/tools";
3636

3737
Common_Ada_Compiler_Switches :=
3838
("-gnatW8"); -- Wide character encoding method UTF-8
3939

4040
-- Build Profile
4141

4242
VSS_Ada_Compiler_Switches := ();
43-
case VSS_Config.Build_Profile is
43+
case VSS_Text_Config.Build_Profile is
4444
when "release" =>
4545
VSS_Ada_Compiler_Switches := ("-g");
4646

@@ -90,7 +90,7 @@ abstract project VSS_Common is
9090
-- Common set of switches
9191

9292
Ada_Compiler_Switches :=
93-
VSS_Config.Ada_Compiler_Switches
93+
VSS_Text_Config.Ada_Compiler_Switches
9494
& Common_Ada_Compiler_Switches
9595
& VSS_Ada_Compiler_Switches
9696
& Coverage_Ada_Compiler_Switches

gnat/vss_text.gpr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
-- VSS: Text processing subproject
88

9-
with "../config/vss_config";
9+
with "../config/vss_text_config";
1010
with "vss_common";
1111
with "vss_gnat";
1212

@@ -47,7 +47,7 @@ library project VSS_Text is
4747

4848
package Naming is
4949
for Implementation ("VSS.Implementation.Arithmetic_64")
50-
use "vss-implementation-arithmetic_64__" & Vss_Config.Max_Supported_Integer_Size & ".adb";
50+
use "vss-implementation-arithmetic_64__" & Vss_Text_Config.Max_Supported_Integer_Size & ".adb";
5151
end Naming;
5252

5353
end VSS_Text;

0 commit comments

Comments
 (0)