Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use mps.make task for building #893

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Use mps.make task for building #893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
23068a5
Enable MPS make
sergej-koscejev Jul 26, 2024
d708777
org.apache.commons: disable compilation in MPS
sergej-koscejev Jul 26, 2024
2c35b8a
Mark genplans as non-compiled
sergej-koscejev Jul 26, 2024
f2cd9b1
Upgrade MPS to get rid of 'rootNode is null in getOrCreateDebugInfoRo…
sergej-koscejev Jul 26, 2024
8fda93b
wip More adjustments to get things to compile
sergej-koscejev Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ configurations {
dependencies {
// For published releases adjust ext.mpsMajor and ext.mpsMinor above and use this dependency:
// mps "com.jetbrains:mps:$mpsVersion"
mps "com.jetbrains.mps:mps-prerelease:241.18034.10078"
mps "com.jetbrains.mps:mps-prerelease:241.18034.10104"
}

repositories {
Expand Down
2 changes: 1 addition & 1 deletion code/apache-commons/solutions/org.apache.commons/org.apache.commons.msd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</modelRoot>
</models>
<facets>
<facet type="java" compile="mps" classes="mps" ext="yes">
<facet type="java" compile="off" classes="mps" ext="yes" languageLevel="JAVA_8">
<classes generated="true" path="${module}/classes_gen" />
<library location="${module}/lib/commons-math3-3.3/commons-math3-3.3.jar" />
<library location="${module}/lib/commons-csv-1.0/commons-csv-1.0.jar" />
Expand Down
4 changes: 2 additions & 2 deletions code/batik/solutions/de.itemis.stubs.batik.msd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<solution name="de.itemis.stubs.batik" uuid="563a0770-eb88-4f4f-83ed-f708776fc2fe" moduleVersion="0">
<models>
<modelRoot type="java_classes" contentPath="${module}/lib">
<modelRoot contentPath="${module}/lib" type="java_classes">
<sourceRoot location="batik-awt-util.jar" />
<sourceRoot location="batik-constants.jar" />
<sourceRoot location="batik-css.jar" />
Expand All @@ -16,7 +16,7 @@
</modelRoot>
</models>
<facets>
<facet type="java" compile="mps" classes="mps" ext="no">
<facet type="java" compile="off" classes="mps" ext="yes" languageLevel="JAVA_8">
<classes generated="true" path="${module}/classes_gen" />
<library location="${module}/lib/batik-awt-util.jar" />
<library location="${module}/lib/batik-constants.jar" />
Expand Down
18 changes: 16 additions & 2 deletions .../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,9 @@
<concept id="8971171305100238972" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyTargetLanguage" flags="ng" index="Rbm2T">
<reference id="3189788309731922643" name="language" index="1E1Vl2" />
</concept>
<concept id="868032131020265945" name="jetbrains.mps.build.mps.structure.BuildMPSPlugin" flags="ng" index="3b7kt6" />
<concept id="868032131020265945" name="jetbrains.mps.build.mps.structure.BuildMPSPlugin" flags="ng" index="3b7kt6">
<property id="4571516170012626612" name="useMakeTask" index="1DZWs8" />
</concept>
<concept id="5253498789149381388" name="jetbrains.mps.build.mps.structure.BuildMps_Module" flags="ng" index="3bQrTs">
<property id="2928402740576877067" name="javaCode" index="3vZFNd" />
<child id="5253498789149547825" name="sources" index="3bR31x" />
Expand Down Expand Up @@ -668,6 +670,7 @@
<property role="3LESm3" value="b0f8641f-bd77-4421-8425-30d9088a82f7" />
<property role="TrG5h" value="org.apache.commons" />
<property role="aoJFB" value="eYcmk9QOli/sources" />
<property role="3vZFNd" value="3kCd1ud3JDF/none" />
<node concept="398BVA" id="PE3B26QCyu" role="3LF7KH">
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
<node concept="2Ry0Ak" id="PE3B26QCyv" role="iGT6I">
Expand Down Expand Up @@ -10001,6 +10004,8 @@
<property role="BnDLt" value="true" />
<property role="TrG5h" value="de.q60.mps.shadowmodels.genplan" />
<property role="3LESm3" value="f5997610-4d27-40a3-872c-d06cf404755b" />
<property role="3vZFNd" value="3kCd1ud3JDF/none" />
<property role="aoJFB" value="77WRb6jODAF/none" />
<node concept="398BVA" id="1RCZH7X6p$k" role="3LF7KH">
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
<node concept="2Ry0Ak" id="1RCZH7X6pQP" role="iGT6I">
Expand Down Expand Up @@ -12282,6 +12287,8 @@
<property role="BnDLt" value="true" />
<property role="TrG5h" value="de.q60.mps.virtualinterfaces.genplan" />
<property role="3LESm3" value="4c0d9543-a1b0-4384-8a5d-1cb92075413c" />
<property role="3vZFNd" value="3kCd1ud3JDF/none" />
<property role="aoJFB" value="77WRb6jODAF/none" />
<node concept="398BVA" id="4hqUO9aIgA1" role="3LF7KH">
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
<node concept="2Ry0Ak" id="4hqUO9aIgGT" role="iGT6I">
Expand Down Expand Up @@ -12527,6 +12534,8 @@
<node concept="1E1JtA" id="6fQhGuklQWU" role="2G$12L">
<property role="TrG5h" value="de.q60.mps.collections.libs" />
<property role="3LESm3" value="ecfb9949-7433-4db5-85de-0f84d172e4ce" />
<property role="3vZFNd" value="3kCd1ud3JDF/none" />
<property role="aoJFB" value="77WRb6jODAF/none" />
<node concept="398BVA" id="6fQhGuklR81" role="3LF7KH">
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
<node concept="2Ry0Ak" id="42yR2aTbyNG" role="iGT6I">
Expand Down Expand Up @@ -12661,6 +12670,8 @@
<node concept="1E1JtA" id="6bkzxtWPDx1" role="2G$12L">
<property role="TrG5h" value="de.itemis.stubs.batik" />
<property role="3LESm3" value="563a0770-eb88-4f4f-83ed-f708776fc2fe" />
<property role="3vZFNd" value="3kCd1ud3JDF/none" />
<property role="aoJFB" value="77WRb6jODAF/none" />
<node concept="398BVA" id="6bkzxtWPDx2" role="3LF7KH">
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
<node concept="2Ry0Ak" id="6bkzxtWPDx3" role="iGT6I">
Expand Down Expand Up @@ -13339,6 +13350,7 @@
<property role="BnDLt" value="true" />
<property role="TrG5h" value="org.modelix.model.api" />
<property role="3LESm3" value="cc99dce1-49f3-4392-8dbf-e22ca47bd0af" />
<property role="3vZFNd" value="3kCd1ud3JDF/none" />
<node concept="398BVA" id="5U8hsWC70GO" role="3LF7KH">
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
<node concept="2Ry0Ak" id="5U8hsWC71b5" role="iGT6I">
Expand Down Expand Up @@ -15963,7 +15975,9 @@
<property role="3Ej$Sc" value="true" />
</node>
<node concept="10PD9b" id="2Xjt3l56m0W" role="10PD9s" />
<node concept="3b7kt6" id="2Xjt3l56m0X" role="10PD9s" />
<node concept="3b7kt6" id="2Xjt3l56m0X" role="10PD9s">
<property role="1DZWs8" value="true" />
</node>
<node concept="398rNT" id="2Xjt3l56m0Y" role="1l3spd">
<property role="TrG5h" value="mps.home" />
<node concept="55IIr" id="4be$WTb2x9Y" role="398pKh" />
Expand Down
2 changes: 1 addition & 1 deletion code/model-api/org.modelix.model.api/org.modelix.model.api.msd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</modelRoot>
</models>
<facets>
<facet type="java" compile="mps" classes="mps" ext="yes">
<facet type="java" compile="off" classes="mps" ext="no" languageLevel="JAVA_8">
<classes generated="true" path="${module}/classes_gen" />
<library location="${module}/lib/kotlin-logging-jvm.jar" />
<library location="${module}/lib/kotlin-stdlib-common.jar" />
Expand Down
3 changes: 1 addition & 2 deletions code/shadowmodels/solutions/de.q60.mps.collections.libs/de.q60.mps.collections.libs.msd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<solution name="de.q60.mps.collections.libs" uuid="ecfb9949-7433-4db5-85de-0f84d172e4ce" moduleVersion="0">
<models>
<modelRoot contentPath="${module}" type="default" />
<modelRoot contentPath="${module}/lib" type="java_classes">
<sourceRoot location="trove4j-3.0.3.jar" />
<sourceRoot location="vavr-0.9.3.jar" />
Expand All @@ -10,7 +9,7 @@
</modelRoot>
</models>
<facets>
<facet type="java" compile="mps" classes="mps" ext="no">
<facet type="java" compile="off" classes="mps" ext="yes" languageLevel="JAVA_8">
<classes generated="true" path="${module}/classes_gen" />
<library location="${module}/lib/trove4j-3.0.3.jar" />
<library location="${module}/lib/vavr-0.9.3.jar" />
Expand Down
2 changes: 1 addition & 1 deletion ...hadowmodels/solutions/de.q60.mps.shadowmodels.genplan/de.q60.mps.shadowmodels.genplan.msd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</modelRoot>
</models>
<facets>
<facet type="java" compile="mps" classes="mps" ext="no">
<facet type="java" compile="off" classes="mps" ext="no" languageLevel="JAVA_8">
<classes generated="true" path="${module}/classes_gen" />
</facet>
</facets>
Expand Down
2 changes: 1 addition & 1 deletion ...s/solutions/de.q60.mps.virtualinterfaces.genplan/de.q60.mps.virtualinterfaces.genplan.msd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</modelRoot>
</models>
<facets>
<facet type="java" compile="mps" classes="mps" ext="no">
<facet type="java" compile="off" classes="mps" ext="no" languageLevel="JAVA_8">
<classes generated="true" path="${module}/classes_gen" />
</facet>
</facets>
Expand Down