Merge branch 'topic/github_ci_fix' into 'edge'

Use `vss_text`, `vss_extra` to build ALS on GitHub

See merge request eng/ide/ada_language_server!2096

Author: reznikmm

gnat/lsp_server.gpr

@@ -13,7 +13,7 @@ with "libgnatdoc.gpr";
 with "spawn.gpr";
 with "gnatformat.gpr";
 with "vss_os.gpr";
-with "ada_xdiff.gpr";
+with "xdiff.gpr";
 
 with "lsp_3_17";
 with "lsp_common";

scripts/build_als.sh

@@ -42,7 +42,9 @@ libgpr2
 markdown
 prettier_ada
 spawn
-vss
+vss_text
+vss_extra
+xdiff
 "
 
 # Pins repo names (crate name by default)
@@ -54,7 +56,9 @@ repo_libadalang_tools=libadalang-tools
 repo_libgpr=gprbuild
 repo_libgpr2=gpr
 repo_prettier_ada=prettier-ada
-repo_vss=VSS
+repo_vss_text=vss-text
+repo_vss_extra=vss-extra
+repo_xdiff=xdiff
 
 # Pins branches (master by default)
 
@@ -63,6 +67,9 @@ branch_lal_refactor=edge
 branch_gnatformat=edge
 branch_libgpr2=main
 branch_prettier_ada=main
+branch_vss_text=main
+branch_vss_extra=main
+branch_xdiff=main
 
 # Repository URLs can be overriden (e.g. to personal forks for experimentation)
 # url_langkit_support=https://github.com/<my-github-login>/langkit.git
@@ -136,7 +143,10 @@ function pin_crates() {
          # remote. So let's do that update.
          git -C "subprojects/$crate" pull origin "${branch:-master}"
       fi
-      cp -v "subprojects/$crate".toml "subprojects/$crate/alire.toml"
+
+      if [ -f "subprojects/$crate.toml" ]; then
+         cp -v "subprojects/$crate".toml "subprojects/$crate/alire.toml"
+      fi
 
       # Instead of calling `alr pin` for each crate, it's more efficient to
       # append the necessary text in alire.toml and call `alr update` once at

subprojects/als.toml

@@ -23,10 +23,12 @@ LSP_OS = "Windows_NT"
 gnatcoll         = "^24.0.0"
 libadalang       = "^24.0.0"
 libgpr2          = "^24.0.0"
-vss              = "^24.0.0"
+vss_text         = "^24.0.0"
+vss_extra        = "^24.0.0"
 libadalang_tools = "^24.0.0"
 lal_refactor     = "25.0.0-20240625"
 gnatformat       = "25.0.0-20240625"
 gnatdoc          = "^24.0.0"
 spawn            = "^24.0.0"
+xdiff            = "^25.0.0"
 

subprojects/gnatdoc.toml

@@ -25,7 +25,7 @@ command = [
 disabled = true
 
 [[depends-on]]
-vss = "^24"
+vss_text = "^24"
 libgpr2 = "^24"
 libadalang = "^24"
 markdown = "^24"

subprojects/libadalang_tools.toml

@@ -14,4 +14,4 @@ executables = ["gnatmetric", "gnatpp", "gnatstub", "gnattest"]
 [[depends-on]]
 libadalang = "^24.0.0"
 templates_parser = "^24.0.0"
-vss = "^24.0.0"
+vss_text = "^24.0.0"

subprojects/markdown.toml

@@ -25,5 +25,5 @@ command = [
 disabled = true
 
 [[depends-on]]
-vss = "~24.0.0"
+vss_text = "~24.0.0"
 

subprojects/prettier_ada.toml

@@ -17,4 +17,4 @@ append = "${CRATE_ROOT}/lib/relocatable/prod"
 
 [[depends-on]]
 gnatcoll         = "*"
-vss              = "*"
+vss_text         = "*"

subprojects/vss.toml

@@ -0,0 +1,56 @@
+name = "vss_text"
+description = "A high level Unicode text processing library"
+
+long-description = """
+## Warning - Work in Progress
+
+This crate is based on [`VSS`](https://github.com/AdaCore/VSS) (Virtual
+String System). VSS has been split into two crates:
+
+* [`vss_text`](https://alire.ada.dev/crates/vss_text) (this crate): a library
+  for Unicode text processing.
+* [`vss_extra`](https://alire.ada.dev/crates/vss_extra): libraries for handling
+  JSON, Regexp, XML and other features based on `vss_text`.
+
+Significant changes are planned in `vss_text` with the goal to make it a
+high-quality, high-performance library suitable for a wide range of
+applications.
+
+The changes include the following (non-exhaustive list):
+
+* API Changes
+  * Introduce an immutable string type.
+  * Repurpose the mutable `Virtual_String` type to a string builder type.
+  * Possibly rename the root package `VSS` to a new more appropriate name. Alire crate,
+    GPR project and repository names might change accordingly.
+* (done) Drop the support of multiple internal encodings in favor of a single internal
+  encoding (likely UTF-8) for improved performance.
+"""
+
+version = "25.0.0-dev"
+tags = ["unicode", "string", "text"]
+
+authors = ["AdaCore"]
+maintainers = ["Vadim Godunko <[email protected]>", "Maxim Reznik <[email protected]>"]
+maintainers-logins = ["godunko", "reznikmm"]
+licenses = "Apache-2.0"
+website = "https://github.com/AdaCore/vss-text"
+
+project-files = ["gnat/vss_text.gpr"]
+
+[configuration]
+generate_ada = false
+generate_c = false
+
+[configuration.variables]
+Max_Supported_Integer_Size = {type = "Enum", values = ["128", "64"], default = "128"}
+
+[build-switches]
+"*".ada_version = "Ada2022"
+
+[environment.'case(os)'.macos.DYLD_LIBRARY_PATH]
+append = "${CRATE_ROOT}/.libs/release/relocatable"
+
+[environment.'case(os)'.windows.PATH]
+append = "${CRATE_ROOT}/.libs/release/relocatable"
+