fix up test-project

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

Hide file tree

Showing 4 changed files with 41 additions and 2 deletions.
diff --git a/build.xml b/build.xml
@@ -2867,6 +2867,43 @@
       <zipfileset file="${lionweb-mps.home}/solutions/io.lionweb.mps.json.test.support/io.lionweb.mps.json.test.support.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-io.lionweb.mps.json.test.support-models" prefix="module/models" />
     </jar>
+    <mkdir dir="${build.tmp}/default/io.lionweb.mps.build.jar" />
+    <mkdir dir="${build.tmp}/default/io.lionweb.mps.build.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/io.lionweb.mps.build.jar/META-INF/module.xml">
+      <module namespace="io.lionweb.mps.build" type="solution" uuid="bf3c8943-8801-4969-9ac2-7403444bbefa">
+        <dependencies>
+          <module ref="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" kind="cl" />
+        </dependencies>
+        <uses>
+          <language id="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" />
+          <language id="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" />
+          <language id="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" />
+          <language id="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" />
+        </uses>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="io.lionweb.mps.build-src.jar" descriptor="io.lionweb.mps.build.msd" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/io.lionweb.mps.build.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/io.lionweb.mps.build" />
+      <fileset dir="${lionweb-mps.home}/solutions/io.lionweb.mps.build/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/io.lionweb.mps.build.jar" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/solutions-io.lionweb.mps.build-models">
+      <fileset dir="${lionweb-mps.home}/solutions/io.lionweb.mps.build/models" includes="**/*.mps, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.layout}/io.lionweb.mps.build-src.jar" duplicate="preserve">
+      <fileset dir="${lionweb-mps.home}/solutions/io.lionweb.mps.build/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${basedir}/solutions/io.lionweb.mps.build/io.lionweb.mps.build.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-io.lionweb.mps.build-models" prefix="module/models" />
+    </jar>
     <mkdir dir="${build.tmp}/default/io.lionweb.mps.lang.test.jar" />
     <mkdir dir="${build.tmp}/default/io.lionweb.mps.lang.test.jar/META-INF" />
     <echoxml file="${build.tmp}/default/io.lionweb.mps.lang.test.jar/META-INF/module.xml">

diff --git a/test-project/.mps/modules.xml b/test-project/.mps/modules.xml
@@ -4,8 +4,8 @@
     <projectModules>
       <modulePath path="$PROJECT_DIR$/languages/FooLanguage/FooLanguage.mpl" folder="" />
       <modulePath path="$PROJECT_DIR$/solutions/test-project.build/test-project.build.msd" folder="" />
-      <modulePath path="$PROJECT_DIR$/../languages/MultiRefLang/MultiRefLang.mpl" folder="" />
-      <modulePath path="$PROJECT_DIR$/../languages/library/library.mpl" folder="" />
+      <modulePath path="${lionweb-mps.home}/languages/MultiRefLang/MultiRefLang.mpl" folder="" />
+      <modulePath path="${lionweb-mps.home}/languages/library/library.mpl" folder="" />
     </projectModules>
   </component>
 </project>
diff --git a/test-project/languages/FooLanguage/FooLanguage.mpl b/test-project/languages/FooLanguage/FooLanguage.mpl
@@ -25,6 +25,7 @@
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="18" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />

diff --git a/test-project/languages/FooLanguage/models/FooLanguage.structure.mps b/test-project/languages/FooLanguage/models/FooLanguage.structure.mps
@@ -4,6 +4,7 @@
   <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="-1" />
+    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />