From 878891a23254dd32baa9e0d9a6186bdc36ffd4cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Fri, 9 Aug 2024 17:32:30 +0200 Subject: [PATCH 1/3] Improve isolation of GenerateTask Specify idea.config.path and idea.system.path for generation. If left unspecified, `` task will write under MPS home and this can be problematic in case of multiple builds running from the same MPS home in parallel (or when trying to use MPS home read-only). --- .../mps/build/mps/tests/accessories.mps | 62 -------- .../mps/generator/template/main@generator.mps | 132 ++++++++++++++++-- .../jetbrains/mps/build/mps/accessories.mps | 62 ++++++++ 3 files changed, 184 insertions(+), 72 deletions(-) diff --git a/plugins/mps-build/languages/build.mps.tests/languageAccessories/jetbrains/mps/build/mps/tests/accessories.mps b/plugins/mps-build/languages/build.mps.tests/languageAccessories/jetbrains/mps/build/mps/tests/accessories.mps index 9cb59b7a8ca2..7b399b334fb8 100644 --- a/plugins/mps-build/languages/build.mps.tests/languageAccessories/jetbrains/mps/build/mps/tests/accessories.mps +++ b/plugins/mps-build/languages/build.mps.tests/languageAccessories/jetbrains/mps/build/mps/tests/accessories.mps @@ -25,34 +25,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -62,16 +38,6 @@ - - - - - - - - - - @@ -93,34 +59,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/mps-build/languages/build.mps/generator/template/jetbrains/mps/build/mps/generator/template/main@generator.mps b/plugins/mps-build/languages/build.mps/generator/template/jetbrains/mps/build/mps/generator/template/main@generator.mps index 1857bde80669..9ddc4bb46e72 100644 --- a/plugins/mps-build/languages/build.mps/generator/template/jetbrains/mps/build/mps/generator/template/main@generator.mps +++ b/plugins/mps-build/languages/build.mps/generator/template/jetbrains/mps/build/mps/generator/template/main@generator.mps @@ -9299,16 +9299,6 @@ - - - - - - - - - - @@ -9327,6 +9317,16 @@ + + + + + + + + + + @@ -16546,6 +16546,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -17455,6 +17475,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -18686,6 +18778,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/mps-build/languages/build.mps/util/jetbrains/mps/build/mps/accessories.mps b/plugins/mps-build/languages/build.mps/util/jetbrains/mps/build/mps/accessories.mps index 172ea673b25a..6b9e9888cdd6 100644 --- a/plugins/mps-build/languages/build.mps/util/jetbrains/mps/build/mps/accessories.mps +++ b/plugins/mps-build/languages/build.mps/util/jetbrains/mps/build/mps/accessories.mps @@ -23,10 +23,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -36,6 +60,16 @@ + + + + + + + + + + @@ -54,6 +88,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 9572bb95ea0d4c217a2662abfb378040494772dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Fri, 9 Aug 2024 17:33:57 +0200 Subject: [PATCH 2/3] Build project --- .../jetbrains/mps/build/mps/generated | 2 +- .../mps/generator/template/main/generated | 2 +- .../template/main/QueriesGenerated.java | 140 +- .../mps/generator/template/main/trace.info | 5432 +++++++++-------- 4 files changed, 2803 insertions(+), 2773 deletions(-) diff --git a/plugins/mps-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generated b/plugins/mps-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generated index 1acc4af49d19..48a51b709cef 100644 --- a/plugins/mps-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generated +++ b/plugins/mps-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generated @@ -1,5 +1,5 @@ - + diff --git a/plugins/mps-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generator/template/main/generated b/plugins/mps-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generator/template/main/generated index feb4b8f65848..ab3148d39d91 100644 --- a/plugins/mps-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generator/template/main/generated +++ b/plugins/mps-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generator/template/main/generated @@ -1,5 +1,5 @@ - + diff --git a/plugins/mps-build/languages/build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/QueriesGenerated.java b/plugins/mps-build/languages/build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/QueriesGenerated.java index 1b4259b8d849..af03fcd75f66 100644 --- a/plugins/mps-build/languages/build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/QueriesGenerated.java +++ b/plugins/mps-build/languages/build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/QueriesGenerated.java @@ -634,24 +634,27 @@ public static Object propertyMacro_GetValue_9_26(final PropertyMacroContext _con return "-Xmx" + heapSize + "m"; } public static Object propertyMacro_GetValue_9_27(final PropertyMacroContext _context) { - return SPropertyOperations.getString(_context.getNode(), PROPS.name$MnvL); + return ((String) _context.getVariable("var:generatorOptions")); } public static Object propertyMacro_GetValue_9_28(final PropertyMacroContext _context) { - return "${" + SPropertyOperations.getString(_context.getNode(), PROPS.name$MnvL) + "}"; + return SPropertyOperations.getString(_context.getNode(), PROPS.name$MnvL); } public static Object propertyMacro_GetValue_9_29(final PropertyMacroContext _context) { - return SPropertyOperations.getString(_context.getNode(), PROPS.path$4PFd); + return "${" + SPropertyOperations.getString(_context.getNode(), PROPS.name$MnvL) + "}"; } public static Object propertyMacro_GetValue_9_30(final PropertyMacroContext _context) { - return SPropertyOperations.getString(_context.getNode(), PROPS.id$4PUe); + return SPropertyOperations.getString(_context.getNode(), PROPS.path$4PFd); } public static Object propertyMacro_GetValue_9_31(final PropertyMacroContext _context) { - return SPropertyOperations.getString(_context.getNode(), PROPS.path$oN2q); + return SPropertyOperations.getString(_context.getNode(), PROPS.id$4PUe); } public static Object propertyMacro_GetValue_9_32(final PropertyMacroContext _context) { - return (String) BuildSourcePath__BehaviorDescriptor.getAntPath_id7ro1ZztyOh5.invoke(SLinkOperations.getTarget(_context.getNode(), LINKS.path$iYKB), Context.defaultContext(_context)); + return SPropertyOperations.getString(_context.getNode(), PROPS.path$oN2q); } public static Object propertyMacro_GetValue_9_33(final PropertyMacroContext _context) { + return (String) BuildSourcePath__BehaviorDescriptor.getAntPath_id7ro1ZztyOh5.invoke(SLinkOperations.getTarget(_context.getNode(), LINKS.path$iYKB), Context.defaultContext(_context)); + } + public static Object propertyMacro_GetValue_9_34(final PropertyMacroContext _context) { SNode mpsAspect = Sequence.fromIterable(SNodeOperations.ofConcept(SLinkOperations.getChildren(_context.getNode(), LINKS.aspects$6r0Q), CONCEPTS.BuildMpsAspect$Ey)).first(); int heapSize; @@ -665,19 +668,19 @@ public static Object propertyMacro_GetValue_9_33(final PropertyMacroContext _con return "-Xmx" + heapSize + "m"; } - public static Object propertyMacro_GetValue_9_34(final PropertyMacroContext _context) { + public static Object propertyMacro_GetValue_9_35(final PropertyMacroContext _context) { return SPropertyOperations.getString(_context.getNode(), PROPS.name$MnvL); } - public static Object propertyMacro_GetValue_9_35(final PropertyMacroContext _context) { + public static Object propertyMacro_GetValue_9_36(final PropertyMacroContext _context) { return "${" + SPropertyOperations.getString(_context.getNode(), PROPS.name$MnvL) + "}"; } - public static Object propertyMacro_GetValue_9_36(final PropertyMacroContext _context) { + public static Object propertyMacro_GetValue_9_37(final PropertyMacroContext _context) { return SPropertyOperations.getString(SNodeOperations.cast(ListSequence.fromList(SLinkOperations.getChildren(_context.getNode(), LINKS.aspects$6r0Q)).findFirst((it) -> SNodeOperations.isInstanceOf(it, CONCEPTS.BuildMpsAspect$Ey)), CONCEPTS.BuildMpsAspect$Ey), PROPS.excludes$mj5k); } - public static Object propertyMacro_GetValue_9_37(final PropertyMacroContext _context) { + public static Object propertyMacro_GetValue_9_38(final PropertyMacroContext _context) { return (String) BuildSourcePath__BehaviorDescriptor.getAntPath_id7ro1ZztyOh5.invoke(SLinkOperations.getTarget(_context.getNode(), LINKS.path$zL7z), Context.defaultContext(_context)); } - public static Object propertyMacro_GetValue_9_38(final PropertyMacroContext _context) { + public static Object propertyMacro_GetValue_9_39(final PropertyMacroContext _context) { return SPropertyOperations.getString(_context.getNode(), PROPS.path$URGX); } public static Object propertyMacro_GetValue_11_0(final PropertyMacroContext _context) { @@ -1067,35 +1070,38 @@ public static boolean ifMacro_Condition_9_6(final IfMacroContext _context) { return ((SNode) _context.getVariable("var:compilerOptions")) != null && isNotEmptyString(SPropertyOperations.getString(((SNode) _context.getVariable("var:compilerOptions")), PROPS.javaLevel$8zbK)); } public static boolean ifMacro_Condition_9_7(final IfMacroContext _context) { + return ((String) _context.getVariable("var:generatorOptions")) != null; + } + public static boolean ifMacro_Condition_9_8(final IfMacroContext _context) { // XXX the reason I decided to put as alternative to as a start is // to avoid deep dive into common/java/mps task dependencies and how to switch to a different set. // Instead, just stick to present workflow return SPropertyOperations.getBoolean(Sequence.fromIterable(SNodeOperations.ofConcept(SLinkOperations.getChildren(_context.getNode(), LINKS.plugins$AsCR), CONCEPTS.BuildMPSPlugin$YW)).first(), PROPS.useMakeTask$aRFt); } - public static boolean ifMacro_Condition_9_8(final IfMacroContext _context) { + public static boolean ifMacro_Condition_9_9(final IfMacroContext _context) { return Sequence.fromIterable(((MPSModulesPartitioner) _context.getVariable("var:closure")).getExternal()).isNotEmpty(); } - public static boolean ifMacro_Condition_9_9(final IfMacroContext _context) { + public static boolean ifMacro_Condition_9_10(final IfMacroContext _context) { SNode mpsAspect = Sequence.fromIterable(SNodeOperations.ofConcept(SLinkOperations.getChildren(_context.getNode(), LINKS.aspects$6r0Q), CONCEPTS.BuildMpsAspect$Ey)).first(); return (mpsAspect != null) && SPropertyOperations.getBoolean(mpsAspect, PROPS.testGeneration$xdoj); } - public static boolean ifMacro_Condition_9_10(final IfMacroContext _context) { + public static boolean ifMacro_Condition_9_11(final IfMacroContext _context) { SNode ba = ListSequence.fromList(SLinkOperations.getChildren(_context.getNode(), LINKS.aspects$6r0Q)).findFirst((it) -> SNodeOperations.isInstanceOf(it, CONCEPTS.BuildMpsAspect$Ey)); if ((ba == null)) { return false; } return isNotEmptyString(SPropertyOperations.getString(SNodeOperations.cast(ba, CONCEPTS.BuildMpsAspect$Ey), PROPS.excludes$mj5k)); } - public static boolean ifMacro_Condition_9_11(final IfMacroContext _context) { + public static boolean ifMacro_Condition_9_12(final IfMacroContext _context) { return Sequence.fromIterable(((MPSModulesPartitioner) _context.getVariable("var:closure")).getExternal()).isNotEmpty(); } - public static boolean ifMacro_Condition_9_12(final IfMacroContext _context) { + public static boolean ifMacro_Condition_9_13(final IfMacroContext _context) { // sort of stupid way to find out if project has 'generate' task; // although the previous one, hardcoded check for presence of specific task library node, // was not better. return Sequence.fromIterable(SNodeOperations.ofConcept(SLinkOperations.getChildren(SLinkOperations.getTarget(_context.getNode(), LINKS.project$ciHu), LINKS.plugins$AsCR), CONCEPTS.BuildMPSPlugin$YW)).isNotEmpty(); } - public static boolean ifMacro_Condition_9_13(final IfMacroContext _context) { + public static boolean ifMacro_Condition_9_14(final IfMacroContext _context) { return ListSequence.fromList(((List) _context.getVariable("var:dependency"))).isNotEmpty(); } public static boolean ifMacro_Condition_16_0(final IfMacroContext _context) { @@ -1782,7 +1788,7 @@ public static Object varMacro_Value_9_6(final TemplateVarContext _context) { } public static Object varMacro_Value_9_7(final TemplateVarContext _context) { List> dependencies = new ProjectDependency(_context, _context.getNode()).collectDependencies().getDependencies(); - return ListSequence.fromList(dependencies).select((it) -> createGeneratorInternal_ProjectDependency_x583g4_a0a0a0a1a004(it._1(), it._0())).toList(); + return ListSequence.fromList(dependencies).select((it) -> createGeneratorInternal_ProjectDependency_x583g4_a0a0a0a1a204(it._1(), it._0())).toList(); } public static Object varMacro_Value_9_8(final TemplateVarContext _context) { MPSModulesPartitioner partitioner = new MPSModulesPartitioner(_context.getNode()); @@ -2343,6 +2349,7 @@ public Collection evaluate(@NotNull SourceSubstituteMacroNodesContext ctx pvqMethods.put("4035665851936450300", new PVQ(i++, MetaAdapterFactory.getProperty(0x479c7a8c02f943b5L, 0x9139d910cb22f298L, 0x5c842a42c54cfd1fL, 0x5c842a42c54cfd20L, "text"), "aaa")); pvqMethods.put("4035665851936951126", new PVQ(i++, MetaAdapterFactory.getProperty(0x479c7a8c02f943b5L, 0x9139d910cb22f298L, 0x5c842a42c54cfd1fL, 0x5c842a42c54cfd20L, "text"), "module.msd")); pvqMethods.put("4035665851936219812", new PVQ(i++, MetaAdapterFactory.getProperty(0x479c7a8c02f943b5L, 0x9139d910cb22f298L, 0x5c842a42c54cfd1fL, 0x5c842a42c54cfd20L, "text"), "-Xmx512m")); + pvqMethods.put("1992944417853204718", new PVQ(i++, MetaAdapterFactory.getProperty(0x479c7a8c02f943b5L, 0x9139d910cb22f298L, 0x5c842a42c54cfd1fL, 0x5c842a42c54cfd20L, "text"), "--options")); pvqMethods.put("4035665851936216040", new PVQ(i++, MetaAdapterFactory.getProperty(0x479c7a8c02f943b5L, 0x9139d910cb22f298L, 0x5c842a42c54cfd1fL, 0x5c842a42c54cfd20L, "text"), "name")); pvqMethods.put("4035665851936216049", new PVQ(i++, MetaAdapterFactory.getProperty(0x479c7a8c02f943b5L, 0x9139d910cb22f298L, 0x5c842a42c54cfd1fL, 0x5c842a42c54cfd20L, "text"), "${propertyName}")); pvqMethods.put("3239569521490197761", new PVQ(i++, MetaAdapterFactory.getProperty(0x479c7a8c02f943b5L, 0x9139d910cb22f298L, 0x5c842a42c54cfd1fL, 0x5c842a42c54cfd20L, "text"), "plugins.path")); @@ -2648,84 +2655,86 @@ public Object evaluate(@NotNull PropertyMacroContext ctx) throws GenerationFailu case 117: return QueriesGenerated.propertyMacro_GetValue_9_38(ctx); case 118: - return QueriesGenerated.propertyMacro_GetValue_11_0(ctx); + return QueriesGenerated.propertyMacro_GetValue_9_39(ctx); case 119: - return QueriesGenerated.propertyMacro_GetValue_11_1(ctx); + return QueriesGenerated.propertyMacro_GetValue_11_0(ctx); case 120: - return QueriesGenerated.propertyMacro_GetValue_11_2(ctx); + return QueriesGenerated.propertyMacro_GetValue_11_1(ctx); case 121: - return QueriesGenerated.propertyMacro_GetValue_12_0(ctx); + return QueriesGenerated.propertyMacro_GetValue_11_2(ctx); case 122: - return QueriesGenerated.propertyMacro_GetValue_12_1(ctx); + return QueriesGenerated.propertyMacro_GetValue_12_0(ctx); case 123: - return QueriesGenerated.propertyMacro_GetValue_12_2(ctx); + return QueriesGenerated.propertyMacro_GetValue_12_1(ctx); case 124: - return QueriesGenerated.propertyMacro_GetValue_12_3(ctx); + return QueriesGenerated.propertyMacro_GetValue_12_2(ctx); case 125: - return QueriesGenerated.propertyMacro_GetValue_13_0(ctx); + return QueriesGenerated.propertyMacro_GetValue_12_3(ctx); case 126: - return QueriesGenerated.propertyMacro_GetValue_13_1(ctx); + return QueriesGenerated.propertyMacro_GetValue_13_0(ctx); case 127: - return QueriesGenerated.propertyMacro_GetValue_16_0(ctx); + return QueriesGenerated.propertyMacro_GetValue_13_1(ctx); case 128: - return QueriesGenerated.propertyMacro_GetValue_16_1(ctx); + return QueriesGenerated.propertyMacro_GetValue_16_0(ctx); case 129: - return QueriesGenerated.propertyMacro_GetValue_16_2(ctx); + return QueriesGenerated.propertyMacro_GetValue_16_1(ctx); case 130: - return QueriesGenerated.propertyMacro_GetValue_16_3(ctx); + return QueriesGenerated.propertyMacro_GetValue_16_2(ctx); case 131: - return QueriesGenerated.propertyMacro_GetValue_16_4(ctx); + return QueriesGenerated.propertyMacro_GetValue_16_3(ctx); case 132: - return QueriesGenerated.propertyMacro_GetValue_16_5(ctx); + return QueriesGenerated.propertyMacro_GetValue_16_4(ctx); case 133: - return QueriesGenerated.propertyMacro_GetValue_16_6(ctx); + return QueriesGenerated.propertyMacro_GetValue_16_5(ctx); case 134: - return QueriesGenerated.propertyMacro_GetValue_16_7(ctx); + return QueriesGenerated.propertyMacro_GetValue_16_6(ctx); case 135: - return QueriesGenerated.propertyMacro_GetValue_16_8(ctx); + return QueriesGenerated.propertyMacro_GetValue_16_7(ctx); case 136: - return QueriesGenerated.propertyMacro_GetValue_16_9(ctx); + return QueriesGenerated.propertyMacro_GetValue_16_8(ctx); case 137: - return QueriesGenerated.propertyMacro_GetValue_16_10(ctx); + return QueriesGenerated.propertyMacro_GetValue_16_9(ctx); case 138: - return QueriesGenerated.propertyMacro_GetValue_16_11(ctx); + return QueriesGenerated.propertyMacro_GetValue_16_10(ctx); case 139: - return QueriesGenerated.propertyMacro_GetValue_16_12(ctx); + return QueriesGenerated.propertyMacro_GetValue_16_11(ctx); case 140: - return QueriesGenerated.propertyMacro_GetValue_16_13(ctx); + return QueriesGenerated.propertyMacro_GetValue_16_12(ctx); case 141: - return QueriesGenerated.propertyMacro_GetValue_16_14(ctx); + return QueriesGenerated.propertyMacro_GetValue_16_13(ctx); case 142: - return QueriesGenerated.propertyMacro_GetValue_16_15(ctx); + return QueriesGenerated.propertyMacro_GetValue_16_14(ctx); case 143: - return QueriesGenerated.propertyMacro_GetValue_16_16(ctx); + return QueriesGenerated.propertyMacro_GetValue_16_15(ctx); case 144: - return QueriesGenerated.propertyMacro_GetValue_16_17(ctx); + return QueriesGenerated.propertyMacro_GetValue_16_16(ctx); case 145: - return QueriesGenerated.propertyMacro_GetValue_16_18(ctx); + return QueriesGenerated.propertyMacro_GetValue_16_17(ctx); case 146: - return QueriesGenerated.propertyMacro_GetValue_17_0(ctx); + return QueriesGenerated.propertyMacro_GetValue_16_18(ctx); case 147: - return QueriesGenerated.propertyMacro_GetValue_17_1(ctx); + return QueriesGenerated.propertyMacro_GetValue_17_0(ctx); case 148: - return QueriesGenerated.propertyMacro_GetValue_17_2(ctx); + return QueriesGenerated.propertyMacro_GetValue_17_1(ctx); case 149: - return QueriesGenerated.propertyMacro_GetValue_18_0(ctx); + return QueriesGenerated.propertyMacro_GetValue_17_2(ctx); case 150: - return QueriesGenerated.propertyMacro_GetValue_18_1(ctx); + return QueriesGenerated.propertyMacro_GetValue_18_0(ctx); case 151: - return QueriesGenerated.propertyMacro_GetValue_21_0(ctx); + return QueriesGenerated.propertyMacro_GetValue_18_1(ctx); case 152: - return QueriesGenerated.propertyMacro_GetValue_21_1(ctx); + return QueriesGenerated.propertyMacro_GetValue_21_0(ctx); case 153: - return QueriesGenerated.propertyMacro_GetValue_21_2(ctx); + return QueriesGenerated.propertyMacro_GetValue_21_1(ctx); case 154: - return QueriesGenerated.propertyMacro_GetValue_21_3(ctx); + return QueriesGenerated.propertyMacro_GetValue_21_2(ctx); case 155: - return QueriesGenerated.propertyMacro_GetValue_21_4(ctx); + return QueriesGenerated.propertyMacro_GetValue_21_3(ctx); case 156: - return QueriesGenerated.propertyMacro_GetValue_21_5(ctx); + return QueriesGenerated.propertyMacro_GetValue_21_4(ctx); case 157: + return QueriesGenerated.propertyMacro_GetValue_21_5(ctx); + case 158: return QueriesGenerated.propertyMacro_GetValue_21_6(ctx); default: throw new GenerationFailureException(String.format("Inconsistent QueriesGenerated: there's no method for query %s (key: #%d)", ctx.getTemplateReference(), methodKey)); @@ -2800,6 +2809,7 @@ public Object evaluate(@NotNull PropertyMacroContext ctx) throws GenerationFailu imcMethods.put("1933226676407114454", new IfMC(i++)); imcMethods.put("4035665851936438514", new IfMC(i++)); imcMethods.put("4035665851935707502", new IfMC(i++)); + imcMethods.put("1992944417853204725", new IfMC(i++)); imcMethods.put("4035665851935770399", new IfMC(i++)); imcMethods.put("398731435601112750", new IfMC(i++)); imcMethods.put("1787667533297084980", new IfMC(i++)); @@ -2974,18 +2984,20 @@ public boolean check(@NotNull IfMacroContext ctx) throws GenerationFailureExcept case 71: return QueriesGenerated.ifMacro_Condition_9_13(ctx); case 72: - return QueriesGenerated.ifMacro_Condition_16_0(ctx); + return QueriesGenerated.ifMacro_Condition_9_14(ctx); case 73: - return QueriesGenerated.ifMacro_Condition_16_1(ctx); + return QueriesGenerated.ifMacro_Condition_16_0(ctx); case 74: - return QueriesGenerated.ifMacro_Condition_18_0(ctx); + return QueriesGenerated.ifMacro_Condition_16_1(ctx); case 75: - return QueriesGenerated.ifMacro_Condition_21_0(ctx); + return QueriesGenerated.ifMacro_Condition_18_0(ctx); case 76: - return QueriesGenerated.ifMacro_Condition_21_1(ctx); + return QueriesGenerated.ifMacro_Condition_21_0(ctx); case 77: - return QueriesGenerated.ifMacro_Condition_21_2(ctx); + return QueriesGenerated.ifMacro_Condition_21_1(ctx); case 78: + return QueriesGenerated.ifMacro_Condition_21_2(ctx); + case 79: return QueriesGenerated.ifMacro_Condition_21_3(ctx); default: throw new GenerationFailureException(String.format("Inconsistent QueriesGenerated: there's no condition method for if macro %s (key: #%d)", ctx.getTemplateReference(), methodKey)); @@ -3312,7 +3324,7 @@ public void invoke(@NotNull MapSrcMacroPostProcContext ctx) throws GenerationFai } } } - private static SNode createGeneratorInternal_ProjectDependency_x583g4_a0a0a0a1a004(String p0, SNode p1) { + private static SNode createGeneratorInternal_ProjectDependency_x583g4_a0a0a0a1a204(String p0, SNode p1) { SNodeBuilder n0 = new SNodeBuilder().init(CONCEPTS.GeneratorInternal_ProjectDependency$bb); n0.setProperty(PROPS.path$URGX, p0); n0.setReferenceTarget(LINKS.project$ciHu, p1); diff --git a/plugins/mps-build/languages/build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/trace.info b/plugins/mps-build/languages/build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/trace.info index 2a92e3a9f692..108667873218 100644 --- a/plugins/mps-build/languages/build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/trace.info +++ b/plugins/mps-build/languages/build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/trace.info @@ -14,22 +14,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -47,184 +47,184 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -237,83 +237,83 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -385,304 +385,310 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -709,90 +715,92 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - + - - + + - - - - + + + + @@ -822,140 +830,144 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - + - + @@ -1012,157 +1024,163 @@ - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - + - + - + - + - + - - + + - - - + + + @@ -1171,22 +1189,22 @@ - + - + - + - + - + - + @@ -1199,24 +1217,24 @@ - + - + - + - + - + @@ -1225,15 +1243,15 @@ - + - + - + @@ -1247,14 +1265,14 @@ - + - + - + @@ -1263,145 +1281,145 @@ - + - + - + - + - + - + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + @@ -1463,246 +1481,246 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1731,71 +1749,71 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - + + + - - - - - - - - + + + + + + + + - + @@ -1827,131 +1845,131 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - + + + + + + @@ -2015,125 +2033,125 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + @@ -2142,69 +2160,69 @@ - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2216,19 +2234,19 @@ - + - + - + - + - + @@ -2237,7 +2255,7 @@ - + @@ -2257,167 +2275,167 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - + @@ -2441,67 +2459,67 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - + - + - + - + - + @@ -2515,587 +2533,587 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - + + - + - + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - + @@ -3121,103 +3139,103 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3225,32 +3243,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -3261,64 +3279,64 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3341,84 +3359,84 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -3482,250 +3500,250 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3773,56 +3791,56 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3872,153 +3890,153 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4160,154 +4178,154 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -4322,66 +4340,66 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - + - + - + - + - + @@ -4399,40 +4417,40 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - - - - + + + + - + - - + + From 32e1591c389848df30f6638af94373750839807f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Mon, 12 Aug 2024 09:38:01 +0200 Subject: [PATCH 3/3] Regenerate build scripts --- IdeaPlugin/mpsEditorTestsPlugin.xml | 4 ++ IdeaPlugin/mpsIdeaMigration.xml | 6 ++ IdeaPlugin/mpsIdeaVcs.xml | 6 ++ IdeaPlugin/mpsJavaIdeaPlugin.xml | 4 ++ IdeaPlugin/mpsJpsIdea.xml | 4 ++ IdeaPlugin/mpsJpsIdeaJ8Compatibility.xml | 4 ++ IdeaPlugin/mpsPlugin.xml | 4 ++ IdeaPlugin/mpsPluginTests.xml | 4 ++ build.xml | 6 ++ build/jetpad.xml | 6 ++ build/mpsAntToolsPlugin.xml | 6 ++ build/mpsBootstrapCore.xml | 6 ++ build/mpsBuild.xml | 6 ++ build/mpsBuildUI.xml | 6 ++ build/mpsConsolePlugin.xml | 6 ++ build/mpsContextActionsTool.xml | 6 ++ build/mpsCore.xml | 6 ++ build/mpsDebuggerPlugin.xml | 6 ++ build/mpsDevKit.xml | 6 ++ build/mpsDiagramEditor.xml | 6 ++ build/mpsExecutionPlugin.xml | 6 ++ build/mpsHttpSupportPlugin.xml | 6 ++ build/mpsJava.xml | 6 ++ build/mpsJavaCore.xml | 6 ++ build/mpsJavaPlatform.xml | 6 ++ build/mpsKotlinPlugin.xml | 6 ++ build/mpsMakePlugin.xml | 6 ++ build/mpsMigration.xml | 6 ++ build/mpsMigrationCore.xml | 4 ++ build/mpsNavigationBar.xml | 4 ++ build/mpsPlugins.xml | 6 ++ build/mpsSpellCheckPlugin.xml | 6 ++ build/mpsStandalone.xml | 4 ++ build/mpsTesting.xml | 6 ++ build/mpsTooltips.xml | 6 ++ build/mpsTroveCollections.xml | 6 ++ build/mpsVcs.xml | 6 ++ build/mpsVcsPlatform.xml | 6 ++ build/mpsWorkbench.xml | 6 ++ build/tests/mpsActions.xml | 2 + build/tests/mpsBaseLanguage.xml | 2 + build/tests/mpsBehavior.xml | 2 + build/tests/mpsBuild.xml | 2 + build/tests/mpsConsole.xml | 2 + build/tests/mpsConstraints.xml | 2 + build/tests/mpsDataFlow.xml | 2 + build/tests/mpsEditor.xml | 2 + build/tests/mpsEditorDiagram.xml | 2 + build/tests/mpsEditorImageGen.xml | 2 + build/tests/mpsEditorTransformationMenu.xml | 2 + build/tests/mpsExecution.xml | 2 + build/tests/mpsFeedback.xml | 2 + build/tests/mpsGenerator.xml | 2 + build/tests/mpsHttpSupport.xml | 2 + build/tests/mpsImplementationStripping.xml | 2 + build/tests/mpsJava.xml | 2 + build/tests/mpsKotlin.xml | 2 + build/tests/mpsMigrations.xml | 2 + build/tests/mpsPackaged.xml | 2 + build/tests/mpsSModel.xml | 2 + build/tests/mpsSmartRefAttrMigration_gen.xml | 2 + build/tests/mpsTest.xml | 2 + build/tests/mpsTestModules.xml | 2 + build/tests/mpsTestRefactoring.xml | 2 + build/tests/mpsText.xml | 2 + build/tests/mpsToolTests.xml | 2 + build/tests/mpsTypesystem.xml | 2 + build/tests/mpsVCS.xml | 6 ++ .../samples/buildTest/buildTest.xml | 6 ++ .../samples/buildTest/buildTest2.xml | 6 ++ .../samples/stripImpl/build.xml | 6 ++ .../stripImplementation/buildPlugin.xml | 6 ++ .../sandbox/stripImplementation/trace.info | 2 +- .../sandbox/testExternalBuild/buildTest.xml | 6 ++ .../sandbox/testExternalBuild/buildTest2.xml | 6 ++ .../sandbox/testExternalBuild/trace.info | 4 +- .../jetbrains/mps/ide/build/jetpad.xml | 6 ++ .../mps/ide/build/mpsAntToolsPlugin.xml | 6 ++ .../mps/ide/build/mpsBootstrapCore.xml | 6 ++ .../jetbrains/mps/ide/build/mpsBuild.xml | 6 ++ .../jetbrains/mps/ide/build/mpsBuildUI.xml | 6 ++ .../mps/ide/build/mpsConsolePlugin.xml | 6 ++ .../mps/ide/build/mpsContextActionsTool.xml | 6 ++ .../jetbrains/mps/ide/build/mpsCore.xml | 6 ++ .../mps/ide/build/mpsDebuggerPlugin.xml | 6 ++ .../jetbrains/mps/ide/build/mpsDevKit.xml | 6 ++ .../mps/ide/build/mpsDiagramEditor.xml | 6 ++ .../mps/ide/build/mpsExecutionPlugin.xml | 6 ++ .../mps/ide/build/mpsHttpSupportPlugin.xml | 6 ++ .../jetbrains/mps/ide/build/mpsJava.xml | 6 ++ .../jetbrains/mps/ide/build/mpsJavaCore.xml | 6 ++ .../mps/ide/build/mpsJavaPlatform.xml | 6 ++ .../mps/ide/build/mpsKotlinPlugin.xml | 6 ++ .../jetbrains/mps/ide/build/mpsMakePlugin.xml | 6 ++ .../jetbrains/mps/ide/build/mpsMigration.xml | 6 ++ .../mps/ide/build/mpsMigrationCore.xml | 4 ++ .../mps/ide/build/mpsNavigationBar.xml | 4 ++ .../jetbrains/mps/ide/build/mpsPlugins.xml | 6 ++ .../mps/ide/build/mpsSpellCheckPlugin.xml | 6 ++ .../jetbrains/mps/ide/build/mpsStandalone.xml | 4 ++ .../jetbrains/mps/ide/build/mpsTesting.xml | 6 ++ .../jetbrains/mps/ide/build/mpsTooltips.xml | 6 ++ .../mps/ide/build/mpsTroveCollections.xml | 6 ++ .../jetbrains/mps/ide/build/mpsVcs.xml | 6 ++ .../mps/ide/build/mpsVcsPlatform.xml | 6 ++ .../jetbrains/mps/ide/build/mpsWorkbench.xml | 6 ++ .../tests/generatedTests/mpsTestModules.xml | 2 + .../generatedTests/mpsTestRefactoring.xml | 2 + .../ide/build/tests/generatedTests/trace.info | 4 +- .../mps/ide/build/tests/mpsActions.xml | 2 + .../mps/ide/build/tests/mpsBaseLanguage.xml | 2 + .../mps/ide/build/tests/mpsBehavior.xml | 2 + .../mps/ide/build/tests/mpsBuild.xml | 2 + .../mps/ide/build/tests/mpsConsole.xml | 2 + .../mps/ide/build/tests/mpsConstraints.xml | 2 + .../mps/ide/build/tests/mpsDataFlow.xml | 2 + .../mps/ide/build/tests/mpsEditor.xml | 2 + .../mps/ide/build/tests/mpsEditorDiagram.xml | 2 + .../mps/ide/build/tests/mpsEditorImageGen.xml | 2 + .../tests/mpsEditorTransformationMenu.xml | 2 + .../mps/ide/build/tests/mpsExecution.xml | 2 + .../mps/ide/build/tests/mpsFeedback.xml | 2 + .../mps/ide/build/tests/mpsGenerator.xml | 2 + .../mps/ide/build/tests/mpsHttpSupport.xml | 2 + .../tests/mpsImplementationStripping.xml | 2 + .../jetbrains/mps/ide/build/tests/mpsJava.xml | 2 + .../mps/ide/build/tests/mpsKotlin.xml | 2 + .../mps/ide/build/tests/mpsMigrations.xml | 2 + .../mps/ide/build/tests/mpsPackaged.xml | 2 + .../mps/ide/build/tests/mpsSModel.xml | 2 + .../build/tests/mpsSmartRefAttrMigration.xml | 2 + .../jetbrains/mps/ide/build/tests/mpsTest.xml | 2 + .../jetbrains/mps/ide/build/tests/mpsText.xml | 2 + .../mps/ide/build/tests/mpsToolTests.xml | 2 + .../mps/ide/build/tests/mpsTypesystem.xml | 2 + .../jetbrains/mps/ide/build/tests/mpsVCS.xml | 6 ++ .../jetbrains/mps/ide/build/tests/trace.info | 54 ++++++++--------- .../jetbrains/mps/ide/build/trace.info | 60 +++++++++---------- .../plugin/build/mpsEditorTestsPlugin.xml | 4 ++ .../idea/plugin/build/mpsIdeaMigration.xml | 6 ++ .../mps/ide/idea/plugin/build/mpsIdeaVcs.xml | 6 ++ .../idea/plugin/build/mpsJavaIdeaPlugin.xml | 4 ++ .../mps/ide/idea/plugin/build/mpsJpsIdea.xml | 4 ++ .../build/mpsJpsIdeaJ8Compatibility.xml | 4 ++ .../mps/ide/idea/plugin/build/mpsPlugin.xml | 4 ++ .../ide/idea/plugin/build/mpsPluginTests.xml | 4 ++ .../mps/ide/idea/plugin/build/trace.info | 16 ++--- samples/customAspect/build.xml | 6 ++ .../build/SampleCustomAspect.xml | 6 ++ .../SampleCustomAspect/build/trace.info | 2 +- samples/notesOrganizer/build.xml | 6 ++ .../notesOrganizer/build/notesOrganizer.xml | 6 ++ .../samples/notesOrganizer/build/trace.info | 2 +- samples/propertyPersistence/build.xml | 6 ++ .../source_gen/build/propertyPersistence.xml | 6 ++ .../source_gen/build/trace.info | 2 +- .../build/buildOfSampleJavaExtensions.xml | 6 ++ .../mps/samples/Build/build/trace.info | 2 +- samples/xmlPersistence/build.xml | 6 ++ .../samples/xmlPersistence/build/trace.info | 2 +- .../build/xmlPersistencePlugin.xml | 6 ++ .../mps/runner/test/buildscript/test1.xml | 6 ++ .../mps/runner/test/buildscript/test2.xml | 6 ++ .../mps/runner/test/buildscript/test3.xml | 6 ++ .../mps/runner/test/buildscript/test4.xml | 6 ++ .../mps/runner/test/buildscript/test5.xml | 6 ++ .../test/buildscript/testDummyPlugin.xml | 6 ++ .../mps/runner/test/buildscript/trace.info | 12 ++-- .../modules/build.mps.runner.test/test1.xml | 6 ++ .../modules/build.mps.runner.test/test2.xml | 6 ++ .../modules/build.mps.runner.test/test3.xml | 6 ++ .../modules/build.mps.runner.test/test4.xml | 6 ++ .../modules/build.mps.runner.test/test5.xml | 6 ++ .../build.mps.runner.test/testDummyPlugin.xml | 6 ++ testbench/modules/xmodel.build/p1.xml | 6 ++ testbench/modules/xmodel.build/p2.xml | 6 ++ .../generator/xmodel/build/test/build/p1.xml | 6 ++ .../generator/xmodel/build/test/build/p2.xml | 6 ++ .../xmodel/build/test/build/trace.info | 4 +- 179 files changed, 819 insertions(+), 83 deletions(-) diff --git a/IdeaPlugin/mpsEditorTestsPlugin.xml b/IdeaPlugin/mpsEditorTestsPlugin.xml index 40208fa28b4b..f5016a117f5e 100644 --- a/IdeaPlugin/mpsEditorTestsPlugin.xml +++ b/IdeaPlugin/mpsEditorTestsPlugin.xml @@ -1,6 +1,8 @@ + + @@ -53,6 +55,8 @@ + + diff --git a/IdeaPlugin/mpsIdeaMigration.xml b/IdeaPlugin/mpsIdeaMigration.xml index b03ce2b2c387..d5ae7de03afa 100644 --- a/IdeaPlugin/mpsIdeaMigration.xml +++ b/IdeaPlugin/mpsIdeaMigration.xml @@ -1,6 +1,8 @@ + + @@ -177,6 +179,8 @@ + + @@ -202,6 +206,8 @@ + + diff --git a/IdeaPlugin/mpsIdeaVcs.xml b/IdeaPlugin/mpsIdeaVcs.xml index d6567848ff9c..94c71d9a35cd 100644 --- a/IdeaPlugin/mpsIdeaVcs.xml +++ b/IdeaPlugin/mpsIdeaVcs.xml @@ -1,6 +1,8 @@ + + @@ -389,6 +391,8 @@ + + @@ -419,6 +423,8 @@ + + diff --git a/IdeaPlugin/mpsJavaIdeaPlugin.xml b/IdeaPlugin/mpsJavaIdeaPlugin.xml index 8ac8e1b58c55..a9a8236056f2 100644 --- a/IdeaPlugin/mpsJavaIdeaPlugin.xml +++ b/IdeaPlugin/mpsJavaIdeaPlugin.xml @@ -1,6 +1,8 @@ + + @@ -88,6 +90,8 @@ + + diff --git a/IdeaPlugin/mpsJpsIdea.xml b/IdeaPlugin/mpsJpsIdea.xml index 4c7752a9c5e6..59d2a7aea8f9 100644 --- a/IdeaPlugin/mpsJpsIdea.xml +++ b/IdeaPlugin/mpsJpsIdea.xml @@ -1,6 +1,8 @@ + + @@ -75,6 +77,8 @@ + + diff --git a/IdeaPlugin/mpsJpsIdeaJ8Compatibility.xml b/IdeaPlugin/mpsJpsIdeaJ8Compatibility.xml index 945d45228ac6..3e218997da82 100644 --- a/IdeaPlugin/mpsJpsIdeaJ8Compatibility.xml +++ b/IdeaPlugin/mpsJpsIdeaJ8Compatibility.xml @@ -1,6 +1,8 @@ + + @@ -79,6 +81,8 @@ + + diff --git a/IdeaPlugin/mpsPlugin.xml b/IdeaPlugin/mpsPlugin.xml index 7e30678639f6..1bd458093d03 100644 --- a/IdeaPlugin/mpsPlugin.xml +++ b/IdeaPlugin/mpsPlugin.xml @@ -1,6 +1,8 @@ + + @@ -95,6 +97,8 @@ + + diff --git a/IdeaPlugin/mpsPluginTests.xml b/IdeaPlugin/mpsPluginTests.xml index 34a0c5689ddd..6c2d510a3091 100644 --- a/IdeaPlugin/mpsPluginTests.xml +++ b/IdeaPlugin/mpsPluginTests.xml @@ -1,6 +1,8 @@ + + @@ -129,6 +131,8 @@ + + diff --git a/build.xml b/build.xml index 52f99d55c8a0..e8dba8567045 100644 --- a/build.xml +++ b/build.xml @@ -1,6 +1,8 @@ + + @@ -789,6 +791,8 @@ + + @@ -820,6 +824,8 @@ + + diff --git a/build/jetpad.xml b/build/jetpad.xml index 2f88bdf022dd..1239bc5d3284 100644 --- a/build/jetpad.xml +++ b/build/jetpad.xml @@ -1,6 +1,8 @@ + + @@ -88,6 +90,8 @@ + + @@ -113,6 +117,8 @@ + + diff --git a/build/mpsAntToolsPlugin.xml b/build/mpsAntToolsPlugin.xml index 903802acc710..226816ef3789 100644 --- a/build/mpsAntToolsPlugin.xml +++ b/build/mpsAntToolsPlugin.xml @@ -1,6 +1,8 @@ + + @@ -102,6 +104,8 @@ + + @@ -127,6 +131,8 @@ + + diff --git a/build/mpsBootstrapCore.xml b/build/mpsBootstrapCore.xml index 51166ebe4e0e..eba0d31713ec 100644 --- a/build/mpsBootstrapCore.xml +++ b/build/mpsBootstrapCore.xml @@ -1,6 +1,8 @@ + + @@ -16723,6 +16725,8 @@ + + @@ -16931,6 +16935,8 @@ + + diff --git a/build/mpsBuild.xml b/build/mpsBuild.xml index a85839ccc585..17a1954c4f6f 100644 --- a/build/mpsBuild.xml +++ b/build/mpsBuild.xml @@ -1,6 +1,8 @@ + + @@ -1592,6 +1594,8 @@ + + @@ -1632,6 +1636,8 @@ + + diff --git a/build/mpsBuildUI.xml b/build/mpsBuildUI.xml index df2c9e75c2e4..08b690869d9d 100644 --- a/build/mpsBuildUI.xml +++ b/build/mpsBuildUI.xml @@ -1,6 +1,8 @@ + + @@ -325,6 +327,8 @@ + + @@ -364,6 +368,8 @@ + + diff --git a/build/mpsConsolePlugin.xml b/build/mpsConsolePlugin.xml index e0f3aedd21f9..2bf752078a62 100644 --- a/build/mpsConsolePlugin.xml +++ b/build/mpsConsolePlugin.xml @@ -1,6 +1,8 @@ + + @@ -1095,6 +1097,8 @@ + + @@ -1136,6 +1140,8 @@ + + diff --git a/build/mpsContextActionsTool.xml b/build/mpsContextActionsTool.xml index b47d0ced470f..1f7c3dc41d02 100644 --- a/build/mpsContextActionsTool.xml +++ b/build/mpsContextActionsTool.xml @@ -1,6 +1,8 @@ + + @@ -339,6 +341,8 @@ + + @@ -368,6 +372,8 @@ + + diff --git a/build/mpsCore.xml b/build/mpsCore.xml index 0d698cdf786d..01d6b5c624b7 100644 --- a/build/mpsCore.xml +++ b/build/mpsCore.xml @@ -1,6 +1,8 @@ + + @@ -1191,6 +1193,8 @@ + + @@ -1228,6 +1232,8 @@ + + diff --git a/build/mpsDebuggerPlugin.xml b/build/mpsDebuggerPlugin.xml index 2d9ead0bf47e..68dc637e9351 100644 --- a/build/mpsDebuggerPlugin.xml +++ b/build/mpsDebuggerPlugin.xml @@ -1,6 +1,8 @@ + + @@ -1436,6 +1438,8 @@ + + @@ -1479,6 +1483,8 @@ + + diff --git a/build/mpsDevKit.xml b/build/mpsDevKit.xml index 9a463067b6ae..4a977bb15cc7 100644 --- a/build/mpsDevKit.xml +++ b/build/mpsDevKit.xml @@ -1,6 +1,8 @@ + + @@ -992,6 +994,8 @@ + + @@ -1039,6 +1043,8 @@ + + diff --git a/build/mpsDiagramEditor.xml b/build/mpsDiagramEditor.xml index 7d26d366720f..7c62de790caa 100644 --- a/build/mpsDiagramEditor.xml +++ b/build/mpsDiagramEditor.xml @@ -1,6 +1,8 @@ + + @@ -540,6 +542,8 @@ + + @@ -571,6 +575,8 @@ + + diff --git a/build/mpsExecutionPlugin.xml b/build/mpsExecutionPlugin.xml index 2197cf485bb1..524f9ae803f9 100644 --- a/build/mpsExecutionPlugin.xml +++ b/build/mpsExecutionPlugin.xml @@ -1,6 +1,8 @@ + + @@ -1102,6 +1104,8 @@ + + @@ -1152,6 +1156,8 @@ + + diff --git a/build/mpsHttpSupportPlugin.xml b/build/mpsHttpSupportPlugin.xml index e12848ef833c..0599ed0a5ff2 100644 --- a/build/mpsHttpSupportPlugin.xml +++ b/build/mpsHttpSupportPlugin.xml @@ -1,6 +1,8 @@ + + @@ -429,6 +431,8 @@ + + @@ -463,6 +467,8 @@ + + diff --git a/build/mpsJava.xml b/build/mpsJava.xml index e6d55a284e61..b4a29e10a1c7 100644 --- a/build/mpsJava.xml +++ b/build/mpsJava.xml @@ -1,6 +1,8 @@ + + @@ -162,6 +164,8 @@ + + @@ -190,6 +194,8 @@ + + diff --git a/build/mpsJavaCore.xml b/build/mpsJavaCore.xml index 90675a64f037..a984fc49f951 100644 --- a/build/mpsJavaCore.xml +++ b/build/mpsJavaCore.xml @@ -1,6 +1,8 @@ + + @@ -138,6 +140,8 @@ + + @@ -163,6 +167,8 @@ + + diff --git a/build/mpsJavaPlatform.xml b/build/mpsJavaPlatform.xml index 550ff90dce7e..199512b8f688 100644 --- a/build/mpsJavaPlatform.xml +++ b/build/mpsJavaPlatform.xml @@ -1,6 +1,8 @@ + + @@ -160,6 +162,8 @@ + + @@ -186,6 +190,8 @@ + + diff --git a/build/mpsKotlinPlugin.xml b/build/mpsKotlinPlugin.xml index 72bc549d27e5..6fade950ad50 100644 --- a/build/mpsKotlinPlugin.xml +++ b/build/mpsKotlinPlugin.xml @@ -1,6 +1,8 @@ + + @@ -1223,6 +1225,8 @@ + + @@ -1264,6 +1268,8 @@ + + diff --git a/build/mpsMakePlugin.xml b/build/mpsMakePlugin.xml index ce0de13d0f5e..5de2e23a9783 100644 --- a/build/mpsMakePlugin.xml +++ b/build/mpsMakePlugin.xml @@ -1,6 +1,8 @@ + + @@ -157,6 +159,8 @@ + + @@ -185,6 +189,8 @@ + + diff --git a/build/mpsMigration.xml b/build/mpsMigration.xml index 29d0b39819f2..e51721dfab78 100644 --- a/build/mpsMigration.xml +++ b/build/mpsMigration.xml @@ -1,6 +1,8 @@ + + @@ -333,6 +335,8 @@ + + @@ -364,6 +368,8 @@ + + diff --git a/build/mpsMigrationCore.xml b/build/mpsMigrationCore.xml index 93fd9e5ebea1..15abff940531 100644 --- a/build/mpsMigrationCore.xml +++ b/build/mpsMigrationCore.xml @@ -1,6 +1,8 @@ + + @@ -70,6 +72,8 @@ + + diff --git a/build/mpsNavigationBar.xml b/build/mpsNavigationBar.xml index d36b55aa27f5..d335f2971a9d 100644 --- a/build/mpsNavigationBar.xml +++ b/build/mpsNavigationBar.xml @@ -1,6 +1,8 @@ + + @@ -69,6 +71,8 @@ + + diff --git a/build/mpsPlugins.xml b/build/mpsPlugins.xml index a2af446f080d..7960086ac669 100644 --- a/build/mpsPlugins.xml +++ b/build/mpsPlugins.xml @@ -1,6 +1,8 @@ + + @@ -756,6 +758,8 @@ + + @@ -796,6 +800,8 @@ + + diff --git a/build/mpsSpellCheckPlugin.xml b/build/mpsSpellCheckPlugin.xml index 928722aa713e..b437fd85e29b 100644 --- a/build/mpsSpellCheckPlugin.xml +++ b/build/mpsSpellCheckPlugin.xml @@ -1,6 +1,8 @@ + + @@ -120,6 +122,8 @@ + + @@ -146,6 +150,8 @@ + + diff --git a/build/mpsStandalone.xml b/build/mpsStandalone.xml index c6f88c8cc942..a997f653bef6 100644 --- a/build/mpsStandalone.xml +++ b/build/mpsStandalone.xml @@ -1,6 +1,8 @@ + + @@ -115,6 +117,8 @@ + + diff --git a/build/mpsTesting.xml b/build/mpsTesting.xml index 2d76839e4d93..da7b72b88293 100644 --- a/build/mpsTesting.xml +++ b/build/mpsTesting.xml @@ -1,6 +1,8 @@ + + @@ -1157,6 +1159,8 @@ + + @@ -1197,6 +1201,8 @@ + + diff --git a/build/mpsTooltips.xml b/build/mpsTooltips.xml index 35307f31060a..32c5ad047641 100644 --- a/build/mpsTooltips.xml +++ b/build/mpsTooltips.xml @@ -1,6 +1,8 @@ + + @@ -266,6 +268,8 @@ + + @@ -295,6 +299,8 @@ + + diff --git a/build/mpsTroveCollections.xml b/build/mpsTroveCollections.xml index a9c2848f90c1..f64882f04c63 100644 --- a/build/mpsTroveCollections.xml +++ b/build/mpsTroveCollections.xml @@ -1,6 +1,8 @@ + + @@ -260,6 +262,8 @@ + + @@ -288,6 +292,8 @@ + + diff --git a/build/mpsVcs.xml b/build/mpsVcs.xml index 3b9d6230c5f0..eccb6ba18680 100644 --- a/build/mpsVcs.xml +++ b/build/mpsVcs.xml @@ -1,6 +1,8 @@ + + @@ -744,6 +746,8 @@ + + @@ -782,6 +786,8 @@ + + diff --git a/build/mpsVcsPlatform.xml b/build/mpsVcsPlatform.xml index 849c8f29bceb..b10092ff2e43 100644 --- a/build/mpsVcsPlatform.xml +++ b/build/mpsVcsPlatform.xml @@ -1,6 +1,8 @@ + + @@ -138,6 +140,8 @@ + + @@ -153,6 +157,8 @@ + + diff --git a/build/mpsWorkbench.xml b/build/mpsWorkbench.xml index d6966c11d674..8b9c7a22c2d9 100644 --- a/build/mpsWorkbench.xml +++ b/build/mpsWorkbench.xml @@ -1,6 +1,8 @@ + + @@ -363,6 +365,8 @@ + + @@ -392,6 +396,8 @@ + + diff --git a/build/tests/mpsActions.xml b/build/tests/mpsActions.xml index 96c6b5b14754..5db8a565e485 100644 --- a/build/tests/mpsActions.xml +++ b/build/tests/mpsActions.xml @@ -161,6 +161,8 @@ + + diff --git a/build/tests/mpsBaseLanguage.xml b/build/tests/mpsBaseLanguage.xml index 253d7d18d66d..b14609e75cb7 100644 --- a/build/tests/mpsBaseLanguage.xml +++ b/build/tests/mpsBaseLanguage.xml @@ -926,6 +926,8 @@ + + diff --git a/build/tests/mpsBehavior.xml b/build/tests/mpsBehavior.xml index f02cb3e8b5d2..898654ceb131 100644 --- a/build/tests/mpsBehavior.xml +++ b/build/tests/mpsBehavior.xml @@ -722,6 +722,8 @@ + + diff --git a/build/tests/mpsBuild.xml b/build/tests/mpsBuild.xml index 6bc1c810ace3..144cb557c832 100644 --- a/build/tests/mpsBuild.xml +++ b/build/tests/mpsBuild.xml @@ -227,6 +227,8 @@ + + diff --git a/build/tests/mpsConsole.xml b/build/tests/mpsConsole.xml index f0fd4449e0aa..f5725acd94e8 100644 --- a/build/tests/mpsConsole.xml +++ b/build/tests/mpsConsole.xml @@ -189,6 +189,8 @@ + + diff --git a/build/tests/mpsConstraints.xml b/build/tests/mpsConstraints.xml index 432461979af0..2deeee04f2f1 100644 --- a/build/tests/mpsConstraints.xml +++ b/build/tests/mpsConstraints.xml @@ -466,6 +466,8 @@ + + diff --git a/build/tests/mpsDataFlow.xml b/build/tests/mpsDataFlow.xml index 6dbf35389415..17b46d761f3a 100644 --- a/build/tests/mpsDataFlow.xml +++ b/build/tests/mpsDataFlow.xml @@ -428,6 +428,8 @@ + + diff --git a/build/tests/mpsEditor.xml b/build/tests/mpsEditor.xml index 9410902c9b20..2bc19c2e3a5b 100644 --- a/build/tests/mpsEditor.xml +++ b/build/tests/mpsEditor.xml @@ -1700,6 +1700,8 @@ + + diff --git a/build/tests/mpsEditorDiagram.xml b/build/tests/mpsEditorDiagram.xml index d0584b8b608a..327446e3aab5 100644 --- a/build/tests/mpsEditorDiagram.xml +++ b/build/tests/mpsEditorDiagram.xml @@ -323,6 +323,8 @@ + + diff --git a/build/tests/mpsEditorImageGen.xml b/build/tests/mpsEditorImageGen.xml index 29030cbd4514..65d033230f41 100644 --- a/build/tests/mpsEditorImageGen.xml +++ b/build/tests/mpsEditorImageGen.xml @@ -304,6 +304,8 @@ + + diff --git a/build/tests/mpsEditorTransformationMenu.xml b/build/tests/mpsEditorTransformationMenu.xml index abaa7727fe89..96349e3529b7 100644 --- a/build/tests/mpsEditorTransformationMenu.xml +++ b/build/tests/mpsEditorTransformationMenu.xml @@ -1669,6 +1669,8 @@ + + diff --git a/build/tests/mpsExecution.xml b/build/tests/mpsExecution.xml index 47d1592b663e..354e079df583 100644 --- a/build/tests/mpsExecution.xml +++ b/build/tests/mpsExecution.xml @@ -490,6 +490,8 @@ + + diff --git a/build/tests/mpsFeedback.xml b/build/tests/mpsFeedback.xml index e917bf908f5a..e7d870233aa7 100644 --- a/build/tests/mpsFeedback.xml +++ b/build/tests/mpsFeedback.xml @@ -256,6 +256,8 @@ + + diff --git a/build/tests/mpsGenerator.xml b/build/tests/mpsGenerator.xml index 1a83fccc298b..8de52acdf74e 100644 --- a/build/tests/mpsGenerator.xml +++ b/build/tests/mpsGenerator.xml @@ -1593,6 +1593,8 @@ + + diff --git a/build/tests/mpsHttpSupport.xml b/build/tests/mpsHttpSupport.xml index c54e24f94a9b..d6462cb089bb 100644 --- a/build/tests/mpsHttpSupport.xml +++ b/build/tests/mpsHttpSupport.xml @@ -181,6 +181,8 @@ + + diff --git a/build/tests/mpsImplementationStripping.xml b/build/tests/mpsImplementationStripping.xml index 281f00dd68a8..145fe66f7eb1 100644 --- a/build/tests/mpsImplementationStripping.xml +++ b/build/tests/mpsImplementationStripping.xml @@ -355,6 +355,8 @@ + + diff --git a/build/tests/mpsJava.xml b/build/tests/mpsJava.xml index 5e44009462c8..64ce2af0a878 100644 --- a/build/tests/mpsJava.xml +++ b/build/tests/mpsJava.xml @@ -225,6 +225,8 @@ + + diff --git a/build/tests/mpsKotlin.xml b/build/tests/mpsKotlin.xml index 89e7e16fdcf3..923ab034a224 100644 --- a/build/tests/mpsKotlin.xml +++ b/build/tests/mpsKotlin.xml @@ -252,6 +252,8 @@ + + diff --git a/build/tests/mpsMigrations.xml b/build/tests/mpsMigrations.xml index b6978a460f18..625a1931cfa3 100644 --- a/build/tests/mpsMigrations.xml +++ b/build/tests/mpsMigrations.xml @@ -154,6 +154,8 @@ + + diff --git a/build/tests/mpsPackaged.xml b/build/tests/mpsPackaged.xml index 9484a543c4d2..d0ac9a88a272 100644 --- a/build/tests/mpsPackaged.xml +++ b/build/tests/mpsPackaged.xml @@ -267,6 +267,8 @@ + + diff --git a/build/tests/mpsSModel.xml b/build/tests/mpsSModel.xml index 107d922d35f8..b57f4f03298d 100644 --- a/build/tests/mpsSModel.xml +++ b/build/tests/mpsSModel.xml @@ -403,6 +403,8 @@ + + diff --git a/build/tests/mpsSmartRefAttrMigration_gen.xml b/build/tests/mpsSmartRefAttrMigration_gen.xml index 1797b022168a..23b981347741 100644 --- a/build/tests/mpsSmartRefAttrMigration_gen.xml +++ b/build/tests/mpsSmartRefAttrMigration_gen.xml @@ -160,6 +160,8 @@ + + diff --git a/build/tests/mpsTest.xml b/build/tests/mpsTest.xml index 96eeed534e95..ef6170c3cca3 100644 --- a/build/tests/mpsTest.xml +++ b/build/tests/mpsTest.xml @@ -1128,6 +1128,8 @@ + + diff --git a/build/tests/mpsTestModules.xml b/build/tests/mpsTestModules.xml index b3873480831f..a39c715ee6e8 100644 --- a/build/tests/mpsTestModules.xml +++ b/build/tests/mpsTestModules.xml @@ -510,6 +510,8 @@ + + diff --git a/build/tests/mpsTestRefactoring.xml b/build/tests/mpsTestRefactoring.xml index 64f6f7b2ac9a..56a10d88d0f7 100644 --- a/build/tests/mpsTestRefactoring.xml +++ b/build/tests/mpsTestRefactoring.xml @@ -203,6 +203,8 @@ + + diff --git a/build/tests/mpsText.xml b/build/tests/mpsText.xml index 339ee7c13b16..84052913c468 100644 --- a/build/tests/mpsText.xml +++ b/build/tests/mpsText.xml @@ -153,6 +153,8 @@ + + diff --git a/build/tests/mpsToolTests.xml b/build/tests/mpsToolTests.xml index 02adc4c55e4a..a0b3d5158ad4 100644 --- a/build/tests/mpsToolTests.xml +++ b/build/tests/mpsToolTests.xml @@ -218,6 +218,8 @@ + + diff --git a/build/tests/mpsTypesystem.xml b/build/tests/mpsTypesystem.xml index 3dbfa4f8a712..f91406348266 100644 --- a/build/tests/mpsTypesystem.xml +++ b/build/tests/mpsTypesystem.xml @@ -975,6 +975,8 @@ + + diff --git a/build/tests/mpsVCS.xml b/build/tests/mpsVCS.xml index 93c972b4560e..f8a43f3f6a17 100644 --- a/build/tests/mpsVCS.xml +++ b/build/tests/mpsVCS.xml @@ -3,6 +3,8 @@ + + @@ -89,6 +91,8 @@ + + @@ -118,6 +122,8 @@ + + diff --git a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest.xml b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest.xml index 5bd03eac0c52..c69131d08ca9 100644 --- a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest.xml +++ b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest.xml @@ -1,6 +1,8 @@ + + @@ -117,6 +119,8 @@ + + @@ -144,6 +148,8 @@ + + diff --git a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest2.xml b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest2.xml index 1cf6856241e6..5aefe9fbbb3e 100644 --- a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest2.xml +++ b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest2.xml @@ -1,6 +1,8 @@ + + @@ -137,6 +139,8 @@ + + @@ -163,6 +167,8 @@ + + diff --git a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/stripImpl/build.xml b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/stripImpl/build.xml index 4160989d8536..baf564949606 100644 --- a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/stripImpl/build.xml +++ b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/stripImpl/build.xml @@ -1,6 +1,8 @@ + + @@ -201,6 +203,8 @@ + + @@ -230,6 +234,8 @@ + + diff --git a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/stripImplementation/buildPlugin.xml b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/stripImplementation/buildPlugin.xml index 4160989d8536..baf564949606 100644 --- a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/stripImplementation/buildPlugin.xml +++ b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/stripImplementation/buildPlugin.xml @@ -1,6 +1,8 @@ + + @@ -201,6 +203,8 @@ + + @@ -230,6 +234,8 @@ + + diff --git a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/stripImplementation/trace.info b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/stripImplementation/trace.info index f429a35c9513..8d41bfd95683 100644 --- a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/stripImplementation/trace.info +++ b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/stripImplementation/trace.info @@ -2,7 +2,7 @@ - + diff --git a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest.xml b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest.xml index 5bd03eac0c52..c69131d08ca9 100644 --- a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest.xml +++ b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest.xml @@ -1,6 +1,8 @@ + + @@ -117,6 +119,8 @@ + + @@ -144,6 +148,8 @@ + + diff --git a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest2.xml b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest2.xml index 1cf6856241e6..5aefe9fbbb3e 100644 --- a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest2.xml +++ b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest2.xml @@ -1,6 +1,8 @@ + + @@ -137,6 +139,8 @@ + + @@ -163,6 +167,8 @@ + + diff --git a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/trace.info b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/trace.info index 8c12e952f2a8..91e87ed3fe7c 100644 --- a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/trace.info +++ b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/trace.info @@ -2,12 +2,12 @@ - + - + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/jetpad.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/jetpad.xml index 2f88bdf022dd..1239bc5d3284 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/jetpad.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/jetpad.xml @@ -1,6 +1,8 @@ + + @@ -88,6 +90,8 @@ + + @@ -113,6 +117,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsAntToolsPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsAntToolsPlugin.xml index 903802acc710..226816ef3789 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsAntToolsPlugin.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsAntToolsPlugin.xml @@ -1,6 +1,8 @@ + + @@ -102,6 +104,8 @@ + + @@ -127,6 +131,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBootstrapCore.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBootstrapCore.xml index 51166ebe4e0e..eba0d31713ec 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBootstrapCore.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBootstrapCore.xml @@ -1,6 +1,8 @@ + + @@ -16723,6 +16725,8 @@ + + @@ -16931,6 +16935,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBuild.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBuild.xml index a85839ccc585..17a1954c4f6f 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBuild.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBuild.xml @@ -1,6 +1,8 @@ + + @@ -1592,6 +1594,8 @@ + + @@ -1632,6 +1636,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBuildUI.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBuildUI.xml index df2c9e75c2e4..08b690869d9d 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBuildUI.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBuildUI.xml @@ -1,6 +1,8 @@ + + @@ -325,6 +327,8 @@ + + @@ -364,6 +368,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsConsolePlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsConsolePlugin.xml index e0f3aedd21f9..2bf752078a62 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsConsolePlugin.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsConsolePlugin.xml @@ -1,6 +1,8 @@ + + @@ -1095,6 +1097,8 @@ + + @@ -1136,6 +1140,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsContextActionsTool.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsContextActionsTool.xml index b47d0ced470f..1f7c3dc41d02 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsContextActionsTool.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsContextActionsTool.xml @@ -1,6 +1,8 @@ + + @@ -339,6 +341,8 @@ + + @@ -368,6 +372,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsCore.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsCore.xml index 0d698cdf786d..01d6b5c624b7 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsCore.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsCore.xml @@ -1,6 +1,8 @@ + + @@ -1191,6 +1193,8 @@ + + @@ -1228,6 +1232,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDebuggerPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDebuggerPlugin.xml index 2d9ead0bf47e..68dc637e9351 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDebuggerPlugin.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDebuggerPlugin.xml @@ -1,6 +1,8 @@ + + @@ -1436,6 +1438,8 @@ + + @@ -1479,6 +1483,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDevKit.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDevKit.xml index 9a463067b6ae..4a977bb15cc7 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDevKit.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDevKit.xml @@ -1,6 +1,8 @@ + + @@ -992,6 +994,8 @@ + + @@ -1039,6 +1043,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDiagramEditor.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDiagramEditor.xml index 7d26d366720f..7c62de790caa 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDiagramEditor.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDiagramEditor.xml @@ -1,6 +1,8 @@ + + @@ -540,6 +542,8 @@ + + @@ -571,6 +575,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsExecutionPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsExecutionPlugin.xml index 2197cf485bb1..524f9ae803f9 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsExecutionPlugin.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsExecutionPlugin.xml @@ -1,6 +1,8 @@ + + @@ -1102,6 +1104,8 @@ + + @@ -1152,6 +1156,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsHttpSupportPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsHttpSupportPlugin.xml index e12848ef833c..0599ed0a5ff2 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsHttpSupportPlugin.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsHttpSupportPlugin.xml @@ -1,6 +1,8 @@ + + @@ -429,6 +431,8 @@ + + @@ -463,6 +467,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJava.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJava.xml index e6d55a284e61..b4a29e10a1c7 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJava.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJava.xml @@ -1,6 +1,8 @@ + + @@ -162,6 +164,8 @@ + + @@ -190,6 +194,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJavaCore.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJavaCore.xml index 90675a64f037..a984fc49f951 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJavaCore.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJavaCore.xml @@ -1,6 +1,8 @@ + + @@ -138,6 +140,8 @@ + + @@ -163,6 +167,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJavaPlatform.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJavaPlatform.xml index 550ff90dce7e..199512b8f688 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJavaPlatform.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJavaPlatform.xml @@ -1,6 +1,8 @@ + + @@ -160,6 +162,8 @@ + + @@ -186,6 +190,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsKotlinPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsKotlinPlugin.xml index 72bc549d27e5..6fade950ad50 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsKotlinPlugin.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsKotlinPlugin.xml @@ -1,6 +1,8 @@ + + @@ -1223,6 +1225,8 @@ + + @@ -1264,6 +1268,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMakePlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMakePlugin.xml index ce0de13d0f5e..5de2e23a9783 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMakePlugin.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMakePlugin.xml @@ -1,6 +1,8 @@ + + @@ -157,6 +159,8 @@ + + @@ -185,6 +189,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMigration.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMigration.xml index 29d0b39819f2..e51721dfab78 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMigration.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMigration.xml @@ -1,6 +1,8 @@ + + @@ -333,6 +335,8 @@ + + @@ -364,6 +368,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMigrationCore.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMigrationCore.xml index 93fd9e5ebea1..15abff940531 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMigrationCore.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMigrationCore.xml @@ -1,6 +1,8 @@ + + @@ -70,6 +72,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsNavigationBar.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsNavigationBar.xml index d36b55aa27f5..d335f2971a9d 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsNavigationBar.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsNavigationBar.xml @@ -1,6 +1,8 @@ + + @@ -69,6 +71,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsPlugins.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsPlugins.xml index a2af446f080d..7960086ac669 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsPlugins.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsPlugins.xml @@ -1,6 +1,8 @@ + + @@ -756,6 +758,8 @@ + + @@ -796,6 +800,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsSpellCheckPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsSpellCheckPlugin.xml index 928722aa713e..b437fd85e29b 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsSpellCheckPlugin.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsSpellCheckPlugin.xml @@ -1,6 +1,8 @@ + + @@ -120,6 +122,8 @@ + + @@ -146,6 +150,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsStandalone.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsStandalone.xml index c6f88c8cc942..a997f653bef6 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsStandalone.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsStandalone.xml @@ -1,6 +1,8 @@ + + @@ -115,6 +117,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTesting.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTesting.xml index 2d76839e4d93..da7b72b88293 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTesting.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTesting.xml @@ -1,6 +1,8 @@ + + @@ -1157,6 +1159,8 @@ + + @@ -1197,6 +1201,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTooltips.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTooltips.xml index 35307f31060a..32c5ad047641 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTooltips.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTooltips.xml @@ -1,6 +1,8 @@ + + @@ -266,6 +268,8 @@ + + @@ -295,6 +299,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTroveCollections.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTroveCollections.xml index a9c2848f90c1..f64882f04c63 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTroveCollections.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTroveCollections.xml @@ -1,6 +1,8 @@ + + @@ -260,6 +262,8 @@ + + @@ -288,6 +292,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsVcs.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsVcs.xml index 3b9d6230c5f0..eccb6ba18680 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsVcs.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsVcs.xml @@ -1,6 +1,8 @@ + + @@ -744,6 +746,8 @@ + + @@ -782,6 +786,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsVcsPlatform.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsVcsPlatform.xml index 849c8f29bceb..b10092ff2e43 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsVcsPlatform.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsVcsPlatform.xml @@ -1,6 +1,8 @@ + + @@ -138,6 +140,8 @@ + + @@ -153,6 +157,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsWorkbench.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsWorkbench.xml index d6966c11d674..8b9c7a22c2d9 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsWorkbench.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsWorkbench.xml @@ -1,6 +1,8 @@ + + @@ -363,6 +365,8 @@ + + @@ -392,6 +396,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestModules.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestModules.xml index b3873480831f..a39c715ee6e8 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestModules.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestModules.xml @@ -510,6 +510,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestRefactoring.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestRefactoring.xml index 64f6f7b2ac9a..56a10d88d0f7 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestRefactoring.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestRefactoring.xml @@ -203,6 +203,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/trace.info b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/trace.info index 39be3469ab19..8882d34b207f 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/trace.info +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/trace.info @@ -2,12 +2,12 @@ - + - + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsActions.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsActions.xml index 96c6b5b14754..5db8a565e485 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsActions.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsActions.xml @@ -161,6 +161,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBaseLanguage.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBaseLanguage.xml index 253d7d18d66d..b14609e75cb7 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBaseLanguage.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBaseLanguage.xml @@ -926,6 +926,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBehavior.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBehavior.xml index f02cb3e8b5d2..898654ceb131 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBehavior.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBehavior.xml @@ -722,6 +722,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBuild.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBuild.xml index 6bc1c810ace3..144cb557c832 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBuild.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBuild.xml @@ -227,6 +227,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConsole.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConsole.xml index f0fd4449e0aa..f5725acd94e8 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConsole.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConsole.xml @@ -189,6 +189,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConstraints.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConstraints.xml index 432461979af0..2deeee04f2f1 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConstraints.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConstraints.xml @@ -466,6 +466,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsDataFlow.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsDataFlow.xml index 6dbf35389415..17b46d761f3a 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsDataFlow.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsDataFlow.xml @@ -428,6 +428,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditor.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditor.xml index 9410902c9b20..2bc19c2e3a5b 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditor.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditor.xml @@ -1700,6 +1700,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorDiagram.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorDiagram.xml index d0584b8b608a..327446e3aab5 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorDiagram.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorDiagram.xml @@ -323,6 +323,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorImageGen.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorImageGen.xml index 29030cbd4514..65d033230f41 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorImageGen.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorImageGen.xml @@ -304,6 +304,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorTransformationMenu.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorTransformationMenu.xml index abaa7727fe89..96349e3529b7 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorTransformationMenu.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorTransformationMenu.xml @@ -1669,6 +1669,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsExecution.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsExecution.xml index 47d1592b663e..354e079df583 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsExecution.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsExecution.xml @@ -490,6 +490,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsFeedback.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsFeedback.xml index e917bf908f5a..e7d870233aa7 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsFeedback.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsFeedback.xml @@ -256,6 +256,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsGenerator.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsGenerator.xml index 1a83fccc298b..8de52acdf74e 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsGenerator.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsGenerator.xml @@ -1593,6 +1593,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsHttpSupport.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsHttpSupport.xml index c54e24f94a9b..d6462cb089bb 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsHttpSupport.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsHttpSupport.xml @@ -181,6 +181,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsImplementationStripping.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsImplementationStripping.xml index 281f00dd68a8..145fe66f7eb1 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsImplementationStripping.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsImplementationStripping.xml @@ -355,6 +355,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsJava.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsJava.xml index 5e44009462c8..64ce2af0a878 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsJava.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsJava.xml @@ -225,6 +225,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsKotlin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsKotlin.xml index 89e7e16fdcf3..923ab034a224 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsKotlin.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsKotlin.xml @@ -252,6 +252,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsMigrations.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsMigrations.xml index b6978a460f18..625a1931cfa3 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsMigrations.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsMigrations.xml @@ -154,6 +154,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsPackaged.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsPackaged.xml index 9484a543c4d2..d0ac9a88a272 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsPackaged.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsPackaged.xml @@ -267,6 +267,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml index 107d922d35f8..b57f4f03298d 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml @@ -403,6 +403,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSmartRefAttrMigration.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSmartRefAttrMigration.xml index 1797b022168a..23b981347741 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSmartRefAttrMigration.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSmartRefAttrMigration.xml @@ -160,6 +160,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTest.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTest.xml index 96eeed534e95..ef6170c3cca3 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTest.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTest.xml @@ -1128,6 +1128,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsText.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsText.xml index 339ee7c13b16..84052913c468 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsText.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsText.xml @@ -153,6 +153,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsToolTests.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsToolTests.xml index 02adc4c55e4a..a0b3d5158ad4 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsToolTests.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsToolTests.xml @@ -218,6 +218,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTypesystem.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTypesystem.xml index 3dbfa4f8a712..f91406348266 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTypesystem.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTypesystem.xml @@ -975,6 +975,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsVCS.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsVCS.xml index 93c972b4560e..f8a43f3f6a17 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsVCS.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsVCS.xml @@ -3,6 +3,8 @@ + + @@ -89,6 +91,8 @@ + + @@ -118,6 +122,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info index 301bf213bfdd..d13bff2892cf 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info @@ -2,137 +2,137 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info index dcf8ef6e9678..7f48d691211a 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info @@ -2,47 +2,47 @@ - + - + - + - + - + - + - + - + - + @@ -57,57 +57,57 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -117,7 +117,7 @@ - + @@ -127,17 +127,17 @@ - + - + - + @@ -147,32 +147,32 @@ - + - + - + - + - + - + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsEditorTestsPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsEditorTestsPlugin.xml index 40208fa28b4b..f5016a117f5e 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsEditorTestsPlugin.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsEditorTestsPlugin.xml @@ -1,6 +1,8 @@ + + @@ -53,6 +55,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsIdeaMigration.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsIdeaMigration.xml index b03ce2b2c387..d5ae7de03afa 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsIdeaMigration.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsIdeaMigration.xml @@ -1,6 +1,8 @@ + + @@ -177,6 +179,8 @@ + + @@ -202,6 +206,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsIdeaVcs.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsIdeaVcs.xml index d6567848ff9c..94c71d9a35cd 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsIdeaVcs.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsIdeaVcs.xml @@ -1,6 +1,8 @@ + + @@ -389,6 +391,8 @@ + + @@ -419,6 +423,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJavaIdeaPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJavaIdeaPlugin.xml index 8ac8e1b58c55..a9a8236056f2 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJavaIdeaPlugin.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJavaIdeaPlugin.xml @@ -1,6 +1,8 @@ + + @@ -88,6 +90,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJpsIdea.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJpsIdea.xml index 4c7752a9c5e6..59d2a7aea8f9 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJpsIdea.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJpsIdea.xml @@ -1,6 +1,8 @@ + + @@ -75,6 +77,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJpsIdeaJ8Compatibility.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJpsIdeaJ8Compatibility.xml index 945d45228ac6..3e218997da82 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJpsIdeaJ8Compatibility.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJpsIdeaJ8Compatibility.xml @@ -1,6 +1,8 @@ + + @@ -79,6 +81,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsPlugin.xml index 7e30678639f6..1bd458093d03 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsPlugin.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsPlugin.xml @@ -1,6 +1,8 @@ + + @@ -95,6 +97,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsPluginTests.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsPluginTests.xml index 34a0c5689ddd..6c2d510a3091 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsPluginTests.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsPluginTests.xml @@ -1,6 +1,8 @@ + + @@ -129,6 +131,8 @@ + + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/trace.info b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/trace.info index b6c412acf65f..20d1e1edac60 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/trace.info +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/trace.info @@ -7,7 +7,7 @@ - + @@ -17,22 +17,22 @@ - + - + - + - + @@ -42,17 +42,17 @@ - + - + - + diff --git a/samples/customAspect/build.xml b/samples/customAspect/build.xml index 973d6d524826..6d120d2b5719 100644 --- a/samples/customAspect/build.xml +++ b/samples/customAspect/build.xml @@ -1,6 +1,8 @@ + + @@ -492,6 +494,8 @@ + + @@ -527,6 +531,8 @@ + + diff --git a/samples/customAspect/solutions/SampleCustomAspect.build/source_gen/SampleCustomAspect/build/SampleCustomAspect.xml b/samples/customAspect/solutions/SampleCustomAspect.build/source_gen/SampleCustomAspect/build/SampleCustomAspect.xml index 973d6d524826..6d120d2b5719 100644 --- a/samples/customAspect/solutions/SampleCustomAspect.build/source_gen/SampleCustomAspect/build/SampleCustomAspect.xml +++ b/samples/customAspect/solutions/SampleCustomAspect.build/source_gen/SampleCustomAspect/build/SampleCustomAspect.xml @@ -1,6 +1,8 @@ + + @@ -492,6 +494,8 @@ + + @@ -527,6 +531,8 @@ + + diff --git a/samples/customAspect/solutions/SampleCustomAspect.build/source_gen/SampleCustomAspect/build/trace.info b/samples/customAspect/solutions/SampleCustomAspect.build/source_gen/SampleCustomAspect/build/trace.info index 14473283c2c8..00c9aab21927 100644 --- a/samples/customAspect/solutions/SampleCustomAspect.build/source_gen/SampleCustomAspect/build/trace.info +++ b/samples/customAspect/solutions/SampleCustomAspect.build/source_gen/SampleCustomAspect/build/trace.info @@ -2,7 +2,7 @@ - + diff --git a/samples/notesOrganizer/build.xml b/samples/notesOrganizer/build.xml index 79e3b13f2bee..5e46167cbe7b 100644 --- a/samples/notesOrganizer/build.xml +++ b/samples/notesOrganizer/build.xml @@ -1,6 +1,8 @@ + + @@ -245,6 +247,8 @@ + + @@ -269,6 +273,8 @@ + + diff --git a/samples/notesOrganizer/solutions/jetbrains.mps.samples.notesOrganizer.build/source_gen/jetbrains/mps/samples/notesOrganizer/build/notesOrganizer.xml b/samples/notesOrganizer/solutions/jetbrains.mps.samples.notesOrganizer.build/source_gen/jetbrains/mps/samples/notesOrganizer/build/notesOrganizer.xml index 79e3b13f2bee..5e46167cbe7b 100644 --- a/samples/notesOrganizer/solutions/jetbrains.mps.samples.notesOrganizer.build/source_gen/jetbrains/mps/samples/notesOrganizer/build/notesOrganizer.xml +++ b/samples/notesOrganizer/solutions/jetbrains.mps.samples.notesOrganizer.build/source_gen/jetbrains/mps/samples/notesOrganizer/build/notesOrganizer.xml @@ -1,6 +1,8 @@ + + @@ -245,6 +247,8 @@ + + @@ -269,6 +273,8 @@ + + diff --git a/samples/notesOrganizer/solutions/jetbrains.mps.samples.notesOrganizer.build/source_gen/jetbrains/mps/samples/notesOrganizer/build/trace.info b/samples/notesOrganizer/solutions/jetbrains.mps.samples.notesOrganizer.build/source_gen/jetbrains/mps/samples/notesOrganizer/build/trace.info index 800666c527c8..33702752689f 100644 --- a/samples/notesOrganizer/solutions/jetbrains.mps.samples.notesOrganizer.build/source_gen/jetbrains/mps/samples/notesOrganizer/build/trace.info +++ b/samples/notesOrganizer/solutions/jetbrains.mps.samples.notesOrganizer.build/source_gen/jetbrains/mps/samples/notesOrganizer/build/trace.info @@ -2,7 +2,7 @@ - + diff --git a/samples/propertyPersistence/build.xml b/samples/propertyPersistence/build.xml index 3c24f93ca4cf..b88574e2e63d 100644 --- a/samples/propertyPersistence/build.xml +++ b/samples/propertyPersistence/build.xml @@ -1,6 +1,8 @@ + + @@ -354,6 +356,8 @@ + + @@ -381,6 +385,8 @@ + + diff --git a/samples/propertyPersistence/solutions/jetbrains.mps.samples.propertyPersistence.build/source_gen/build/propertyPersistence.xml b/samples/propertyPersistence/solutions/jetbrains.mps.samples.propertyPersistence.build/source_gen/build/propertyPersistence.xml index 3c24f93ca4cf..b88574e2e63d 100644 --- a/samples/propertyPersistence/solutions/jetbrains.mps.samples.propertyPersistence.build/source_gen/build/propertyPersistence.xml +++ b/samples/propertyPersistence/solutions/jetbrains.mps.samples.propertyPersistence.build/source_gen/build/propertyPersistence.xml @@ -1,6 +1,8 @@ + + @@ -354,6 +356,8 @@ + + @@ -381,6 +385,8 @@ + + diff --git a/samples/propertyPersistence/solutions/jetbrains.mps.samples.propertyPersistence.build/source_gen/build/trace.info b/samples/propertyPersistence/solutions/jetbrains.mps.samples.propertyPersistence.build/source_gen/build/trace.info index 4b2f47bf46c6..15da4cb483a9 100644 --- a/samples/propertyPersistence/solutions/jetbrains.mps.samples.propertyPersistence.build/source_gen/build/trace.info +++ b/samples/propertyPersistence/solutions/jetbrains.mps.samples.propertyPersistence.build/source_gen/build/trace.info @@ -2,7 +2,7 @@ - + diff --git a/samples/sampleJavaExtensions/solutions/Build/source_gen/org/jetbrains/mps/samples/Build/build/buildOfSampleJavaExtensions.xml b/samples/sampleJavaExtensions/solutions/Build/source_gen/org/jetbrains/mps/samples/Build/build/buildOfSampleJavaExtensions.xml index 52f99d55c8a0..e8dba8567045 100644 --- a/samples/sampleJavaExtensions/solutions/Build/source_gen/org/jetbrains/mps/samples/Build/build/buildOfSampleJavaExtensions.xml +++ b/samples/sampleJavaExtensions/solutions/Build/source_gen/org/jetbrains/mps/samples/Build/build/buildOfSampleJavaExtensions.xml @@ -1,6 +1,8 @@ + + @@ -789,6 +791,8 @@ + + @@ -820,6 +824,8 @@ + + diff --git a/samples/sampleJavaExtensions/solutions/Build/source_gen/org/jetbrains/mps/samples/Build/build/trace.info b/samples/sampleJavaExtensions/solutions/Build/source_gen/org/jetbrains/mps/samples/Build/build/trace.info index 726f973940db..9d4d2c3f8bb9 100644 --- a/samples/sampleJavaExtensions/solutions/Build/source_gen/org/jetbrains/mps/samples/Build/build/trace.info +++ b/samples/sampleJavaExtensions/solutions/Build/source_gen/org/jetbrains/mps/samples/Build/build/trace.info @@ -2,7 +2,7 @@ - + diff --git a/samples/xmlPersistence/build.xml b/samples/xmlPersistence/build.xml index 8ab29f49d221..469256ba7c1e 100644 --- a/samples/xmlPersistence/build.xml +++ b/samples/xmlPersistence/build.xml @@ -1,6 +1,8 @@ + + @@ -148,6 +150,8 @@ + + @@ -176,6 +180,8 @@ + + diff --git a/samples/xmlPersistence/languages/jetbrains.mps.samples.xmlPersistence.build/source_gen/jetbrains/mps/samples/xmlPersistence/build/trace.info b/samples/xmlPersistence/languages/jetbrains.mps.samples.xmlPersistence.build/source_gen/jetbrains/mps/samples/xmlPersistence/build/trace.info index 41828f57629d..c6d99a335849 100644 --- a/samples/xmlPersistence/languages/jetbrains.mps.samples.xmlPersistence.build/source_gen/jetbrains/mps/samples/xmlPersistence/build/trace.info +++ b/samples/xmlPersistence/languages/jetbrains.mps.samples.xmlPersistence.build/source_gen/jetbrains/mps/samples/xmlPersistence/build/trace.info @@ -2,7 +2,7 @@ - + diff --git a/samples/xmlPersistence/languages/jetbrains.mps.samples.xmlPersistence.build/source_gen/jetbrains/mps/samples/xmlPersistence/build/xmlPersistencePlugin.xml b/samples/xmlPersistence/languages/jetbrains.mps.samples.xmlPersistence.build/source_gen/jetbrains/mps/samples/xmlPersistence/build/xmlPersistencePlugin.xml index 8ab29f49d221..469256ba7c1e 100644 --- a/samples/xmlPersistence/languages/jetbrains.mps.samples.xmlPersistence.build/source_gen/jetbrains/mps/samples/xmlPersistence/build/xmlPersistencePlugin.xml +++ b/samples/xmlPersistence/languages/jetbrains.mps.samples.xmlPersistence.build/source_gen/jetbrains/mps/samples/xmlPersistence/build/xmlPersistencePlugin.xml @@ -1,6 +1,8 @@ + + @@ -148,6 +150,8 @@ + + @@ -176,6 +180,8 @@ + + diff --git a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test1.xml b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test1.xml index c53460c86c2e..1787a4d858a8 100644 --- a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test1.xml +++ b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test1.xml @@ -3,6 +3,8 @@ + + @@ -86,6 +88,8 @@ + + @@ -113,6 +117,8 @@ + + diff --git a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test2.xml b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test2.xml index 546b04134f71..8aeb3896d9ab 100644 --- a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test2.xml +++ b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test2.xml @@ -3,6 +3,8 @@ + + @@ -124,6 +126,8 @@ + + @@ -152,6 +156,8 @@ + + diff --git a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test3.xml b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test3.xml index fe795ea6a372..5d8636dd6aac 100644 --- a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test3.xml +++ b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test3.xml @@ -3,6 +3,8 @@ + + @@ -91,6 +93,8 @@ + + @@ -118,6 +122,8 @@ + + diff --git a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test4.xml b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test4.xml index 38584d41928d..ca46efd0bc3d 100644 --- a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test4.xml +++ b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test4.xml @@ -3,6 +3,8 @@ + + @@ -140,6 +142,8 @@ + + @@ -168,6 +172,8 @@ + + diff --git a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test5.xml b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test5.xml index 625cb8bd10f6..705ac6479a84 100644 --- a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test5.xml +++ b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test5.xml @@ -3,6 +3,8 @@ + + @@ -139,6 +141,8 @@ + + @@ -167,6 +171,8 @@ + + diff --git a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/testDummyPlugin.xml b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/testDummyPlugin.xml index ea018bc9fd55..4e87f4bb0f06 100644 --- a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/testDummyPlugin.xml +++ b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/testDummyPlugin.xml @@ -3,6 +3,8 @@ + + @@ -95,6 +97,8 @@ + + @@ -122,6 +126,8 @@ + + diff --git a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/trace.info b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/trace.info index b8c8e6805417..dc1ce4033efb 100644 --- a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/trace.info +++ b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/trace.info @@ -2,32 +2,32 @@ - + - + - + - + - + - + diff --git a/testbench/modules/build.mps.runner.test/test1.xml b/testbench/modules/build.mps.runner.test/test1.xml index c53460c86c2e..1787a4d858a8 100644 --- a/testbench/modules/build.mps.runner.test/test1.xml +++ b/testbench/modules/build.mps.runner.test/test1.xml @@ -3,6 +3,8 @@ + + @@ -86,6 +88,8 @@ + + @@ -113,6 +117,8 @@ + + diff --git a/testbench/modules/build.mps.runner.test/test2.xml b/testbench/modules/build.mps.runner.test/test2.xml index 546b04134f71..8aeb3896d9ab 100644 --- a/testbench/modules/build.mps.runner.test/test2.xml +++ b/testbench/modules/build.mps.runner.test/test2.xml @@ -3,6 +3,8 @@ + + @@ -124,6 +126,8 @@ + + @@ -152,6 +156,8 @@ + + diff --git a/testbench/modules/build.mps.runner.test/test3.xml b/testbench/modules/build.mps.runner.test/test3.xml index fe795ea6a372..5d8636dd6aac 100644 --- a/testbench/modules/build.mps.runner.test/test3.xml +++ b/testbench/modules/build.mps.runner.test/test3.xml @@ -3,6 +3,8 @@ + + @@ -91,6 +93,8 @@ + + @@ -118,6 +122,8 @@ + + diff --git a/testbench/modules/build.mps.runner.test/test4.xml b/testbench/modules/build.mps.runner.test/test4.xml index 38584d41928d..ca46efd0bc3d 100644 --- a/testbench/modules/build.mps.runner.test/test4.xml +++ b/testbench/modules/build.mps.runner.test/test4.xml @@ -3,6 +3,8 @@ + + @@ -140,6 +142,8 @@ + + @@ -168,6 +172,8 @@ + + diff --git a/testbench/modules/build.mps.runner.test/test5.xml b/testbench/modules/build.mps.runner.test/test5.xml index 625cb8bd10f6..705ac6479a84 100644 --- a/testbench/modules/build.mps.runner.test/test5.xml +++ b/testbench/modules/build.mps.runner.test/test5.xml @@ -3,6 +3,8 @@ + + @@ -139,6 +141,8 @@ + + @@ -167,6 +171,8 @@ + + diff --git a/testbench/modules/build.mps.runner.test/testDummyPlugin.xml b/testbench/modules/build.mps.runner.test/testDummyPlugin.xml index ea018bc9fd55..4e87f4bb0f06 100644 --- a/testbench/modules/build.mps.runner.test/testDummyPlugin.xml +++ b/testbench/modules/build.mps.runner.test/testDummyPlugin.xml @@ -3,6 +3,8 @@ + + @@ -95,6 +97,8 @@ + + @@ -122,6 +126,8 @@ + + diff --git a/testbench/modules/xmodel.build/p1.xml b/testbench/modules/xmodel.build/p1.xml index a6ecae71486b..57acfcf863ed 100644 --- a/testbench/modules/xmodel.build/p1.xml +++ b/testbench/modules/xmodel.build/p1.xml @@ -1,6 +1,8 @@ + + @@ -216,6 +218,8 @@ + + @@ -245,6 +249,8 @@ + + diff --git a/testbench/modules/xmodel.build/p2.xml b/testbench/modules/xmodel.build/p2.xml index ac197174a812..6415e2f495dd 100644 --- a/testbench/modules/xmodel.build/p2.xml +++ b/testbench/modules/xmodel.build/p2.xml @@ -1,6 +1,8 @@ + + @@ -89,6 +91,8 @@ + + @@ -117,6 +121,8 @@ + + diff --git a/testbench/modules/xmodel.build/source_gen/jetbrains/mps/generator/xmodel/build/test/build/p1.xml b/testbench/modules/xmodel.build/source_gen/jetbrains/mps/generator/xmodel/build/test/build/p1.xml index a6ecae71486b..57acfcf863ed 100644 --- a/testbench/modules/xmodel.build/source_gen/jetbrains/mps/generator/xmodel/build/test/build/p1.xml +++ b/testbench/modules/xmodel.build/source_gen/jetbrains/mps/generator/xmodel/build/test/build/p1.xml @@ -1,6 +1,8 @@ + + @@ -216,6 +218,8 @@ + + @@ -245,6 +249,8 @@ + + diff --git a/testbench/modules/xmodel.build/source_gen/jetbrains/mps/generator/xmodel/build/test/build/p2.xml b/testbench/modules/xmodel.build/source_gen/jetbrains/mps/generator/xmodel/build/test/build/p2.xml index ac197174a812..6415e2f495dd 100644 --- a/testbench/modules/xmodel.build/source_gen/jetbrains/mps/generator/xmodel/build/test/build/p2.xml +++ b/testbench/modules/xmodel.build/source_gen/jetbrains/mps/generator/xmodel/build/test/build/p2.xml @@ -1,6 +1,8 @@ + + @@ -89,6 +91,8 @@ + + @@ -117,6 +121,8 @@ + + diff --git a/testbench/modules/xmodel.build/source_gen/jetbrains/mps/generator/xmodel/build/test/build/trace.info b/testbench/modules/xmodel.build/source_gen/jetbrains/mps/generator/xmodel/build/test/build/trace.info index c907fb960d6a..10c8666c5d52 100644 --- a/testbench/modules/xmodel.build/source_gen/jetbrains/mps/generator/xmodel/build/test/build/trace.info +++ b/testbench/modules/xmodel.build/source_gen/jetbrains/mps/generator/xmodel/build/test/build/trace.info @@ -2,12 +2,12 @@ - + - +