Merge branch '2022.3' into 2023.2

build/tests/mpsActions.xml

@@ -333,14 +333,15 @@
   <target name="test.actions" depends="assemble">
     <path location="${build.layout}/jetbrains.mps.lang.plugin.tests.jar" id="mps.tests.path" />
     <pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">      
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx2048m" />
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
 
 

build/tests/mpsBaseLanguage.xml

@@ -1948,14 +1948,15 @@
       <pathelement location="${build.layout}/collections_trove.test.jar" />
     </path>
     <pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <launchtests fork="true" haltonfailure="${mps.junit.haltonfailure}" mpshome="${artifacts.mps}" reports="${build.tmp}">      
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx2048m" />
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
 
 

build/tests/mpsBehavior.xml

@@ -1278,14 +1278,15 @@
       <pathelement location="${build.layout}/behavior-tests/test.behavior.plugin/languages/reflectiveTest/TestBehaviorReflective.jar" />
     </path>
     <pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">      
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx2048m" />
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
 
 

build/tests/mpsBuild.xml

@@ -478,14 +478,15 @@
       <pathelement location="${build.layout}/runner.test/jetbrains.mps.build.mps.runner.test.jar" />
     </path>
     <pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">      
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx2048m" />
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
 
 

build/tests/mpsConsole.xml

@@ -423,14 +423,15 @@
   <target name="test.console" depends="assemble">
     <path location="${build.layout}/tests/jetbrains.mps.console.tests.jar" id="mps.tests.path" />
     <pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">      
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx2048m" />
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
 
 

build/tests/mpsConstraints.xml

@@ -948,14 +948,15 @@
       <pathelement location="${build.layout}/solutions/TestRulesConstraints.jar" />
     </path>
     <pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">      
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx2048m" />
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
 
 

build/tests/mpsDataFlow.xml

@@ -757,14 +757,15 @@
   <target name="test.dataFlow" depends="assemble">
     <path location="${build.layout}/solutions/analyzers.test.jar" id="mps.tests.path" />
     <pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">      
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx2048m" />
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
 
 

build/tests/mpsEditor.xml

@@ -3320,6 +3320,7 @@
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.editor.forms.tests.jar" />
     </path>
     <pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mpsBootstrapCore}" reports="${build.tmp}">      
       <jvmargs>
         <arg value="-ea" />
@@ -3328,7 +3329,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
 
 

build/tests/mpsEditorDiagram.xml

@@ -701,14 +701,15 @@
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.editor.diagram.testLanguage.jar" />
     </path>
     <pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">      
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx2048m" />
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
 
 

build/tests/mpsEditorImageGen.xml

@@ -623,14 +623,15 @@
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.editor.imageGen.tests.jar" />
     </path>
     <pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">      
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx2048m" />
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
 
 

build/tests/mpsEditorTransformationMenu.xml

@@ -3166,14 +3166,15 @@
       <pathelement location="${build.layout}/tests/jetbrains.mps.editor.contextActionsTool.tests.jar" />
     </path>
     <pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">      
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx2048m" />
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
 
 

build/tests/mpsExecution.xml

@@ -1008,14 +1008,15 @@
       <pathelement location="${build.layout}/jetbrains.mps.debugger.java.runtime.tests.jar" />
     </path>
     <pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">      
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx2048m" />
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
 
 

build/tests/mpsFeedback.xml

@@ -532,14 +532,15 @@
   <target name="test.feedback" depends="assemble">
     <path location="${build.layout}/solutions/messages.sandbox.jar" id="mps.tests.path" />
     <pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">      
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx2048m" />
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
 
 

build/tests/mpsGenerator.xml

@@ -3084,14 +3084,15 @@
       <pathelement location="${build.layout}/xmodel-tests/jetbrains.mps.generator.xmodel.build.test.jar" />
     </path>
     <pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">      
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx2048m" />
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
 
 

build/tests/mpsHttpSupport.xml

@@ -412,14 +412,15 @@
   <target name="test.http-support" depends="assemble">
     <path location="${build.layout}/jetbrains.mps.ide.httpsupport.tests.jar" id="mps.tests.path" />
     <pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">      
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx2048m" />
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
 
 

build/tests/mpsImplementationStripping.xml

@@ -747,14 +747,15 @@
       <pathelement location="${build.layout}/tests/jetbrains.mps.samples.JavaKaja.jar" />
     </path>
     <pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">      
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx2048m" />
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
 
 

build/tests/mpsJava.xml

@@ -429,14 +429,15 @@
       <pathelement location="${build.layout}/jetbrains.mps.ide.java.testMaterial.jar" />
     </path>
     <pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">      
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx2048m" />
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
 
 

build/tests/mpsKotlin.xml

@@ -504,14 +504,15 @@
       <pathelement location="${build.layout}/jetbrains.mps.kotlin.tests.editor.jar" />
     </path>
     <pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">      
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx2048m" />
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
 
 

build/tests/mpsPackaged.xml

@@ -539,14 +539,15 @@
       <pathelement location="${build.layout}/testPackagedLanguage.test.jar" />
     </path>
     <pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">      
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx2048m" />
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
 
 

build/tests/mpsSModel.xml

@@ -904,14 +904,15 @@
       <pathelement location="${build.layout}/jetbrains.mps.lang.quotation.test.jar" />
     </path>
     <pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">      
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx2048m" />
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
 
 

build/tests/mpsSmartRefAttrMigration_gen.xml

@@ -332,14 +332,15 @@
   <target name="test.sraMigration" depends="assemble">
     <path location="${build.layout}/jetbrains.mps.tests.sraMigration.jar" id="mps.tests.path" />
     <pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">      
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx2048m" />
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
 
 

build/tests/mpsTest.xml

@@ -2309,14 +2309,15 @@
       <pathelement location="${build.layout}/jetbrains.mps.transformation.test.inputModels.jar" />
     </path>
     <pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">      
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx2048m" />
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
 
 

build/tests/mpsTestModules.xml

@@ -1312,6 +1312,7 @@
       <pathelement location="${build.layout}/tests/testModelRenaming.jar" />
     </path>
     <pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
+    <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
     <launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">      
       <jvmargs>
         <arg value="-ea" />
@@ -1320,7 +1321,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>