working build for test-project and test-project-externalLib

LionWeb-io · Oct 24, 2024 · 230ef54 · 230ef54
1 parent 2b51c38
commit 230ef54
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 19 deletions.
diff --git a/test-project-externalLib/.mps/libraries.xml b/test-project-externalLib/.mps/libraries.xml
@@ -6,19 +6,11 @@
         <entry key="LionWeb">
           <value>
             <Library>
-              <option name="name" value="LionWeb" />
+              <option name="name" value="lionweb-mps.home" />
               <option name="path" value="$PROJECT_DIR$/build/dependencies/io.lionweb.mps" />
             </Library>
           </value>
         </entry>
-        <entry key="foo">
-          <value>
-            <Library>
-              <option name="name" value="foo" />
-              <option name="path" value="${lionweb-mps.home}/test-project/languages/FooLanguage" />
-            </Library>
-          </value>
-        </entry>
         <entry key="mpsExtensions">
           <value>
             <Library>

diff --git a/test-project-externalLib/build.gradle.kts b/test-project-externalLib/build.gradle.kts
@@ -23,6 +23,11 @@ dependencies {
     "generation"("de.itemis.mps:extensions:$mpsExtensionsVersion")
 }
 
+tasks.assembleMps {
+    antProperties.putAll(antProperties.get())
+    antProperties.put("mps-extensions.home", "${projectDir.resolve("build/dependencies/de.itemis.mps.extensions")}")
+}
+
 task<JavaExec>("runCommandLineTool") {
     dependsOn("resolveGenerationDependencies")
 

diff --git a/...-externalLib/languages/DependsOnMpsExtensions/models/DependsOnMpsExtensions.structure.mps b/...-externalLib/languages/DependsOnMpsExtensions/models/DependsOnMpsExtensions.structure.mps
@@ -2,7 +2,6 @@
 <model ref="r:e52b8b75-35b6-4648-b807-f16807d24461(DependsOnMpsExtensions.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
     <use id="411e5b27-8a76-482e-8af8-1704262b4468" name="io.lionweb.mps.structure.attribute" version="0" />
     <use id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext" version="0" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />

diff --git a/test-project/build.gradle.kts b/test-project/build.gradle.kts
@@ -21,6 +21,10 @@ dependencies {
     "generation"("io.lionweb.lionweb-mps:lionweb-mps-$mpsVersionSuffix-lw$lionwebRelease:$lionwebVersion")
 }
 
+tasks.generateBuildscript {
+    args("--macro=lionweb-mps.home::${projectDir.parent}")
+}
+
 task<JavaExec>("runCommandLineTool") {
     dependsOn("resolveGenerationDependencies")
 

diff --git a/test-project/build.xml b/test-project/build.xml
@@ -4,10 +4,10 @@
   <property name="build.tmp" location="${build.dir}/tmp/test-project" />
   <property name="build.layout" location="${build.dir}/artifacts/test-project" />
   <property name="mps_home" location="" />
-  <property name="lionweb.mps.home" location="${basedir}/build/dependencies/io.lionweb.mps" />
-  <property name="mps.macro.lionweb.mps.home" location="${lionweb.mps.home}" />
+  <property name="lionweb-mps.home" location="${basedir}/build/dependencies/io.lionweb.mps" />
+  <property name="mps.macro.lionweb-mps.home" location="${lionweb-mps.home}" />
   <property name="artifacts.mps" location="${mps_home}" />
-  <property name="artifacts.io.lionweb.mps" location="${lionweb.mps.home}" />
+  <property name="artifacts.io.lionweb.mps" location="${lionweb-mps.home}" />
   <property file="${artifacts.mps}/build.properties" prefix="import.mps" />
   <property file="${artifacts.io.lionweb.mps}/build.properties" prefix="import.io.lionweb.mps" />
   <property name="mps.build.number" value="${import.mps.mps.build.number}" />
@@ -82,6 +82,7 @@
           <language id="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" />
           <language id="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" />
           <language id="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" />
+          <language id="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" />
           <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
           <language id="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" />
           <language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
@@ -163,6 +164,7 @@
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.runtime.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
+      <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.structure.jar" />
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.general-purpose.jar" />
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-descriptor.jar" />
       <library file="${artifacts.mps}/languages/editor/jetbrains.mps.editor.runtime.jar" />
@@ -238,8 +240,8 @@
         <arg value="-Xmx4096m" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
-      <macro name="lionweb.mps.home" path="${lionweb.mps.home}" />
-      <macro name="mps.macro.lionweb.mps.home" path="${mps.macro.lionweb.mps.home}" />
+      <macro name="lionweb-mps.home" path="${lionweb-mps.home}" />
+      <macro name="mps.macro.lionweb-mps.home" path="${mps.macro.lionweb-mps.home}" />
     </generate>
   </target>
 

diff --git a/test-project/solutions/test-project.build/models/test-project.build.mps b/test-project/solutions/test-project.build/models/test-project.build.mps
@@ -133,7 +133,7 @@
       <property role="TrG5h" value="mps_home" />
     </node>
     <node concept="398rNT" id="3Dlb8T1lioB" role="1l3spd">
-      <property role="TrG5h" value="lionweb.mps.home" />
+      <property role="TrG5h" value="lionweb-mps.home" />
       <node concept="55IIr" id="6LPkCA$48wU" role="398pKh">
         <node concept="2Ry0Ak" id="6LPkCA$4fCO" role="iGT6I">
           <property role="2Ry0Am" value="build" />
@@ -147,9 +147,9 @@
       </node>
     </node>
     <node concept="398rNT" id="6LPkCA$43xi" role="1l3spd">
-      <property role="TrG5h" value="mps.macro.lionweb.mps.home" />
+      <property role="TrG5h" value="mps.macro.lionweb-mps.home" />
       <node concept="398BVA" id="6LPkCA$43xr" role="398pKh">
-        <ref role="398BVh" node="3Dlb8T1lioB" resolve="lionweb.mps.home" />
+        <ref role="398BVh" node="3Dlb8T1lioB" resolve="lionweb-mps.home" />
       </node>
     </node>
     <node concept="2sgV4H" id="3Dlb8T1lio$" role="1l3spa">
@@ -161,7 +161,7 @@
     <node concept="2sgV4H" id="6LPkCA$3GoS" role="1l3spa">
       <ref role="1l3spb" to="e6nc:5wsogBcGDKa" resolve="io.lionweb.mps" />
       <node concept="398BVA" id="6LPkCA$3Gp0" role="2JcizS">
-        <ref role="398BVh" node="3Dlb8T1lioB" resolve="lionweb.mps.home" />
+        <ref role="398BVh" node="3Dlb8T1lioB" resolve="lionweb-mps.home" />
       </node>
     </node>
     <node concept="1l3spV" id="3Dlb8T1lipk" role="1l3spN">