Add some Spoofax 2 language deps

metaborg · Jul 17, 2024 · 6cd019e · 6cd019e
1 parent 79d6c43
commit 6cd019e
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/depman/gradle/libs.versions.toml b/depman/gradle/libs.versions.toml
@@ -256,6 +256,7 @@ spoofax3-transform-pie                      = { module = "org.metaborg:transform
 
 # ESV (https://github.com/metaborg/esv)
 esv-lang                                    = { module = "org.metaborg.devenv:org.metaborg.meta.lang.esv",              version.ref = "esv" }
+spoofax2-esv-lang                           = { module = "org.metaborg.devenv:org.metaborg.meta.lang.esv",              version.ref = "spoofax2" }  # Use Spoofax 2 language for bootstrapping
 
 # Flowspec (https://github.com/metaborg/flowspec)
 flowspec-runtime                            = { module = "org.metaborg:flowspec.runtime",                               version.ref = "spoofax2" }  # Only spoofax 2 build
@@ -279,7 +280,7 @@ interpreter-library-index                   = { module = "org.metaborg.devenv:or
 spoofax-terms                               = { module = "org.metaborg.devenv:org.spoofax.terms",                       version.ref = "mb-rep" }
 
 # NaBL (https://github.com/metaborg/nabl)
-nabl-lang                                   = { module = "org.metaborg:org.metaborg.meta.lang.nabl",                    version.ref = "spoofax2" }  # Only spoofax 2 build
+spoofax2-nabl-lang                          = { module = "org.metaborg:org.metaborg.meta.lang.nabl",                    version.ref = "spoofax2" }  # Use Spoofax 2 language for bootstrapping (no Spoofax 3 build exists)
 nabl-praffrayi                              = { module = "org.metaborg.devenv:p_raffrayi",                              version.ref = "nabl" }
 nabl-renaming-java                          = { module = "org.metaborg.devenv:renaming.java",                           version.ref = "nabl" }
 nabl-scopegraph                             = { module = "org.metaborg.devenv:scopegraph",                              version.ref = "nabl" }
@@ -292,7 +293,7 @@ statix-generator                            = { module = "org.metaborg.devenv:st
 statix-lang                                 = { module = "org.metaborg.devenv:statix.lang",                             version.ref = "nabl" }
 statix-runtime                              = { module = "org.metaborg.devenv:statix.runtime",                          version.ref = "nabl" }
 statix-solver                               = { module = "org.metaborg.devenv:statix.solver",                           version.ref = "nabl" }
-ts-lang                                     = { module = "org.metaborg:org.metaborg.meta.lang.ts",                      version.ref = "spoofax2" }  # Only spoofax 2 build
+spoofax2-ts-lang                            = { module = "org.metaborg:org.metaborg.meta.lang.ts",                      version.ref = "spoofax2" }  # Use Spoofax 2 language for bootstrapping (no Spoofax 3 build exists)
 
 # Runtime Libraries (https://github.com/metaborg/runtime-libraries)
 meta-lib-analysis                           = { module = "org.metaborg:org.metaborg.meta.lib.analysis",                 version.ref = "spoofax2" }  # Only spoofax 2 build
@@ -304,6 +305,7 @@ sdf2parenthesize                            = { module = "org.metaborg.devenv:sd
 sdf2table                                   = { module = "org.metaborg.devenv:sdf2table",                               version.ref = "sdf" }
 sdf3-extstatix                              = { module = "org.metaborg.devenv:sdf3.ext.statix",                         version.ref = "sdf" }
 sdf3-lang                                   = { module = "org.metaborg.devenv:org.metaborg.meta.lang.template",         version.ref = "sdf" }
+spoofax2-sdf3-lang                          = { module = "org.metaborg:org.metaborg.meta.lang.template",                version.ref = "spoofax2" }  # Use Spoofax 2 language for bootstrapping
 
 # Spoofax Core (https://github.com/metaborg/spoofax)
 metaborg-core                               = { module = "org.metaborg.devenv:org.metaborg.core",                       version.ref = "spoofax-core" }

diff --git a/depman/platform-latest/build.gradle.kts b/depman/platform-latest/build.gradle.kts
@@ -132,6 +132,7 @@ dependencies {
 
         // ESV (https://github.com/metaborg/esv)
         api(libs.esv.lang) { version { require("latest.release") } }
+        api(libs.spoofax2.esv.lang) { version { require("latest.release") } }
 
         // Flowspec (https://github.com/metaborg/flowspec)
         api(libs.flowspec.runtime) { version { require("latest.release") } }
@@ -155,7 +156,7 @@ dependencies {
         api(libs.spoofax.terms) { version { require("latest.release") } }
 
         // NaBL (https://github.com/metaborg/nabl)
-        api(libs.nabl.lang) { version { require("latest.release") } }
+        api(libs.spoofax2.nabl.lang) { version { require("latest.release") } }
         api(libs.nabl.praffrayi) { version { require("latest.release") } }
         api(libs.nabl.renaming.java) { version { require("latest.release") } }
         api(libs.nabl.scopegraph) { version { require("latest.release") } }
@@ -168,7 +169,7 @@ dependencies {
         api(libs.statix.lang) { version { require("latest.release") } }
         api(libs.statix.runtime) { version { require("latest.release") } }
         api(libs.statix.solver) { version { require("latest.release") } }
-        api(libs.ts.lang) { version { require("latest.release") } }
+        api(libs.spoofax2.ts.lang) { version { require("latest.release") } }
 
         // Runtime Libraries (https://github.com/metaborg/runtime-libraries)
         api(libs.meta.lib.analysis) { version { require("latest.release") } }
@@ -180,6 +181,7 @@ dependencies {
         api(libs.sdf2table) { version { require("latest.release") } }
         api(libs.sdf3.extstatix) { version { require("latest.release") } }
         api(libs.sdf3.lang) { version { require("latest.release") } }
+        api(libs.spoofax2.sdf3.lang) { version { require("latest.release") } }
 
         // Spoofax Core (https://github.com/metaborg/spoofax)
         api(libs.metaborg.core) { version { require("latest.release") } }

diff --git a/depman/platform-snapshot/build.gradle.kts b/depman/platform-snapshot/build.gradle.kts
@@ -132,6 +132,7 @@ dependencies {
 
         // ESV (https://github.com/metaborg/esv)
         api(libs.esv.lang) { version { require("latest.integration") } }
+        api(libs.spoofax2.esv.lang) { version { require("latest.integration") } }
 
         // Flowspec (https://github.com/metaborg/flowspec)
         api(libs.flowspec.runtime) { version { require("latest.integration") } }
@@ -155,7 +156,7 @@ dependencies {
         api(libs.spoofax.terms) { version { require("latest.integration") } }
 
         // NaBL (https://github.com/metaborg/nabl)
-        api(libs.nabl.lang) { version { require("latest.integration") } }
+        api(libs.spoofax2.nabl.lang) { version { require("latest.integration") } }
         api(libs.nabl.praffrayi) { version { require("latest.integration") } }
         api(libs.nabl.renaming.java) { version { require("latest.integration") } }
         api(libs.nabl.scopegraph) { version { require("latest.integration") } }
@@ -168,7 +169,7 @@ dependencies {
         api(libs.statix.lang) { version { require("latest.integration") } }
         api(libs.statix.runtime) { version { require("latest.integration") } }
         api(libs.statix.solver) { version { require("latest.integration") } }
-        api(libs.ts.lang) { version { require("latest.integration") } }
+        api(libs.spoofax2.ts.lang) { version { require("latest.integration") } }
 
         // Runtime Libraries (https://github.com/metaborg/runtime-libraries)
         api(libs.meta.lib.analysis) { version { require("latest.integration") } }
@@ -180,6 +181,7 @@ dependencies {
         api(libs.sdf2table) { version { require("latest.integration") } }
         api(libs.sdf3.extstatix) { version { require("latest.integration") } }
         api(libs.sdf3.lang) { version { require("latest.integration") } }
+        api(libs.spoofax2.sdf3.lang) { version { require("latest.integration") } }
 
         // Spoofax Core (https://github.com/metaborg/spoofax)
         api(libs.metaborg.core) { version { require("latest.integration") } }

diff --git a/depman/platform/build.gradle.kts b/depman/platform/build.gradle.kts
@@ -132,6 +132,7 @@ dependencies {
 
         // ESV (https://github.com/metaborg/esv)
         api(libs.esv.lang)
+        api(libs.spoofax2.esv.lang)
 
         // Flowspec (https://github.com/metaborg/flowspec)
         api(libs.flowspec.runtime)
@@ -155,7 +156,7 @@ dependencies {
         api(libs.spoofax.terms)
 
         // NaBL (https://github.com/metaborg/nabl)
-        api(libs.nabl.lang)
+        api(libs.spoofax2.nabl.lang)
         api(libs.nabl.praffrayi)
         api(libs.nabl.renaming.java)
         api(libs.nabl.scopegraph)
@@ -168,7 +169,7 @@ dependencies {
         api(libs.statix.lang)
         api(libs.statix.runtime)
         api(libs.statix.solver)
-        api(libs.ts.lang)
+        api(libs.spoofax2.ts.lang)
 
         // Runtime Libraries (https://github.com/metaborg/runtime-libraries)
         api(libs.meta.lib.analysis)
@@ -180,6 +181,7 @@ dependencies {
         api(libs.sdf2table)
         api(libs.sdf3.extstatix)
         api(libs.sdf3.lang)
+        api(libs.spoofax2.sdf3.lang)
 
         // Spoofax Core (https://github.com/metaborg/spoofax)
         api(libs.metaborg.core)

diff --git a/example/java-example/build.gradle.kts b/example/java-example/build.gradle.kts
@@ -156,6 +156,7 @@ dependencies {
 
     // ESV (https://github.com/metaborg/esv)
 //    api(libs.esv.lang)                                // TODO: spoofax-language component
+//    api(libs.spoofax2.esv.lang)                       // TODO: spoofax-language component
 
     // Flowspec (https://github.com/metaborg/flowspec)
     api(libs.flowspec.runtime)
@@ -179,7 +180,7 @@ dependencies {
     api(libs.spoofax.terms)
 
     // NaBL (https://github.com/metaborg/nabl)
-    api(libs.nabl.lang)
+//    api(libs.spoofax2.nabl.lang)                      // TODO: spoofax-language component
     api(libs.nabl.praffrayi)
     api(libs.nabl.renaming.java)
     api(libs.nabl.scopegraph)
@@ -192,7 +193,7 @@ dependencies {
 //    api(libs.statix.lang)                             // TODO: spoofax-language component
 //    api(libs.statix.runtime)                          // TODO: spoofax-language component
     api(libs.statix.solver)
-    api(libs.ts.lang)
+//    api(libs.spoofax2.ts.lang)                        // TODO: spoofax-language component
 
     // Runtime Libraries (https://github.com/metaborg/runtime-libraries)
     api(libs.meta.lib.analysis)
@@ -204,6 +205,7 @@ dependencies {
     api(libs.sdf2table)
 //    api(libs.sdf3.extstatix)                          // TODO: spoofax-language component
 //    api(libs.sdf3.lang)                               // TODO: spoofax-language component
+//    api(libs.spoofax2.sdf3.lang)                      // TODO: spoofax-language component
 
     // Spoofax Core (https://github.com/metaborg/spoofax)
     api(libs.metaborg.core)