Merge branch 'maintenance/mps20232' into bugfix/less_strict_unit_comparison_extension

Author: wsafonov

build.gradle

@@ -116,7 +116,6 @@ ext.publishingRepository = version.toString().endsWith("-SNAPSHOT") ? snapshotRe
 
 // 'artifacts' is used in the generated ant scripts as build output directory
 ext.artifactsDir = new File(buildDir, 'artifacts')
-ext.incrementalBuild = !project.hasProperty("disableIncrementalBuild")
 
 
 wrapper {
@@ -197,8 +196,8 @@ task resolveDependencies(dependsOn: ['downloadJbr', resolveMps, resolveLanguageL
 def defaultScriptArgs = [
         'mps.home'                          : resolveMps.destinationDir,
         'iets3.github.opensource.home'      : rootDir,
+        'build.jna.library.path'            : new File(resolveMps.destinationDir, "lib/jna/${System.getProperty('os.arch')}"),
         'build.dir'                         : buildDir,
-        'mps.generator.skipUnmodifiedModels': incrementalBuild,
         'version'                           : version
 ]
 if (gradle.startParameter.logLevel.toString() != "LIFECYCLE") {
@@ -232,7 +231,7 @@ task buildAndRunTests(type: TestLanguages, dependsOn: buildLanguages) {
                 classname: 'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator',
                 classpath: configurations.junitAnt.asPath)
         ant.junitreport {
-            fileset(dir: "$buildDir", includes: '**/TEST*.xml')
+            fileset(dir: "$buildDir", includes: '**/TEST*.xml', excludes: 'tmp/**')
             report(format: 'frames', todir: "$buildDir/junitreport")
         }
         ant.echo("JUnit report placed into $buildDir/junitreport/index.html")
@@ -521,4 +520,4 @@ cyclonedxBom {
 
 assemble {
     dependsOn('cyclonedxBom')
-}
+}

code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/behavior.mps

@@ -683,7 +683,7 @@
         <node concept="3clFbF" id="7QODtLvTGsE" role="3cqZAp">
           <node concept="2YIFZM" id="7QODtLvTGNW" role="3clFbG">
             <ref role="1Pybhc" to="hnhi:2f_Mi5mAhjh" resolve="AsyncSolverTaskExecutor" />
-            <ref role="37wK5l" to="hnhi:1VsTyb1NCF5" resolve="submitISolvable" />
+            <ref role="37wK5l" to="hnhi:3hn7H_$lmns" resolve="submitISolvable" />
             <node concept="13iPFW" id="7QODtLvTGNX" role="37wK5m" />
             <node concept="2OqwBi" id="5BRQP3RmK2b" role="37wK5m">
               <node concept="Rm8GO" id="5BRQP3RmJB5" role="2Oq$k0">
@@ -697,9 +697,6 @@
             <node concept="3clFbT" id="cwnBfE0FNP" role="37wK5m">
               <property role="3clFbU" value="true" />
             </node>
-            <node concept="BsUDl" id="6pPfAzJBwWi" role="37wK5m">
-              <ref role="37wK5l" node="6pPfAzJBwWe" resolve="makeExecEnv" />
-            </node>
           </node>
         </node>
       </node>
@@ -1388,28 +1385,22 @@
       <node concept="3Tm1VV" id="3NwcubmnBQ6" role="1B3o_S" />
       <node concept="3clFbS" id="3NwcubmnBQ8" role="3clF47">
         <node concept="3clFbF" id="3NwcubmnCHl" role="3cqZAp">
-          <node concept="2YIFZM" id="3NwcubmnCYw" role="3clFbG">
+          <node concept="2YIFZM" id="_TaQix4Zs1" role="3clFbG">
+            <ref role="37wK5l" to="hnhi:3hn7H_$lmns" resolve="submitISolvable" />
             <ref role="1Pybhc" to="hnhi:2f_Mi5mAhjh" resolve="AsyncSolverTaskExecutor" />
-            <ref role="37wK5l" to="hnhi:1VsTyb1NCF5" resolve="submitISolvable" />
-            <node concept="13iPFW" id="3NwcubmnCYx" role="37wK5m" />
-            <node concept="2OqwBi" id="5BRQP3RmKWY" role="37wK5m">
-              <node concept="Rm8GO" id="5BRQP3RmKWZ" role="2Oq$k0">
+            <node concept="13iPFW" id="_TaQix4Zs2" role="37wK5m" />
+            <node concept="2OqwBi" id="_TaQix4Zs3" role="37wK5m">
+              <node concept="Rm8GO" id="_TaQix4Zs4" role="2Oq$k0">
                 <ref role="Rm8GQ" to="dzyv:~ChronoUnit.FOREVER" resolve="FOREVER" />
                 <ref role="1Px2BO" to="dzyv:~ChronoUnit" resolve="ChronoUnit" />
               </node>
-              <node concept="liA8E" id="5BRQP3RmKX0" role="2OqNvi">
+              <node concept="liA8E" id="_TaQix4Zs5" role="2OqNvi">
                 <ref role="37wK5l" to="dzyv:~ChronoUnit.getDuration()" resolve="getDuration" />
               </node>
             </node>
-            <node concept="3clFbT" id="cwnBfE0G29" role="37wK5m">
+            <node concept="3clFbT" id="_TaQix4Zs6" role="37wK5m">
               <property role="3clFbU" value="true" />
             </node>
-            <node concept="2OqwBi" id="6pPfAzJBz3$" role="37wK5m">
-              <node concept="13iPFW" id="6pPfAzJByF4" role="2Oq$k0" />
-              <node concept="2qgKlT" id="6pPfAzJBzBq" role="2OqNvi">
-                <ref role="37wK5l" node="6pPfAzJBwWe" resolve="makeExecEnv" />
-              </node>
-            </node>
           </node>
         </node>
       </node>