Skip to content

Commit 0ccd05c

Browse files
enikaoenikao
committed
updated build models
1 parent d00a5b7 commit 0ccd05c

File tree

3 files changed

+1
-100
lines changed
  • build/scripts
  • code/languages/org.iets3.opensource/solutions
    • org.iets3.opensource.allScripts.build/models/org/iets3/opensource/allScripts/build
    • org.iets3.opensource.build/models/org/iets3/opensource/build

3 files changed

+1
-100
lines changed

‎build/scripts/build-allScripts.xml‎

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
<module ref="3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)" kind="cl" />
6060
<module ref="f1fb7b1c-ce0d-423c-9369-4a661d600029(de.itemis.mps.extensions.build)" kind="cl" />
6161
<module ref="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" kind="cl" />
62-
<module ref="9d000fbd-bdca-4a46-b39b-c5ba9e79b38c(org.iets3.opensource.build.gentests)" kind="cl" />
6362
</dependencies>
6463
<uses>
6564
<language id="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" />
@@ -273,7 +272,7 @@
273272

274273
<target name="makeDependents" />
275274

276-
<target name="java.compile.org.iets3.opensource.build" depends="java.compile.org.iets3.opensource.build.gentests, java.compile.org.iets3.opensource.build.gentests.rt, fetchDependencies">
275+
<target name="java.compile.org.iets3.opensource.build" depends="java.compile.org.iets3.opensource.build.gentests.rt, fetchDependencies">
277276
<mkdir dir="${iets3.lang.opensource}/solutions/org.iets3.opensource.build/source_gen" />
278277
<mkdir dir="${build.tmp}/java/out/org.iets3.opensource.build" />
279278
<javac destdir="${build.tmp}/java/out/org.iets3.opensource.build" fork="false" encoding="utf8" includeantruntime="false" debug="true">
@@ -282,54 +281,11 @@
282281
<path location="${iets3.lang.opensource}/solutions/org.iets3.opensource.build/source_gen" />
283282
</src>
284283
<classpath>
285-
<fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
286-
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
287-
<fileset file="${artifacts.mps}/lib/mps-context.jar" />
288-
<fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
289-
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
290-
<fileset file="${artifacts.mps}/lib/mps-problem.jar" />
291-
<fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
292-
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
293-
<fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
294-
<fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
295-
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
296-
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
297-
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
298-
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
299-
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
300284
<fileset file="${artifacts.mps}/lib/mps-references.jar" />
301-
<fileset file="${artifacts.mps}/lib/mps-editor.jar" />
302-
<fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
303-
<fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
304-
<fileset file="${artifacts.mps}/lib/mps-generator.jar" />
305-
<fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
306-
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
307-
<fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
308-
<pathelement path="${build.tmp}/java/out/org.iets3.opensource.build.gentests" />
309285
<pathelement path="${build.tmp}/java/out/org.iets3.opensource.build.gentests.rt" />
310286
<fileset file="${iets3.lang.opensource}/solutions/org.iets3.opensource.build.gentests.rt/lib/takari-cpsuite-1.2.7.jar" />
311-
<fileset file="${artifacts.mps}/lib/annotations.jar" />
312-
<fileset file="${artifacts.mps}/lib/app.jar" />
313-
<fileset file="${artifacts.mps}/lib/app-client.jar" />
314-
<fileset file="${artifacts.mps}/lib/lib.jar" />
315-
<fileset file="${artifacts.mps}/lib/lib-client.jar" />
316-
<fileset file="${artifacts.mps}/lib/util.jar" />
317-
<fileset file="${artifacts.mps}/lib/util_rt.jar" />
318-
<fileset file="${artifacts.mps}/lib/util-8.jar" />
319-
<fileset file="${artifacts.mps}/lib/forms_rt.jar" />
320-
<fileset file="${artifacts.mps}/lib/java-impl.jar" />
321-
<fileset file="${artifacts.mps}/lib/jps-model.jar" />
322-
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
323-
<fileset file="${artifacts.mps}/lib/stats.jar" />
324-
<fileset file="${artifacts.mps}/lib/platform-loader.jar" />
325287
<fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.platform.jar" />
326288
<fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.extensions.build/languages/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.jar" />
327-
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.jar" />
328-
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.mps.runner.jar" />
329-
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.workflow.jar" />
330-
<fileset file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
331-
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
332-
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
333289
</classpath>
334290
</javac>
335291
<copy todir="${build.tmp}/java/out/org.iets3.opensource.build">

‎code/languages/org.iets3.opensource/solutions/org.iets3.opensource.allScripts.build/models/org/iets3/opensource/allScripts/build/build.mps‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -226,11 +226,6 @@
226226
</node>
227227
</node>
228228
</node>
229-
<node concept="1SiIV0" id="4u2ErA3vypv" role="3bR37C">
230-
<node concept="3bR9La" id="4u2ErA3vypw" role="1SiIV1">
231-
<ref role="3bR37D" node="3ZBI8Aw30tK" resolve="org.iets3.opensource.build.gentests" />
232-
</node>
233-
</node>
234229
</node>
235230
<node concept="1E1JtD" id="3ZBI8Aw30tK" role="2G$12L">
236231
<property role="BnDLt" value="true" />

‎code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps‎

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1155,16 +1155,6 @@
11551155
<ref role="3bR37D" to="90a9:PE3B26QCrP" resolve="org.apache.commons" />
11561156
</node>
11571157
</node>
1158-
<node concept="1SiIV0" id="4S8_EwSQeGW" role="3bR37C">
1159-
<node concept="3bR9La" id="4S8_EwSQeGX" role="1SiIV1">
1160-
<ref role="3bR37D" to="ffeo:71aLKqdKvPp" resolve="jetbrains.mps.ide.make" />
1161-
</node>
1162-
</node>
1163-
<node concept="1SiIV0" id="4S8_EwSQeGY" role="3bR37C">
1164-
<node concept="3bR9La" id="4S8_EwSQeGZ" role="1SiIV1">
1165-
<ref role="3bR37D" to="ffeo:7Kfy9QB6LgV" resolve="jetbrains.mps.make.runtime" />
1166-
</node>
1167-
</node>
11681158
</node>
11691159
</node>
11701160
<node concept="2G$12M" id="5wLtKNeSWz5" role="3989C9">
@@ -3071,11 +3061,6 @@
30713061
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
30723062
</node>
30733063
</node>
3074-
<node concept="1SiIV0" id="2utoDiy1jRE" role="3bR37C">
3075-
<node concept="3bR9La" id="2utoDiy1jRF" role="1SiIV1">
3076-
<ref role="3bR37D" to="ffeo:ymnOULAU1u" resolve="jetbrains.mps.lang.test.runtime" />
3077-
</node>
3078-
</node>
30793064
<node concept="1BupzO" id="2utoDiy1jRR" role="3bR31x">
30803065
<property role="3ZfqAx" value="models" />
30813066
<property role="1Hdu6h" value="true" />
@@ -4650,11 +4635,6 @@
46504635
<ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
46514636
</node>
46524637
</node>
4653-
<node concept="1SiIV0" id="1mXB1PNHK4M" role="3bR37C">
4654-
<node concept="3bR9La" id="1mXB1PNHK4N" role="1SiIV1">
4655-
<ref role="3bR37D" to="ffeo:1TaHNgiIbJt" resolve="jetbrains.mps.ide.platform" />
4656-
</node>
4657-
</node>
46584638
<node concept="1SiIV0" id="1mXB1PNHK4O" role="3bR37C">
46594639
<node concept="3bR9La" id="1mXB1PNHK4P" role="1SiIV1">
46604640
<ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
@@ -7778,11 +7758,6 @@
77787758
<ref role="3bR37D" to="ffeo:44LXwdzyvTi" resolve="Annotations" />
77797759
</node>
77807760
</node>
7781-
<node concept="1SiIV0" id="7PpEEHv1E$q" role="3bR37C">
7782-
<node concept="3bR9La" id="7PpEEHv1E$r" role="1SiIV1">
7783-
<ref role="3bR37D" to="ffeo:7oVDYnclR8f" resolve="io.netty" />
7784-
</node>
7785-
</node>
77867761
<node concept="1SiIV0" id="jqB9Ud$EY1" role="3bR37C">
77877762
<node concept="3bR9La" id="jqB9Ud$EY2" role="1SiIV1">
77887763
<ref role="3bR37D" to="ffeo:3MI1gu0QouH" resolve="jetbrains.mps.editor.runtime" />
@@ -7793,11 +7768,6 @@
77937768
<ref role="3bR37D" to="ffeo:3qkjbZn808a" resolve="jetbrains.mps.lang.constraints.rules.runtime" />
77947769
</node>
77957770
</node>
7796-
<node concept="1SiIV0" id="6cBhYjwIHaU" role="3bR37C">
7797-
<node concept="3bR9La" id="6cBhYjwIHaV" role="1SiIV1">
7798-
<ref role="3bR37D" to="ffeo:7Kfy9QB6Lg8" resolve="jetbrains.mps.runtime" />
7799-
</node>
7800-
</node>
78017771
</node>
78027772
<node concept="1E1JtA" id="44TucI396gt" role="2G$12L">
78037773
<property role="BnDLt" value="true" />
@@ -15279,11 +15249,6 @@
1527915249
<ref role="3bR37D" to="ffeo:44LXwdzyvTi" resolve="Annotations" />
1528015250
</node>
1528115251
</node>
15282-
<node concept="1SiIV0" id="7PpEEHv1EKb" role="3bR37C">
15283-
<node concept="3bR9La" id="7PpEEHv1EKc" role="1SiIV1">
15284-
<ref role="3bR37D" to="ffeo:7oVDYnclR8f" resolve="io.netty" />
15285-
</node>
15286-
</node>
1528715252
<node concept="1SiIV0" id="jqB9Ud_e3K" role="3bR37C">
1528815253
<node concept="3bR9La" id="jqB9Ud_e3L" role="1SiIV1">
1528915254
<ref role="3bR37D" to="ffeo:3MI1gu0QouH" resolve="jetbrains.mps.editor.runtime" />
@@ -15294,11 +15259,6 @@
1529415259
<ref role="3bR37D" to="ffeo:3qkjbZn808a" resolve="jetbrains.mps.lang.constraints.rules.runtime" />
1529515260
</node>
1529615261
</node>
15297-
<node concept="1SiIV0" id="6cBhYjwIGXF" role="3bR37C">
15298-
<node concept="3bR9La" id="6cBhYjwIGXG" role="1SiIV1">
15299-
<ref role="3bR37D" to="ffeo:7Kfy9QB6Lg8" resolve="jetbrains.mps.runtime" />
15300-
</node>
15301-
</node>
1530215262
</node>
1530315263
<node concept="2sgV4H" id="1YwzPHwBxon" role="1l3spa">
1530415264
<ref role="1l3spb" to="ffeo:3IKDaVZmzS6" resolve="mps" />
@@ -15571,11 +15531,6 @@
1557115531
<ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
1557215532
</node>
1557315533
</node>
15574-
<node concept="1SiIV0" id="5jJR9m7XAS_" role="3bR37C">
15575-
<node concept="3bR9La" id="5jJR9m7XASA" role="1SiIV1">
15576-
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
15577-
</node>
15578-
</node>
1557915534
<node concept="1SiIV0" id="5jJR9m7XASB" role="3bR37C">
1558015535
<node concept="3bR9La" id="5jJR9m7XASC" role="1SiIV1">
1558115536
<ref role="3bR37D" to="ffeo:5xa9wY2vhbf" resolve="jetbrains.mps.baseLanguage.unitTest.execution" />
@@ -15591,11 +15546,6 @@
1559115546
<ref role="3bR37D" node="2MB0tFbRiNf" resolve="org.iets3.core.junit.interpreter.run.configuration" />
1559215547
</node>
1559315548
</node>
15594-
<node concept="1SiIV0" id="5jJR9m7XASH" role="3bR37C">
15595-
<node concept="3bR9La" id="5jJR9m7XASI" role="1SiIV1">
15596-
<ref role="3bR37D" node="ub9nkyRnyj" resolve="org.iets3.core.expr.tests" />
15597-
</node>
15598-
</node>
1559915549
<node concept="1BupzO" id="5jJR9m7XAT3" role="3bR31x">
1560015550
<property role="3ZfqAx" value="models" />
1560115551
<property role="1Hdu6h" value="true" />

0 commit comments

Comments
 (0)