Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge remote-tracking branch 'origin/master' into scrum/IntegrateRefa…

…ctorings

Conflicts:
	.idea/compiler.xml
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/actions/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/constraints/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/editor/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generator/java/closures/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generator/java/conceptFunctionDefaults/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generator/java/main/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generator/java/strings/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/intentions/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/plugin/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/textGen/generated
	languages/baseLanguage/baseLanguage/source_gen/jetbrains/mps/baseLanguage/textGen/trace.info
	languages/languageDesign/refactoring/source_gen.caches/jetbrains/mps/lang/refactoring/generator/baseLanguage/template/main/generated
	languages/languageDesign/structure/solutions/pluginSolution/source_gen.caches/jetbrains/mps/lang/structure/pluginSolution/plugin/generated
	languages/languageDesign/test/solutions/jetbrains.mps.lang.test.runtime/source_gen.caches/jetbrains/mps/lang/test/runtime/generated
	plugins/build-deprecated/languages/solutions/jetbrains.mps.buildlanguage.execution/models/jetbrains/mps/build/deprecated/execution.mps
	plugins/mpsbuild/languages/build/source_gen.caches/jetbrains/mps/build/behavior/generated
	plugins/mpsbuild/languages/build/source_gen.caches/jetbrains/mps/build/generated
	plugins/mpsbuild/languages/build/source_gen.caches/jetbrains/mps/build/util/generated
	plugins/mpsbuild/languages/build/utilModels/jetbrains/mps/buildScript/util.mps
	plugins/mpsbuild/languages/solutions/jetbrains.mps.build.mps.runtime/models/jetbrains/mps/build/mps/runtime/anttask.mps
	plugins/mpsbuild/languages/solutions/jetbrains.mps.build.mps.runtime/source_gen.caches/jetbrains/mps/build/mps/runtime/anttask/generated
	plugins/mpsjava/platform/source_gen.caches/jetbrains/mps/ide/java/actions/generated
	plugins/mpsjava/platform/source_gen/jetbrains/mps/ide/java/actions/trace.info
	workbench/mps-platform/source_gen.caches/jetbrains/mps/ide/datatransfer/generated
	workbench/mps-platform/source_gen.caches/jetbrains/mps/ide/platform/actions/core/generated
	workbench/mps-platform/source_gen.caches/jetbrains/mps/ide/platform/actions/generated
	workbench/mps-platform/source_gen.caches/jetbrains/mps/ide/platform/modeltree/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/actions/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/common/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/dataFlow/presentation/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/depanalyzer/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/dependencyViewer/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/dialogs/project/creation/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/embeddableEditor/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/findusages/view/optionseditor/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/hierarchy/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/hierarchy/icons/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/hierarchy/toggle/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/newSolutionDialog/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/properties/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/refactoring/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/script/plugin/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/typesystem/trace/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/vcs/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/watching/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/workbench/dialogs/project/components/parts/actions/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/workbench/dialogs/project/components/parts/boundpanels/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/workbench/dialogs/project/components/parts/descriptors/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/workbench/dialogs/project/components/parts/diffrowtable/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/workbench/dialogs/project/components/parts/editors/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/workbench/dialogs/project/components/parts/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/workbench/dialogs/project/components/parts/lists/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/workbench/dialogs/project/components/parts/renderers/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/workbench/dialogs/project/components/parts/validators/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/workbench/dialogs/project/properties/project/generated
	workbench/mps-workbench/source_gen/jetbrains/mps/ide/actions/trace.info
  • Loading branch information...
commit 5fc9e1a11fb46951fea255e29f40c58f142e6d7b 2 parents 114975f + 13aeca3
alpushka alpushka authored

Showing 8,294 changed files with 12,614 additions and 38,074 deletions. Show diff stats Hide diff stats

  1. +1 0  .gitignore
  2. +8 0 .idea/ant.xml
  3. +34 0 .idea/compiler.xml
  4. +1 1  .idea/modules.xml
  5. +0 1  .idea/runConfigurations/ModuleTestSuite.xml
  6. +8 0 IdeaPlugin/build.xml
  7. +19 2 IdeaPlugin/buildPlugin.xml
  8. +2 1  IdeaPlugin/buildPluginDist.xml
  9. +2 1  IdeaPlugin/buildPluginTests.xml
  10. +1 1  IdeaPlugin/mps-core/src/jetbrains/mps/idea/core/make/MPSCompiler2.java
  11. +3 6 IdeaPlugin/mps-core/src/jetbrains/mps/idea/core/projectView/MPSProjectViewNode.java
  12. +1 1  IdeaPlugin/mps-core/testSrc/jetbrains/mps/idea/core/tests/EditorTests.java
  13. +3 0  IdeaPlugin/mps-vcs/META-INF/plugin.xml
  14. +1 0  IdeaPlugin/mps-vcs/mps-vcs.iml
  15. +70 0 IdeaPlugin/mps-vcs/source/jetbrains/mps/vcs/MergeDriverPackerImpl.java
  16. +44 57 MPS.mpr
  17. +1 1  about.txt
  18. +0 11 build/MPS-buildserver.xml
  19. +0 13,491 build/MPS-compile.xml
  20. +0 18 build/MPS-distribution.xml
  21. +0 1,002 build/MPS-external.xml
  22. +0 9,705 build/MPS-languages.xml
  23. +0 160 build/MPS-os-specific-default.xml
  24. +0 3  build/MPS-os-specific.properties
  25. +0 3  build/MPS.properties
  26. +0 12 build/branding_b1a.xml
  27. +5 5 build/build.xml
  28. +83 80 build/buildBuild.xml
  29. +37 30 build/buildBuildUI.xml
  30. +0 936 build/buildBuildlanguageDeprecated.xml
  31. +1 1  build/buildConnectorPlugin.xml
  32. +3 0  build/buildCore.xml
  33. +73 61 build/buildCoreEx.xml
  34. +0 797 build/buildCoreUI.xml
  35. +245 0 build/buildDates.xml
  36. +34 24 build/buildDebuggerPlugin.xml
  37. +895 0 build/buildDevKit.xml
  38. +57 57 build/buildDistribution.xml
  39. +1 1  build/buildExe.xml
  40. +0 240 build/buildExecution.xml
  41. +227 25 build/buildExecutionPlugin.xml
  42. +1,916 0 build/buildExperimental.xml
  43. +38 26 build/buildMPS.xml
  44. +1,050 0 build/buildObsolete.xml
  45. +16 62 build/buildPlugins.xml
  46. +173 0 build/buildTroveCollections.xml
  47. +0 1,094 build/buildUiLanguages.xml
  48. +0 1,807 build/buildUtilLanguages.xml
  49. +10 7 build/buildVcs.xml
  50. +281 2 build/buildWorkbench.xml
  51. +0 53 build/help-build.xml
  52. +1 0  build/solution/.idea/.name
  53. +7 0 build/solution/.idea/ant.xml
  54. +22 0 build/solution/.idea/compiler.xml
  55. +5 0 build/solution/.idea/copyright/profiles_settings.xml
  56. +5 0 build/solution/.idea/encodings.xml
  57. +31 0 build/solution/.idea/misc.xml
  58. +9 0 build/solution/.idea/modules.xml
  59. +5 0 build/solution/.idea/scopes/scope_settings.xml
  60. +125 0 build/solution/.idea/uiDesigner.xml
  61. +8 0 build/solution/.idea/vcs.xml
  62. +6,476 6,292 build/solution/models/build.mps
  63. +35 0 build/solution/mps-build.iml
  64. +5 5 build/solution/source_gen.caches/jetbrains/mps/ide/build/dependencies
  65. +60 63 build/solution/source_gen.caches/jetbrains/mps/ide/build/generated
  66. +83 80 build/solution/source_gen/jetbrains/mps/ide/build/buildBuild.xml
  67. +37 30 build/solution/source_gen/jetbrains/mps/ide/build/buildBuildUI.xml
  68. +0 936 build/solution/source_gen/jetbrains/mps/ide/build/buildBuildlanguageDeprecated.xml
  69. +1 1  build/solution/source_gen/jetbrains/mps/ide/build/buildConnectorPlugin.xml
  70. +3 0  build/solution/source_gen/jetbrains/mps/ide/build/buildCore.xml
  71. +73 61 build/solution/source_gen/jetbrains/mps/ide/build/buildCoreEx.xml
  72. +0 797 build/solution/source_gen/jetbrains/mps/ide/build/buildCoreUI.xml
  73. +245 0 build/solution/source_gen/jetbrains/mps/ide/build/buildDates.xml
  74. +34 24 build/solution/source_gen/jetbrains/mps/ide/build/buildDebuggerPlugin.xml
Sorry, we could not display the entire diff because too many files (8,294) changed.
1  .gitignore
@@ -3,6 +3,7 @@
3 3 .DS_Store
4 4 .idea/workspace.xml
5 5 .idea/inspectionProfiles
  6 +/build/solution/.idea/workspace.xml
6 7 /MPSPlugin/.idea/workspace.xml
7 8 /MPSPlugin/apiclasses
8 9 /IdeaPlugin/.idea/workspace.xml
8 .idea/ant.xml
@@ -10,6 +10,14 @@
10 10 <maximumStackSize value="2" />
11 11 <properties />
12 12 </buildFile>
  13 + <buildFile url="file://$PROJECT_DIR$/build/build.xml">
  14 + <additionalClassPath />
  15 + <antReference projectDefault="true" />
  16 + <customJdkName value="" />
  17 + <maximumHeapSize value="128" />
  18 + <maximumStackSize value="2" />
  19 + <properties />
  20 + </buildFile>
13 21 </component>
14 22 </project>
15 23
34 .idea/compiler.xml
@@ -311,6 +311,40 @@
311 311 <directory url="file://$PROJECT_DIR$/plugins/build-deprecated/languages/generictasks/solutions/pluginSolution/source_gen" includeSubdirectories="true" />
312 312 <directory url="file://$PROJECT_DIR$/plugins/build-deprecated/languages/packaging/solutions/pluginSolution/source_gen" includeSubdirectories="true" />
313 313 <directory url="file://$PROJECT_DIR$/plugins/build-deprecated/languages/packmps/solutions/pluginSolution/source_gen" includeSubdirectories="true" />
  314 + <directory url="file://$PROJECT_DIR$/plugins/mps-obsolete/languages/buildlanguage/source_gen" includeSubdirectories="true" />
  315 + <directory url="file://$PROJECT_DIR$/plugins/mps-obsolete/languages/custommps/source_gen" includeSubdirectories="true" />
  316 + <directory url="file://$PROJECT_DIR$/plugins/mps-obsolete/languages/dependency/source_gen" includeSubdirectories="true" />
  317 + <directory url="file://$PROJECT_DIR$/plugins/mps-obsolete/languages/generictasks/source_gen" includeSubdirectories="true" />
  318 + <directory url="file://$PROJECT_DIR$/plugins/mps-obsolete/languages/packaging/source_gen" includeSubdirectories="true" />
  319 + <directory url="file://$PROJECT_DIR$/plugins/mps-obsolete/languages/packmps/source_gen" includeSubdirectories="true" />
  320 + <directory url="file://$PROJECT_DIR$/plugins/mps-obsolete/languages/property/source_gen" includeSubdirectories="true" />
  321 + <directory url="file://$PROJECT_DIR$/plugins/mps-obsolete/languages/solutions/jetbrains.mps.buildlangauge.mpsautobuild/source_gen" includeSubdirectories="true" />
  322 + <directory url="file://$PROJECT_DIR$/plugins/mps-obsolete/languages/custommps/solutions/pluginSolution/source_gen" includeSubdirectories="true" />
  323 + <directory url="file://$PROJECT_DIR$/plugins/mps-obsolete/languages/generictasks/solutions/pluginSolution/source_gen" includeSubdirectories="true" />
  324 + <directory url="file://$PROJECT_DIR$/plugins/mps-obsolete/languages/packaging/solutions/pluginSolution/source_gen" includeSubdirectories="true" />
  325 + <directory url="file://$PROJECT_DIR$/plugins/mps-obsolete/languages/packmps/solutions/pluginSolution/source_gen" includeSubdirectories="true" />
  326 + <directory url="file://$PROJECT_DIR$/plugins/mps-build/temp/jetbrains.mps.build.pluginSolution/source_gen" includeSubdirectories="true" />
  327 + <directory url="file://$PROJECT_DIR$/plugins/mps-build/languages/workflow/source_gen" includeSubdirectories="true" />
  328 + <directory url="file://$PROJECT_DIR$/plugins/mps-build/languages/solutions/jetbrains.mps.build.sandbox/source_gen" includeSubdirectories="true" />
  329 + <directory url="file://$PROJECT_DIR$/plugins/mps-build/languages/solutions/jetbrains.mps.build.tests/test_gen" includeSubdirectories="true" />
  330 + <directory url="file://$PROJECT_DIR$/plugins/mps-build/languages/solutions/jetbrains.mps.build.mps.pluginSolution/source_gen" includeSubdirectories="true" />
  331 + <directory url="file://$PROJECT_DIR$/plugins/mps-build/languages/mps/source_gen" includeSubdirectories="true" />
  332 + <directory url="file://$PROJECT_DIR$/plugins/mps-build/languages/deploySolution/source_gen" includeSubdirectories="true" />
  333 + <directory url="file://$PROJECT_DIR$/plugins/mps-build/languages/build/source_gen" includeSubdirectories="true" />
  334 + <directory url="file://$PROJECT_DIR$/plugins/mps-build/pluginSolutions/jetbrains.mps.build.mps.pluginSolution/source_gen" includeSubdirectories="true" />
  335 + <directory url="file://$PROJECT_DIR$/plugins/mps-build/pluginSolutions/jetbrains.mps.build.pluginSolution/source_gen" includeSubdirectories="true" />
  336 + <directory url="file://$PROJECT_DIR$/plugins/execution-languages/languages/common/source_gen" includeSubdirectories="true" />
  337 + <directory url="file://$PROJECT_DIR$/plugins/execution-languages/languages/settings/source_gen" includeSubdirectories="true" />
  338 + <directory url="file://$PROJECT_DIR$/plugins/mpsdevkit/languages/solutions/jetbrains.mps.baseLanguage.pluginSolution/source_gen" includeSubdirectories="true" />
  339 + <directory url="file://$PROJECT_DIR$/plugins/mpsdevkit/languages/solutions/jetbrains.mps.lang.dataFlow.pluginSolution/source_gen" includeSubdirectories="true" />
  340 + <directory url="file://$PROJECT_DIR$/testbench/languages/source_gen" includeSubdirectories="true" />
  341 + <directory url="file://$PROJECT_DIR$/testbench/languages/solutions/pluginSolution/source_gen" includeSubdirectories="true" />
  342 + <directory url="file://$PROJECT_DIR$/plugins/mps-build/languages/build.mps/source_gen" includeSubdirectories="true" />
  343 + <directory url="file://$PROJECT_DIR$/plugins/mps-build/languages/bash/source_gen" includeSubdirectories="true" />
  344 + <directory url="file://$PROJECT_DIR$/plugins/mps-build/languages/build.startup/source_gen" includeSubdirectories="true" />
  345 + <directory url="file://$PROJECT_DIR$/plugins/mps-build/languages/build.workflow/source_gen" includeSubdirectories="true" />
  346 + <directory url="file://$PROJECT_DIR$/plugins/mps-build/languages/solutions/jetbrains.mps.build.mps.runtime/source_gen" includeSubdirectories="true" />
  347 + <directory url="file://$PROJECT_DIR$/plugins/mps-build/languages/solutions/jetbrains.mps.build.pluginSolution/source_gen" includeSubdirectories="true" />
314 348 </excludeFromCompile>
315 349 <resourceExtensions>
316 350 <entry name=".+\.(properties|xml|html|dtd|tld)" />
2  .idea/modules.xml
@@ -10,7 +10,7 @@
10 10 <module fileurl="file://$PROJECT_DIR$/core/ant/ant.iml" filepath="$PROJECT_DIR$/core/ant/ant.iml" group="languages" />
11 11 <module fileurl="file://$PROJECT_DIR$/languages/baseLanguage/baseLanguage/solutions/jetbrains.mps.baseLanguage.search/baseLanguage-search.iml" filepath="$PROJECT_DIR$/languages/baseLanguage/baseLanguage/solutions/jetbrains.mps.baseLanguage.search/baseLanguage-search.iml" group="languages" />
12 12 <module fileurl="file://$PROJECT_DIR$/languages/baseLanguage/baseLanguage/solutions/jetbrains.mps.baseLanguage.util/baseLanguage-util.iml" filepath="$PROJECT_DIR$/languages/baseLanguage/baseLanguage/solutions/jetbrains.mps.baseLanguage.util/baseLanguage-util.iml" group="languages" />
13   - <module fileurl="file://$PROJECT_DIR$/plugins/build-deprecated/languages/solutions/jetbrains.mps.buildlanguage.execution/build-deprecated.iml" filepath="$PROJECT_DIR$/plugins/build-deprecated/languages/solutions/jetbrains.mps.buildlanguage.execution/build-deprecated.iml" />
  13 + <module fileurl="file://$PROJECT_DIR$/plugins/mps-obsolete/languages/solutions/jetbrains.mps.buildlanguage.execution/build-deprecated.iml" filepath="$PROJECT_DIR$/plugins/mps-obsolete/languages/solutions/jetbrains.mps.buildlanguage.execution/build-deprecated.iml" />
14 14 <module fileurl="file://$PROJECT_DIR$/languages/baseLanguage/collections/runtime/collections-runtime.iml" filepath="$PROJECT_DIR$/languages/baseLanguage/collections/runtime/collections-runtime.iml" group="languages" />
15 15 <module fileurl="file://$PROJECT_DIR$/plugins/debugger-api/api/debugger-api-api.iml" filepath="$PROJECT_DIR$/plugins/debugger-api/api/debugger-api-api.iml" group="plugins/debugger/debugger-api" />
16 16 <module fileurl="file://$PROJECT_DIR$/plugins/debugger-api/runtime/debugger-api-runtime.iml" filepath="$PROJECT_DIR$/plugins/debugger-api/runtime/debugger-api-runtime.iml" group="plugins/debugger/debugger-api" />
1  .idea/runConfigurations/ModuleTestSuite.xml
@@ -21,7 +21,6 @@
21 21 </envs>
22 22 <patterns>
23 23 <pattern testClass="ModuleTestSuite" />
24   - <pattern testClass="MpsAutobuildTest" />
25 24 <pattern testClass="ExtensionTests" />
26 25 </patterns>
27 26 <RunnerSettings RunnerId="Debug">
8 IdeaPlugin/build.xml
@@ -52,6 +52,14 @@
52 52 <property name="build.dir" location="${build.home}"/>
53 53 <property name="idea_home" location="${home.idea_ce}"/>
54 54 </ant>
  55 + <ant antfile="../build/buildCoreEx.xml" inheritAll="false" useNativeBasedir="true">
  56 + <property name="build.dir" location="${build.home}"/>
  57 + <property name="idea_home" location="${home.idea_ce}"/>
  58 + </ant>
  59 + <ant antfile="../build/buildBuild.xml" inheritAll="false" useNativeBasedir="true">
  60 + <property name="build.dir" location="${build.home}"/>
  61 + <property name="idea_home" location="${home.idea_ce}"/>
  62 + </ant>
55 63 </target>
56 64
57 65 <target name="build" depends="buildCore">
21 IdeaPlugin/buildPlugin.xml
@@ -9,7 +9,11 @@
9 9 <property name="idea_home" location="" />
10 10 <property name="mps_home" location="${basedir}" />
11 11 <property name="artifacts.buildCore" location="${build.dir}/artifacts/buildCore" />
  12 + <property name="artifacts.buildCoreEx" location="${build.dir}/artifacts/buildCoreEx" />
  13 + <property name="artifacts.buildBuild" location="${build.dir}/artifacts/buildBuild" />
12 14 <property name="artifacts.IDEA" location="${idea_home}" />
  15 + <property file="${artifacts.buildCore}/build.properties" prefix="import.buildCore" />
  16 + <property name="buildCore.version" value="${import.buildCore.buildCore.version}" />
13 17
14 18 <path id="path.javac2.classpath">
15 19 <fileset dir="${idea_home}/lib">
@@ -35,6 +39,12 @@
35 39 <copy todir="${build.layout}/plugins/mps-core/languages">
36 40 <fileset dir="${artifacts.buildCore}/mps-core/languages" />
37 41 </copy>
  42 + <copy todir="${build.layout}/plugins/mps-core/languages">
  43 + <fileset dir="${artifacts.buildCoreEx}/languages" />
  44 + </copy>
  45 + <copy todir="${build.layout}/plugins/mps-core/languages">
  46 + <fileset dir="${artifacts.buildCoreEx}/plugins/mps-core/languages" />
  47 + </copy>
38 48 <mkdir dir="${build.layout}/plugins/mps-core/lib" />
39 49 <copy file="${artifacts.buildCore}/mps-core/lib/asm.jar" todir="${build.layout}/plugins/mps-core/lib" />
40 50 <copy file="${artifacts.buildCore}/mps-core/lib/diffutils-1.2.1.jar" todir="${build.layout}/plugins/mps-core/lib" />
@@ -71,7 +81,7 @@
71 81 <zipfileset file="${mps_home}/workbench/mps-editor/source/META-INF/MPSEditor.xml" prefix="META-INF" />
72 82 <fileset dir="${build.tmp}/default/mps-plugin.jar" />
73 83 </jar>
74   - <echo file="${build.layout}/plugins/mps-core/build.number">plugin.version=${plugin.version}</echo>
  84 + <echo file="${build.layout}/plugins/mps-core/build.number">version=${buildCore.version}${line.separator}plugin.version=${plugin.version}</echo>
75 85 <mkdir dir="${build.layout}/plugins/mps-vcs" />
76 86 <mkdir dir="${build.layout}/plugins/mps-vcs/lib" />
77 87 <jar destfile="${build.layout}/plugins/mps-vcs/lib/mps-vcs-core.jar">
@@ -94,6 +104,9 @@
94 104 <fileset dir="${build.tmp}/java/out/mps-vcs-platform" />
95 105 <fileset dir="${build.tmp}/default/mps-vcs-platform.jar" />
96 106 </jar>
  107 + <copy todir="${build.layout}/plugins">
  108 + <fileset dir="${artifacts.buildBuild}/plugins" />
  109 + </copy>
97 110 <mkdir dir="${build.tmp}/default/mps-java.jar" />
98 111 <mkdir dir="${build.tmp}/default/mps-java.jar/META-INF" />
99 112 <copy todir="${build.tmp}/default/mps-java.jar/META-INF">
@@ -111,11 +124,13 @@
111 124 <fileset dir="${build.tmp}/java/out/mps-java" />
112 125 <fileset dir="${build.tmp}/default/mps-java.jar" />
113 126 </jar>
114   - <echo file="${build.layout}/build.properties">buildPlugin.plugin.version=${plugin.version}${line.separator}buildPlugin.date=${date}</echo>
  127 + <echo file="${build.layout}/build.properties">buildPlugin.plugin.version=${plugin.version}${line.separator}buildPlugin.date=${date}${line.separator}buildCore.version=${buildCore.version}</echo>
115 128 </target>
116 129
117 130 <target name="buildDependents">
118 131 <ant antfile="build/buildCore.xml" inheritAll="false" useNativeBasedir="true" />
  132 + <ant antfile="build/buildCoreEx.xml" inheritAll="false" useNativeBasedir="true" />
  133 + <ant antfile="build/buildBuild.xml" inheritAll="false" useNativeBasedir="true" />
119 134 </target>
120 135
121 136 <target name="fetchDependencies" />
@@ -212,6 +227,7 @@
212 227 <src>
213 228 <path location="${mps_home}/plugins/vcs/common/source" />
214 229 <path location="${mps_home}/plugins/vcs/common/source_gen" />
  230 + <path location="${mps_home}/IdeaPlugin/mps-vcs/source" />
215 231 </src>
216 232 <classpath>
217 233 <fileset file="${artifacts.buildCore}/mps-core/lib/mps-closures.jar" />
@@ -240,6 +256,7 @@
240 256 <copy todir="${build.tmp}/java/out/mps-vcs-platform">
241 257 <fileset dir="${mps_home}/plugins/vcs/common/source" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
242 258 <fileset dir="${mps_home}/plugins/vcs/common/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
  259 + <fileset dir="${mps_home}/IdeaPlugin/mps-vcs/source" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
243 260 </copy>
244 261 </target>
245 262
3  IdeaPlugin/buildPluginDist.xml
@@ -6,12 +6,13 @@
6 6 <property file="${artifacts.buildPlugin}/build.properties" prefix="import.buildPlugin" />
7 7 <property name="buildPlugin.plugin.version" value="${import.buildPlugin.buildPlugin.plugin.version}" />
8 8 <property name="buildPlugin.date" value="${import.buildPlugin.buildPlugin.date}" />
  9 + <property name="buildCore.version" value="${import.buildPlugin.buildCore.version}" />
9 10
10 11 <target name="assemble" depends="fetchDependencies">
11 12 <zip destfile="${build.layout}/mps-core-${buildPlugin.plugin.version}.zip">
12 13 <fileset dir="${artifacts.buildPlugin}/plugins" />
13 14 </zip>
14   - <echo file="${build.layout}/build.properties">buildPlugin.plugin.version=${buildPlugin.plugin.version}${line.separator}buildPlugin.date=${buildPlugin.date}</echo>
  15 + <echo file="${build.layout}/build.properties">buildPlugin.plugin.version=${buildPlugin.plugin.version}${line.separator}buildPlugin.date=${buildPlugin.date}${line.separator}buildCore.version=${buildCore.version}</echo>
15 16 </target>
16 17
17 18 <target name="buildDependents">
3  IdeaPlugin/buildPluginTests.xml
@@ -9,6 +9,7 @@
9 9 <property file="${artifacts.buildPlugin}/build.properties" prefix="import.buildPlugin" />
10 10 <property name="buildPlugin.plugin.version" value="${import.buildPlugin.buildPlugin.plugin.version}" />
11 11 <property name="buildPlugin.date" value="${import.buildPlugin.buildPlugin.date}" />
  12 + <property name="buildCore.version" value="${import.buildPlugin.buildCore.version}" />
12 13
13 14 <path id="path.javac2.classpath">
14 15 <fileset dir="${idea_home}/lib">
@@ -66,7 +67,7 @@
66 67 <zipfileset file="${mps_home}/IdeaPlugin/tests/editorTests/models/test.mps" prefix="jetbrains/mps/idea/core/tests" />
67 68 <fileset dir="${build.tmp}/default/mps-plugin-tests.jar" />
68 69 </jar>
69   - <echo file="${build.layout}/build.properties">buildPlugin.plugin.version=${buildPlugin.plugin.version}${line.separator}buildPlugin.date=${buildPlugin.date}</echo>
  70 + <echo file="${build.layout}/build.properties">buildPlugin.plugin.version=${buildPlugin.plugin.version}${line.separator}buildPlugin.date=${buildPlugin.date}${line.separator}buildCore.version=${buildCore.version}</echo>
70 71 </target>
71 72
72 73 <target name="buildDependents">
2  IdeaPlugin/mps-core/src/jetbrains/mps/idea/core/make/MPSCompiler2.java
@@ -314,7 +314,7 @@ public ModelNodeNavigatable(String modelName, String nodeId, Module module) {
314 314
315 315 @Override
316 316 public void navigate(final boolean requestFocus) {
317   - ModelAccess.instance().runReadAction(new Runnable() {
  317 + ModelAccess.instance().runWriteInEDT(new Runnable() {
318 318 @Override
319 319 public void run() {
320 320 SModel model = lookupModel();
9 IdeaPlugin/mps-core/src/jetbrains/mps/idea/core/projectView/MPSProjectViewNode.java
@@ -25,9 +25,9 @@
25 25 import com.intellij.openapi.ui.Queryable;
26 26 import com.intellij.openapi.vcs.FileStatusManager;
27 27 import com.intellij.openapi.vfs.VirtualFile;
28   -import jetbrains.mps.ide.editor.MPSEditorOpener;
29 28 import jetbrains.mps.ide.icons.IconManager;
30 29 import jetbrains.mps.ide.project.ProjectHelper;
  30 +import jetbrains.mps.openapi.navigation.NavigationSupport;
31 31 import jetbrains.mps.project.ProjectOperationContext;
32 32 import jetbrains.mps.smodel.ModelAccess;
33 33 import jetbrains.mps.smodel.SNode;
@@ -121,16 +121,13 @@ private Color getNodeColor() {
121 121
122 122 @Override
123 123 public void navigate(final boolean requestFocus) {
124   - ModelAccess.instance().runReadInEDT(new Runnable() {
  124 + ModelAccess.instance().runWriteInEDT(new Runnable() {
125 125 public void run() {
126 126 SNode root = getValue().getNode();
127 127 if (root == null) return;
128 128
129 129 ProjectOperationContext context = new ProjectOperationContext(ProjectHelper.toMPSProject(getProject()));
130   -
131   - // TODO implement NavigationSupport!!!!! get rid of MPSEditorOpener
132   - new MPSEditorOpener(getProject()).openNode(root, context, requestFocus, false);
133   - // TODO use NavigationSupport.getInstance().openNode(context, root, requestFocus, true);
  130 + NavigationSupport.getInstance().openNode(context, root, requestFocus, false);
134 131 }
135 132 });
136 133 }
2  IdeaPlugin/mps-core/testSrc/jetbrains/mps/idea/core/tests/EditorTests.java
@@ -175,7 +175,7 @@ public void initTest(final TransformationTest btt, @NotNull String projectName,
175 175 UIUtil.invokeAndWaitIfNeeded(new Runnable() {
176 176 @Override
177 177 public void run() {
178   - ModelAccess.instance().runReadAction(new Runnable() {
  178 + ModelAccess.instance().runWriteAction(new Runnable() {
179 179 @Override
180 180 public void run() {
181 181 final ProjectOperationContext context = new ProjectOperationContext(
3  IdeaPlugin/mps-vcs/META-INF/plugin.xml
@@ -36,6 +36,9 @@
36 36 <component>
37 37 <implementation-class>jetbrains.mps.vcs.platform.integration.PluginVCSManager</implementation-class>
38 38 </component>
  39 + <component>
  40 + <implementation-class>jetbrains.mps.vcs.MergeDriverPackerImpl</implementation-class>
  41 + </component>
39 42 </application-components>
40 43 <extensions defaultExtensionNs="com.intellij">
41 44 <errorHandler implementation="jetbrains.mps.ide.blame.CharismaReporter"/>
1  IdeaPlugin/mps-vcs/mps-vcs.iml
@@ -7,6 +7,7 @@
7 7 <exclude-output />
8 8 <content url="file://$MODULE_DIR$">
9 9 <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
  10 + <sourceFolder url="file://$MODULE_DIR$/source" isTestSource="false" />
10 11 </content>
11 12 <content url="file://$MODULE_DIR$/../../plugins/vcs-core">
12 13 <sourceFolder url="file://$MODULE_DIR$/../../plugins/vcs-core/core/source_gen" isTestSource="false" />
70 IdeaPlugin/mps-vcs/source/jetbrains/mps/vcs/MergeDriverPackerImpl.java
... ... @@ -0,0 +1,70 @@
  1 +package jetbrains.mps.vcs;/*
  2 + * Copyright 2003-2012 JetBrains s.r.o.
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + */
  16 +
  17 +
  18 +import com.intellij.ide.plugins.IdeaPluginDescriptor;
  19 +import com.intellij.ide.plugins.PluginManager;
  20 +import com.intellij.openapi.components.ApplicationComponent;
  21 +import com.intellij.openapi.extensions.PluginId;
  22 +import jetbrains.mps.vcs.platform.mergedriver.MergeDriverPacker;
  23 +import org.jetbrains.annotations.NotNull;
  24 +
  25 +import java.io.File;
  26 +import java.util.LinkedHashSet;
  27 +import java.util.Set;
  28 +
  29 +public class MergeDriverPackerImpl extends MergeDriverPacker implements ApplicationComponent {
  30 +
  31 + private String getMPSCorePluginPath() {
  32 + IdeaPluginDescriptor mpsCorePlugin = PluginManager.getPlugin(PluginId.getId("jetbrains.mps.core"));
  33 + assert mpsCorePlugin != null;
  34 + return mpsCorePlugin.getPath().getPath();
  35 + }
  36 +
  37 +
  38 + @Override
  39 + public String getMPSCorePath() {
  40 + return getMPSCorePluginPath() + File.separator + "lib";
  41 + }
  42 +
  43 + @Override
  44 + protected Set<String> getClasspathInternal() {
  45 + Set<String> classpathItems = new LinkedHashSet<String>();
  46 + String mpsCorePluginPath = getMPSCorePluginPath();
  47 + for (String jar : mpsAddJars) {
  48 + classpathItems.add(mpsCorePluginPath + File.separator + "lib" + File.separator + jar);
  49 + }
  50 + classpathItems.add(mpsCorePluginPath + File.separator + "classes");
  51 + classpathItems.add(getVCSCorePluginPath() + File.separator + "classes");
  52 + return classpathItems;
  53 + }
  54 +
  55 + @Override
  56 + public void initComponent() {
  57 + MergeDriverPacker.setInstance(this);
  58 + }
  59 +
  60 + @Override
  61 + public void disposeComponent() {
  62 + MergeDriverPacker.setInstance(null);
  63 + }
  64 +
  65 + @NotNull
  66 + @Override
  67 + public String getComponentName() {
  68 + return "IDEA Plugin-specific Merge Driver Packer implementation";
  69 + }
  70 +}
101 MPS.mpr
@@ -25,20 +25,7 @@
25 25 </option>
26 26 </component>
27 27 <component name="MPSFavoritesManager">
28   - <favorites_list name="debugger">
29   - <favorite_root module_ref="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" />
30   - <favorite_root module_ref="25891414-2b70-48c7-b1cc-8dc0c127d669(jetbrains.mps.debugger.api.runtime)" />
31   - <favorite_root module_ref="cf8c9de5-1b4a-4dc8-8e6d-847159af31dd(jetbrains.mps.debugger.java.api)" />
32   - <favorite_root module_ref="167dd3d5-13fd-4ea5-bb59-2f029e49a227(jetbrains.mps.debugger.java.run.sandbox)" />
33   - <favorite_root module_ref="fcffe3cf-3ebc-4d3d-989b-2f30533bc904(jetbrains.mps.debugger.java.runtime)" />
34   - <favorite_root module_ref="70b17f0c-ff72-43e8-9468-eda69efb2b71(jetbrains.mps.debugger.java.runtime.tests)" />
35   - <favorite_root module_ref="9b67baf0-e986-49af-b77c-998667f458cb(jetbrains.mps.traceInfo)" />
36   - <favorite_root module_ref="415bc577-86ca-46a6-b873-4670fd19e169(jetbrains.mps.traceInfo.test)" />
37   - <favorite_root module_ref="fbc14279-5e2a-4c87-a5d1-5f7061e6c456(jetbrains.mps.debug.apiLang)" />
38   - <favorite_root module_ref="fa8aeae9-4df9-4e13-bfb1-9b04c67ddb77(jetbrains.mps.debug.customViewers)" />
39   - <favorite_root module_ref="7da4580f-9d75-4603-8162-51a896d78375(jetbrains.mps.debugger.java.evaluation)" />
40   - <favorite_root module_ref="80208897-4572-437d-b50e-8f050cba9566(jetbrains.mps.debugger.java.privateMembers)" />
41   - </favorites_list>
  28 + <favorites_list name="debugger" />
42 29 </component>
43 30 <component name="MPSProject">
44 31 <projectModules>
@@ -47,6 +34,9 @@
47 34 <modulePath path="${project}/core/analyzers/solutions/sandbox/sandbox.msd" folder="core.analyzers" />
48 35 <modulePath path="${project}/core/ant/jetbrains.mps.build.antsupport.msd" folder="core" />
49 36 <modulePath path="${project}/core/dependencies/dependencies.msd" folder="core" />
  37 + <modulePath path="${project}/core/devkits/jetbrains.mps.devkit.bootstrap-languages.devkit" folder="devkits" />
  38 + <modulePath path="${project}/core/devkits/jetbrains.mps.devkit.general-purpose.devkit" folder="devkits" />
  39 + <modulePath path="${project}/core/devkits/jetbrains.mps.devkit.language-design.devkit" folder="devkits" />
50 40 <modulePath path="${project}/core/findUsages-runtime/runtime.msd" folder="core" />
51 41 <modulePath path="${project}/core/generator/solutions/generator/jetbrains.mps.generator.msd" folder="core" />
52 42 <modulePath path="${project}/core/generator/solutions/tests/tests.msd" folder="core.generator" />
@@ -77,7 +67,6 @@
77 67 <modulePath path="${project}/languages/baseLanguage/baseLanguage/solutions/jetbrains.mps.baseLanguage.search/jetbrains.mps.baseLanguage.search.msd" folder="baseLanguage" />
78 68 <modulePath path="${project}/languages/baseLanguage/baseLanguage/solutions/jetbrains.mps.baseLanguage.unittest/jetbrains.mps.baseLanguage.unittest.msd" folder="baseLanguage.unitTest" />
79 69 <modulePath path="${project}/languages/baseLanguage/baseLanguage/solutions/jetbrains.mps.baseLanguage.util/util.msd" folder="baseLanguage" />
80   - <modulePath path="${project}/languages/baseLanguage/baseLanguage/solutions/pluginSolution/pluginSolution.msd" folder="baseLanguage" />
81 70 <modulePath path="${project}/languages/baseLanguage/baseLanguageInternal/baseLanguageInternal.mpl" folder="baseLanguage" />
82 71 <modulePath path="${project}/languages/baseLanguage/blTypes/blTypes.mpl" folder="baseLanguage" />
83 72 <modulePath path="${project}/languages/baseLanguage/checkDot/languages/checkedDots/checkedDots.mpl" folder="baseLanguage.checkedDots" />
@@ -135,7 +124,6 @@
135 124 <modulePath path="${project}/languages/languageDesign/checkedName/checkedName.mpl" folder="core.language-design" />
136 125 <modulePath path="${project}/languages/languageDesign/constraints/constraints.mpl" folder="core.language-design" />
137 126 <modulePath path="${project}/languages/languageDesign/dataFlow/dataFlow.mpl" folder="core.language-design" />
138   - <modulePath path="${project}/languages/languageDesign/dataFlow/solutions/pluginSolution/pluginSolution.msd" folder="core.language-design" />
139 127 <modulePath path="${project}/languages/languageDesign/editor/editor.mpl" folder="core.editor" />
140 128 <modulePath path="${project}/languages/languageDesign/editor/languages/editorTest/editorTest.mpl" folder="core.editor" />
141 129 <modulePath path="${project}/languages/languageDesign/editor/languages/table/runtime/jetbrains.mps.table.runtime.msd" folder="core.editor" />
@@ -201,9 +189,6 @@
201 189 <modulePath path="${project}/languages/languageDesign/typesystem/solutions/jetbrains.mps.bootstrap.helgins.sandbox/jetbrains.mps.bootstrap.helgins.sandbox.msd" folder="core.language-design" />
202 190 <modulePath path="${project}/languages/languageDesign/typesystem/solutions/pluginSolution/pluginSolution.msd" folder="core.language-design" />
203 191 <modulePath path="${project}/languages/languageDesign/typesystem/typesystem.mpl" folder="core.language-design" />
204   - <modulePath path="${project}/languages/mpsbuild/startup/startup.mpl" folder="build" />
205   - <modulePath path="${project}/languages/util/bash/languages/bash/bash.mpl" folder="languages.bash" />
206   - <modulePath path="${project}/languages/util/bash/solutions/jetbrains.mps.bash.sandbox/jetbrains.mps.bash.sandbox.msd" folder="languages.bash" />
207 192 <modulePath path="${project}/languages/util/builders/builders.mpl" folder="baseLanguage.builders" />
208 193 <modulePath path="${project}/languages/util/builders/sandbox/jetbrains.mps.builders.msd" folder="baseLanguage.builders" />
209 194 <modulePath path="${project}/languages/util/buildlanguage/languages/gentest/gentest.mpl" folder="languages.build" />
@@ -214,7 +199,6 @@
214 199 <modulePath path="${project}/languages/util/dates/dates.mpl" folder="baseLanguage.dates" />
215 200 <modulePath path="${project}/languages/util/dates/internal/internal.mpl" folder="baseLanguage.dates" />
216 201 <modulePath path="${project}/languages/util/dates/runtime/jetbrains.mps.baseLanguage.dates.runtime.msd" folder="baseLanguage.dates" />
217   - <modulePath path="${project}/languages/util/dates/solutions/pluginSolution/pluginSolution.msd" folder="baseLanguage.dates" />
218 202 <modulePath path="${project}/languages/util/dates/unittest/dates.msd" folder="baseLanguage.dates" />
219 203 <modulePath path="${project}/languages/util/extensionMethod/methodExtension.mpl" folder="baseLanguage.extensionMethods" />
220 204 <modulePath path="${project}/languages/util/extensionMethod/solutions/jetbrains.mps.baseLanguage.extensionMethods.sandbox/jetbrains.mps.baseLanguage.extensionMethods.sandbox.msd" folder="baseLanguage.extensionMethods" />
@@ -242,22 +226,13 @@
242 226 <modulePath path="${project}/languages/util/mps-lite/languages/mpslite/solutions/pluginSolution/pluginSolution.msd" folder="mpslite" />
243 227 <modulePath path="${project}/languages/util/mps-lite/languages/nanoj/nanoj.mpl" folder="samples" />
244 228 <modulePath path="${project}/languages/util/mps-lite/solutions/mpslite.sandbox/mpslite.sandbox.msd" folder="mpslite" />
245   - <modulePath path="${project}/languages/util/properties/properties.mpl" folder="build" />
246   - <modulePath path="${project}/languages/util/properties/sandbox/sandbox.msd" folder="build" />
247   - <modulePath path="${project}/languages/util/quickQueryLanguage/quickQueryLanguage.mpl" folder="core.language-design" />
248   - <modulePath path="${project}/languages/util/quickQueryLanguage/solutions/jetbrains.mps.quickQuery.runtime/jetbrains.mps.quickQuery.runtime.msd" folder="core.language-design" />
249   - <modulePath path="${project}/languages/util/quickQueryLanguage/solutions/pluginSolution/pluginSolution.msd" folder="core.language-design" />
250 229 <modulePath path="${project}/languages/util/regexp/regexp.mpl" folder="baseLanguage.regexp" />
251 230 <modulePath path="${project}/languages/util/regexp/solutions/jetbrains.mps.baseLanguage.regexp.runtime/jetbrains.mps.baseLanguage.regexp.runtime.msd" folder="baseLanguage.regexp" />
252 231 <modulePath path="${project}/languages/util/regexp/solutions/jetbrains.mps.regexp.examples/jetbrains.mps.regexp.examples.msd" folder="baseLanguage.regexp" />
253 232 <modulePath path="${project}/languages/util/regexp/solutions/jetbrains.mps.regexp.sandbox/jetbrains.mps.regexp.sandbox.msd" folder="baseLanguage.regexp" />
254 233 <modulePath path="${project}/languages/util/regexp/solutions/jetbrains.mps.regexp.unittest/jetbrains.mps.regexp.unittest.msd" folder="baseLanguage.regexp" />
255   - <modulePath path="${project}/languages/util/runConfigurations/languages/common/common.mpl" folder="languages.execution" />
256   - <modulePath path="${project}/languages/util/runConfigurations/languages/settings/settings.mpl" folder="languages.execution" />
257   - <modulePath path="${project}/languages/util/runConfigurations/languages/util/util.mpl" folder="languages.execution" />
258 234 <modulePath path="${project}/languages/util/runConfigurations/solutions/jetbrains.mps.execution.api/jetbrains.mps.execution.api.msd" folder="languages.execution" />
259 235 <modulePath path="${project}/languages/util/runConfigurations/solutions/jetbrains.mps.execution.impl/impl.msd" folder="languages.execution" />
260   - <modulePath path="${project}/languages/util/runConfigurations/solutions/jetbrains.mps.execution.sandbox/jetbrains.mps.execution.sandbox.msd" folder="languages.execution" />
261 236 <modulePath path="${project}/languages/util/ui/languages/gwt/gwt.mpl" folder="languages.ui" />
262 237 <modulePath path="${project}/languages/util/ui/languages/gwt/solutions/pluginSolution/pluginSolution.msd" folder="languages.ui" />
263 238 <modulePath path="${project}/languages/util/ui/languages/gwt/solutions/runtime/runtime.msd" folder="languages.ui" />
@@ -286,9 +261,6 @@
286 261 <modulePath path="${project}/languages/util/xml/xmlInternal/xmlInternal.mpl" folder="languages.xml" />
287 262 <modulePath path="${project}/languages/util/xml/xmlQuery/xmlQuery.mpl" folder="languages.xml" />
288 263 <modulePath path="${project}/languages/util/xml/xmlSchema/xmlSchema.mpl" folder="languages.xml" />
289   - <modulePath path="${project}/languages/util/xmlDeprecated/languageDescriptor.mpl" folder="languages.xml" />
290   - <modulePath path="${project}/languages/util/xmlDeprecated/solutions/jetbrains.mps.xml.sandbox/jetbrains.mps.xml.sandbox.msd" folder="languages.xml" />
291   - <modulePath path="${project}/languages/util/xmlDeprecated/solutions/pluginSolution/pluginSolution.msd" folder="languages.xml" />
292 264 <modulePath path="${project}/languages/util/xmlUnitTest/languages/xmlUnitTest/solutions/runtime/runtime.msd" folder="languages.xml" />
293 265 <modulePath path="${project}/languages/util/xmlUnitTest/languages/xmlUnitTest/xmlUnitTest.mpl" folder="languages.xml" />
294 266 <modulePath path="${project}/languages/util/xmlUnitTest/solutions/jetbrains.mps.xmlUnitTest.sandbox/jetbrains.mps.xmlUnitTest.sandbox.msd" folder="languages.xml" />
@@ -298,24 +270,10 @@
298 270 <modulePath path="${project}/languages/util/ypath/solutions/sandbox/sandbox.msd" folder="languages.ypath" />
299 271 <modulePath path="${project}/languages/util/ypath/solutions/test/test.msd" folder="languages.ypath" />
300 272 <modulePath path="${project}/languages/util/ypath/ypath.mpl" folder="languages.ypath" />
301   - <modulePath path="${project}/languages/xml/xml/sandbox/sandbox.msd" folder="build" />
302   - <modulePath path="${project}/languages/xml/xml/xml.mpl" folder="build" />
303   - <modulePath path="${project}/plugins/build-deprecated/languages/buildlanguage/buildlanguage.mpl" folder="languages.build" />
304   - <modulePath path="${project}/plugins/build-deprecated/languages/custommps/custommps.mpl" folder="languages.build" />
305   - <modulePath path="${project}/plugins/build-deprecated/languages/custommps/solutions/pluginSolution/pluginSolution.msd" folder="languages.build" />
306   - <modulePath path="${project}/plugins/build-deprecated/languages/dependency/dependency.mpl" folder="languages.build" />
307   - <modulePath path="${project}/plugins/build-deprecated/languages/generictasks/generictasks.mpl" folder="languages.build" />
308   - <modulePath path="${project}/plugins/build-deprecated/languages/generictasks/solutions/pluginSolution/pluginSolution.msd" folder="languages.build" />
309   - <modulePath path="${project}/plugins/build-deprecated/languages/packaging/packaging.mpl" folder="languages.build" />
310   - <modulePath path="${project}/plugins/build-deprecated/languages/packaging/solutions/pluginSolution/pluginSolution.msd" folder="languages.build" />
311   - <modulePath path="${project}/plugins/build-deprecated/languages/packmps/packmps.mpl" folder="languages.build" />
312   - <modulePath path="${project}/plugins/build-deprecated/languages/packmps/solutions/pluginSolution/pluginSolution.msd" folder="languages.build" />
313   - <modulePath path="${project}/plugins/build-deprecated/languages/property/property.mpl" folder="languages.build" />
314   - <modulePath path="${project}/plugins/build-deprecated/languages/solutions/jetbrains.mps.build.mpsautobuild.test/test.msd" folder="languages.build" />
315   - <modulePath path="${project}/plugins/build-deprecated/languages/solutions/jetbrains.mps.build.mpsdist/mpsdist.msd" folder="languages.build" />
316   - <modulePath path="${project}/plugins/build-deprecated/languages/solutions/jetbrains.mps.buildlangauge.mpsautobuild/jetbrains.mps.buildlangauge.mpsautobuild.msd" folder="languages.build" />
317   - <modulePath path="${project}/plugins/build-deprecated/languages/solutions/jetbrains.mps.buildlanguage.execution/execution.msd" folder="languages.build" />
318 273 <modulePath path="${project}/plugins/debugger-api/api/api.msd" folder="debugger.api" />
  274 + <modulePath path="${project}/plugins/debugger-api/languages/decision/jetbrains.mps.debugger.decisionTable/decisionTable.mpl" folder="debugger" />
  275 + <modulePath path="${project}/plugins/debugger-api/languages/decision/jetbrains.mps.debugger.decisionTable/runtime/runtime.msd" folder="debugger" />
  276 + <modulePath path="${project}/plugins/debugger-api/languages/decision/jetbrains.mps.debugger.decisionTable/sandbox/sandbox.msd" folder="debugger" />
319 277 <modulePath path="${project}/plugins/debugger-api/languages/jetbrains.mps.debugger.api.lang/api.mpl" folder="debugger.api" />
320 278 <modulePath path="${project}/plugins/debugger-api/languages/nanoc/nanoc/nanoc.mpl" folder="samples" />
321 279 <modulePath path="${project}/plugins/debugger-api/languages/nanoc/pluginSolution/pluginSolution.msd" folder="samples" />
@@ -337,28 +295,57 @@
337 295 <modulePath path="${project}/plugins/execution-configurations/languages/unitTests/runtime/jetbrains.mps.baseLanguage.unitTest.runtime.msd" folder="languages.execution.usages.unitTests" />
338 296 <modulePath path="${project}/plugins/execution-configurations/languages/unitTests/startup/startup.msd" folder="languages.execution.usages.unitTests" />
339 297 <modulePath path="${project}/plugins/execution-languages/languages/commands/commands.mpl" folder="languages.execution" />
  298 + <modulePath path="${project}/plugins/execution-languages/languages/common/common.mpl" folder="languages.execution" />
340 299 <modulePath path="${project}/plugins/execution-languages/languages/configurations/configurations.mpl" folder="languages.execution" />
341 300 <modulePath path="${project}/plugins/execution-languages/languages/configurations/solutions/pluginSolution/pluginSolution.msd" folder="languages.execution" />
342 301 <modulePath path="${project}/plugins/execution-languages/languages/demo/demo.mpl" folder="languages.execution.languages-plugin" />
343 302 <modulePath path="${project}/plugins/execution-languages/languages/demo/pluginSolution/pluginSolution.msd" folder="languages.execution.demo" />
344 303 <modulePath path="${project}/plugins/execution-languages/languages/deprecated.runtime/runtime.msd" folder="languages.execution.languages-plugin" />
345 304 <modulePath path="${project}/plugins/execution-languages/languages/deprecated/runConfigurations.mpl" folder="languages.execution.languages-plugin" />
  305 + <modulePath path="${project}/plugins/execution-languages/languages/jetbrains.mps.execution.sandbox/jetbrains.mps.execution.sandbox.msd" folder="languages.execution" />
346 306 <modulePath path="${project}/plugins/execution-languages/languages/library/jetbrains.mps.execution.lib.msd" folder="languages.execution.languages-plugin" />
347 307 <modulePath path="${project}/plugins/execution-languages/languages/plugin/languages.msd" folder="languages.execution.languages-plugin" />
  308 + <modulePath path="${project}/plugins/execution-languages/languages/settings/settings.mpl" folder="languages.execution" />
348 309 <modulePath path="${project}/plugins/execution-languages/languages/tests.data/data.msd" folder="languages.execution.languages-plugin" />
349 310 <modulePath path="${project}/plugins/execution-languages/languages/tests/tests.msd" folder="languages.execution.languages-plugin" />
  311 + <modulePath path="${project}/plugins/execution-languages/languages/util/util.mpl" folder="languages.execution" />
350 312 <modulePath path="${project}/plugins/ideaIntegration/jetbrains.mps.ideaIntegration.msd" folder="plugins" />
351 313 <modulePath path="${project}/plugins/migration/solution/jetbrains.mps.ide.migration.msd" folder="plugins" />
352 314 <modulePath path="${project}/plugins/migration25/solution/migration25.msd" folder="plugins" />
353 315 <modulePath path="${project}/plugins/modelchecker/solution/jetbrains.mps.ide.modelchecker.msd" folder="plugins" />
354   - <modulePath path="${project}/plugins/mpsbuild/languages/build.mps/mps.mpl" folder="build" />
355   - <modulePath path="${project}/plugins/mpsbuild/languages/build.workflow/workflow.mpl" folder="build" />
356   - <modulePath path="${project}/plugins/mpsbuild/languages/build/build.mpl" folder="build" />
357   - <modulePath path="${project}/plugins/mpsbuild/languages/solutions/jetbrains.mps.build.mps.pluginSolution/pluginSolution.msd" folder="build" />
358   - <modulePath path="${project}/plugins/mpsbuild/languages/solutions/jetbrains.mps.build.mps.runtime/runtime.msd" folder="build" />
359   - <modulePath path="${project}/plugins/mpsbuild/languages/solutions/jetbrains.mps.build.pluginSolution/pluginSolution.msd" folder="build" />
360   - <modulePath path="${project}/plugins/mpsbuild/languages/solutions/jetbrains.mps.build.sandbox/sandbox.msd" folder="build" />
361   - <modulePath path="${project}/plugins/mpsbuild/languages/solutions/jetbrains.mps.build.tests/tests.msd" folder="build" />
  316 + <modulePath path="${project}/plugins/mps-build/languages/bash/bash.mpl" folder="build" />
  317 + <modulePath path="${project}/plugins/mps-build/languages/bash/sandbox/jetbrains.mps.bash.sandbox.msd" folder="build" />
  318 + <modulePath path="${project}/plugins/mps-build/languages/build.mps/mps.mpl" folder="build" />
  319 + <modulePath path="${project}/plugins/mps-build/languages/build.startup/startup.mpl" folder="build" />
  320 + <modulePath path="${project}/plugins/mps-build/languages/build.workflow/workflow.mpl" folder="build" />
  321 + <modulePath path="${project}/plugins/mps-build/languages/build/build.mpl" folder="build" />
  322 + <modulePath path="${project}/plugins/mps-build/languages/solutions/jetbrains.mps.build.mps.runtime/runtime.msd" folder="build" />
  323 + <modulePath path="${project}/plugins/mps-build/languages/solutions/jetbrains.mps.build.sandbox/sandbox.msd" folder="build" />
  324 + <modulePath path="${project}/plugins/mps-build/languages/solutions/jetbrains.mps.build.tests/tests.msd" folder="build" />
  325 + <modulePath path="${project}/plugins/mps-build/pluginSolutions/jetbrains.mps.build.mps.pluginSolution/pluginSolution.msd" folder="build" />
  326 + <modulePath path="${project}/plugins/mps-build/pluginSolutions/jetbrains.mps.build.pluginSolution/pluginSolution.msd" folder="build" />
  327 + <modulePath path="${project}/plugins/mps-core/languages/core.properties/properties.mpl" folder="build" />
  328 + <modulePath path="${project}/plugins/mps-core/languages/core.properties/sandbox/sandbox.msd" folder="build" />
  329 + <modulePath path="${project}/plugins/mps-core/languages/core.xml/sandbox/sandbox.msd" folder="build" />
  330 + <modulePath path="${project}/plugins/mps-core/languages/core.xml/xml.mpl" folder="build" />
  331 + <modulePath path="${project}/plugins/mps-obsolete/languages/buildlanguage/buildlanguage.mpl" folder="languages.build" />
  332 + <modulePath path="${project}/plugins/mps-obsolete/languages/custommps/custommps.mpl" folder="languages.build" />
  333 + <modulePath path="${project}/plugins/mps-obsolete/languages/dependency/dependency.mpl" folder="languages.build" />
  334 + <modulePath path="${project}/plugins/mps-obsolete/languages/generictasks/generictasks.mpl" folder="languages.build" />
  335 + <modulePath path="${project}/plugins/mps-obsolete/languages/generictasks/solutions/pluginSolution/pluginSolution.msd" folder="languages.build" />
  336 + <modulePath path="${project}/plugins/mps-obsolete/languages/packaging/packaging.mpl" folder="languages.build" />
  337 + <modulePath path="${project}/plugins/mps-obsolete/languages/property/property.mpl" folder="languages.build" />
  338 + <modulePath path="${project}/plugins/mps-obsolete/languages/solutions/jetbrains.mps.build.mpsdist/mpsdist.msd" folder="languages.build" />
  339 + <modulePath path="${project}/plugins/mps-obsolete/languages/solutions/jetbrains.mps.buildlanguage.execution/execution.msd" folder="languages.build" />
  340 + <modulePath path="${project}/plugins/mps-obsolete/languages/xmlDeprecated/languageDescriptor.mpl" folder="languages.xml" />
  341 + <modulePath path="${project}/plugins/mps-obsolete/languages/xmlDeprecated/solutions/jetbrains.mps.xml.sandbox/jetbrains.mps.xml.sandbox.msd" folder="languages.xml" />
  342 + <modulePath path="${project}/plugins/mps-obsolete/languages/xmlDeprecated/solutions/pluginSolution/pluginSolution.msd" folder="languages.xml" />
  343 + <modulePath path="${project}/plugins/mpsdevkit/languages/quickQueryLanguage/quickQueryLanguage.mpl" folder="core.language-design" />
  344 + <modulePath path="${project}/plugins/mpsdevkit/languages/quickQueryLanguage/solutions/jetbrains.mps.quickQuery.runtime/jetbrains.mps.quickQuery.runtime.msd" folder="core.language-design" />
  345 + <modulePath path="${project}/plugins/mpsdevkit/languages/quickQueryLanguage/solutions/pluginSolution/pluginSolution.msd" folder="core.language-design" />
  346 + <modulePath path="${project}/plugins/mpsdevkit/languages/solutions/jetbrains.mps.baseLanguage.pluginSolution/pluginSolution.msd" folder="baseLanguage" />
  347 + <modulePath path="${project}/plugins/mpsdevkit/languages/solutions/jetbrains.mps.lang.dataFlow.pluginSolution/pluginSolution.msd" folder="language-design" />
  348 + <modulePath path="${project}/plugins/mpsdevkit/languages/solutions/jetbrains.mps.lang.typesystem.devkit.pluginSolution/pluginSolution.msd" folder="core.language-design" />
362 349 <modulePath path="${project}/plugins/mpsdevkit/mpsdevkit.msd" folder="plugins" />
363 350 <modulePath path="${project}/plugins/mpsjava/migration/migration.msd" folder="plugins.mpsjava" />
364 351 <modulePath path="${project}/plugins/mpsjava/platform/platform.msd" folder="plugins.mpsjava" />
2  about.txt
... ... @@ -1,4 +1,4 @@
1   -Copyright 2003-2011. JetBrains s.r.o. All rights reserved.
  1 +Copyright 2003-2012. JetBrains s.r.o. All rights reserved.
2 2
3 3 This product includes software developed by
4 4
11 build/MPS-buildserver.xml
... ... @@ -1,11 +0,0 @@
1   -<project name="MPS-buildserver" default="build" basedir="..">
2   - <import file="${ant.file.MPS-buildserver}/../MPS-distribution.xml" />
3   - <property name="mps.home" value="${mps_home}" />
4   - <property name="real.deploy.dir" value="${mps_home}/artifacts" />
5   - <target name="build" depends="default">
6   - <delete dir="${real.deploy.dir}" />
7   - <mkdir dir="${real.deploy.dir}" />
8   - <copydir src="${deploy.dir}" dest="${real.deploy.dir}" />
9   - <delete dir="${deploy.dir}" />
10   - </target>
11   -</project>
13,491 build/MPS-compile.xml
0 additions, 13,491 deletions not shown
18 build/MPS-distribution.xml
... ... @@ -1,18 +0,0 @@
1   -<project name="MPS-distribution" default="default">
2   - <property file="${ant.file.MPS-distribution}/../MPS.properties" />
3   - <import file="${ant.file.MPS-distribution}/../help-build.xml" />
4   - <include file="${ant.file.MPS-distribution}/../MPS-external.xml" />
5   - <include file="${ant.file.MPS-distribution}/../MPS-os-specific-default.xml" />
6   - <condition property="windows">
7   - <os family="windows" />
8   - </condition>
9   - <target name="base">
10   - <tstamp />
11   - <antcall target="MPS-external.main" />
12   - </target>
13   - <target name="default" depends="base">
14   - <antcall target="MPS-os-specific-default.main" />
15   - <antcall target="help-build.sign" />
16   - <delete dir="${deploy.dir}/MPS" />
17   - </target>
18   -</project>
1,002 build/MPS-external.xml
... ... @@ -1,1002 +0,0 @@
1   -<project name="MPS-external" default="main">
2   - <property file="${ant.file.MPS-external}/../MPS.properties" />
3   - <fail unless="build.number" message="Property build.number unspecified." />
4   - <fail unless="build.vcs.number" message="Property build.vcs.number unspecified." />
5   - <fail unless="teamcity.buildConfName" message="Property teamcity.buildConfName unspecified." />
6   - <fail unless="version" message="Property version unspecified." />
7   - <import file="${ant.file.MPS-external}/../MPS-compile.xml" />
8   - <import file="${ant.file.MPS-external}/../help-build.xml" />
9   - <import file="${ant.file.MPS-external}/../MPS-external.xml" />
10   - <import file="${ant.file.MPS-external}/../MPS-languages.xml" />
11   - <target name="main" depends="compile,clean.before,folders.create,do.the.job,clean.after" />
12   - <target name="compile">
13   - <antcall target="compile.all" />
14   - </target>
15   - <target name="clean">
16   - <property name="to.clean" value="${deploy.dir}" />
17   - <echo>Removing directory ${to.clean}</echo>
18   - <delete dir="${to.clean}" />
19   - </target>
20   - <target name="clean.before" depends="compile">
21   - <tstamp />
22   - </target>
23   - <target name="folders.create" depends="clean.before">
24   - <mkdir dir="${deploy.dir}" />
25   - <mkdir dir="${deploy.dir}/MPS/bin" />
26   - <mkdir dir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources/MPSPlugin" />
27   - <mkdir dir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources/core" />
28   - <mkdir dir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources/languages" />
29   - <mkdir dir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources/plugins" />
30   - <mkdir dir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources/workbench" />
31   - <mkdir dir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources/testbench" />
32   - <mkdir dir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources" />
33   - <mkdir dir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp" />
34   - <mkdir dir="${deploy.dir}/MPS/lib/mps-resources.jar.tmp" />
35   - <mkdir dir="${deploy.dir}/MPS/lib/mps-resources_en.jar.tmp" />
36   - <mkdir dir="${deploy.dir}/MPS/lib/mps-core.jar.tmp/modules" />
37   - <mkdir dir="${deploy.dir}/MPS/lib/mps-core.jar.tmp" />
38   - <mkdir dir="${deploy.dir}/MPS/lib/mps-editor-api.jar.tmp" />
39   - <mkdir dir="${deploy.dir}/MPS/lib/mps-editor.jar.tmp/modules" />
40   - <mkdir dir="${deploy.dir}/MPS/lib/mps-editor.jar.tmp" />
41   - <mkdir dir="${deploy.dir}/MPS/lib/mps-platform.jar.tmp/modules" />
42   - <mkdir dir="${deploy.dir}/MPS/lib/mps-platform.jar.tmp" />
43   - <mkdir dir="${deploy.dir}/MPS/lib/mps-workbench.jar.tmp/jetbrains" />
44   - <mkdir dir="${deploy.dir}/MPS/lib/mps-workbench.jar.tmp/META-INF" />
45   - <mkdir dir="${deploy.dir}/MPS/lib/mps-workbench.jar.tmp/modules" />
46   - <mkdir dir="${deploy.dir}/MPS/lib/mps-workbench.jar.tmp" />
47   - <mkdir dir="${deploy.dir}/MPS/lib/mps-boot.jar.tmp" />
48   - <mkdir dir="${deploy.dir}/MPS/lib/mps-test.jar.tmp/modules" />
49   - <mkdir dir="${deploy.dir}/MPS/lib/mps-test.jar.tmp" />
50   - <mkdir dir="${deploy.dir}/MPS/lib/mps-collections.jar.tmp/modules" />
51   - <mkdir dir="${deploy.dir}/MPS/lib/mps-collections.jar.tmp" />
52   - <mkdir dir="${deploy.dir}/MPS/lib/mps-closures.jar.tmp/modules" />
53   - <mkdir dir="${deploy.dir}/MPS/lib/mps-closures.jar.tmp" />
54   - <mkdir dir="${deploy.dir}/MPS/lib/mps-tuples.jar.tmp/modules" />
55   - <mkdir dir="${deploy.dir}/MPS/lib/mps-tuples.jar.tmp" />
56   - <mkdir dir="${deploy.dir}/MPS/lib/mps-backend.jar.tmp/modules" />
57   - <mkdir dir="${deploy.dir}/MPS/lib/mps-backend.jar.tmp" />
58   - <mkdir dir="${deploy.dir}/MPS/lib" />
59   - <mkdir dir="${deploy.dir}/MPS/license" />
60   - <mkdir dir="${deploy.dir}/MPS/plugins/ideaIntegration.jar.tmp/META-INF" />
61   - <mkdir dir="${deploy.dir}/MPS/plugins/ideaIntegration.jar.tmp" />
62   - <mkdir dir="${deploy.dir}/MPS/plugins/vcs/lib/vcs.jar.tmp/META-INF" />
63   - <mkdir dir="${deploy.dir}/MPS/plugins/vcs/lib/vcs.jar.tmp" />
64   - <mkdir dir="${deploy.dir}/MPS/plugins/vcs/lib/mps-vcs-core.jar.tmp" />
65   - <mkdir dir="${deploy.dir}/MPS/plugins/vcs/lib" />
66   - <mkdir dir="${deploy.dir}/MPS/plugins/vcs" />
67   - <mkdir dir="${deploy.dir}/MPS/plugins/mpsdevkit/lib/mpsdevkit.jar.tmp/modules" />
68   - <mkdir dir="${deploy.dir}/MPS/plugins/mpsdevkit/lib/mpsdevkit.jar.tmp" />
69   - <mkdir dir="${deploy.dir}/MPS/plugins/mpsdevkit/lib" />
70   - <mkdir dir="${deploy.dir}/MPS/plugins/mpsdevkit/META-INF" />
71   - <mkdir dir="${deploy.dir}/MPS/plugins/mpsdevkit" />
72   - <mkdir dir="${deploy.dir}/MPS/plugins/mpsmake.jar.tmp/META-INF" />
73   - <mkdir dir="${deploy.dir}/MPS/plugins/mpsmake.jar.tmp" />
74   - <mkdir dir="${deploy.dir}/MPS/plugins/migrationAssistant.jar.tmp/META-INF" />
75   - <mkdir dir="${deploy.dir}/MPS/plugins/migrationAssistant.jar.tmp" />
76   - <mkdir dir="${deploy.dir}/MPS/plugins/migration25.jar.tmp/META-INF" />
77   - <mkdir dir="${deploy.dir}/MPS/plugins/migration25.jar.tmp" />
78   - <mkdir dir="${deploy.dir}/MPS/plugins/modelchecker.jar.tmp/META-INF" />
79   - <mkdir dir="${deploy.dir}/MPS/plugins/modelchecker.jar.tmp" />
80   - <mkdir dir="${deploy.dir}/MPS/plugins/samples.jar.tmp/META-INF" />
81   - <mkdir dir="${deploy.dir}/MPS/plugins/samples.jar.tmp" />
82   - <mkdir dir="${deploy.dir}/MPS/plugins/cvsIntegration" />
83   - <mkdir dir="${deploy.dir}/MPS/plugins/git4idea" />
84   - <mkdir dir="${deploy.dir}/MPS/plugins/mpsjava/lib/mpsjava.jar.tmp/META-INF" />
85   - <mkdir dir="${deploy.dir}/MPS/plugins/mpsjava/lib/mpsjava.jar.tmp" />
86   - <mkdir dir="${deploy.dir}/MPS/plugins/mpsjava/lib" />
87   - <mkdir dir="${deploy.dir}/MPS/plugins/mpsjava/languages" />
88   - <mkdir dir="${deploy.dir}/MPS/plugins/mpsjava" />
89   - <mkdir dir="${deploy.dir}/MPS/plugins/mpsbuild/META-INF" />
90   - <mkdir dir="${deploy.dir}/MPS/plugins/mpsbuild/languages/jetbrains.mps.ide.build.jar.tmp/modules" />
91   - <mkdir dir="${deploy.dir}/MPS/plugins/mpsbuild/languages/jetbrains.mps.ide.build.jar.tmp" />
92   - <mkdir dir="${deploy.dir}/MPS/plugins/mpsbuild/languages" />
93   - <mkdir dir="${deploy.dir}/MPS/plugins/mpsbuild" />
94   - <mkdir dir="${deploy.dir}/MPS/plugins/build-deprecated/META-INF" />
95   - <mkdir dir="${deploy.dir}/MPS/plugins/build-deprecated/lib/build-deprecated.jar.tmp/modules" />
96   - <mkdir dir="${deploy.dir}/MPS/plugins/build-deprecated/lib/build-deprecated.jar.tmp" />
97   - <mkdir dir="${deploy.dir}/MPS/plugins/build-deprecated/lib" />
98   - <mkdir dir="${deploy.dir}/MPS/plugins/build-deprecated/languages" />
99   - <mkdir dir="${deploy.dir}/MPS/plugins/build-deprecated" />
100   - <mkdir dir="${deploy.dir}/MPS/plugins/svn4idea" />
101   - <mkdir dir="${deploy.dir}/MPS/plugins/debugger-api/META-INF" />
102   - <mkdir dir="${deploy.dir}/MPS/plugins/debugger-api/languages" />
103   - <mkdir dir="${deploy.dir}/MPS/plugins/debugger-api/lib/debugger-api.jar.tmp/modules" />
104   - <mkdir dir="${deploy.dir}/MPS/plugins/debugger-api/lib/debugger-api.jar.tmp" />
105   - <mkdir dir="${deploy.dir}/MPS/plugins/debugger-api/lib" />
106   - <mkdir dir="${deploy.dir}/MPS/plugins/debugger-api/nanocProject.zip.tmp/nanocProject" />
107   - <mkdir dir="${deploy.dir}/MPS/plugins/debugger-api/nanocProject.zip.tmp" />
108   - <mkdir dir="${deploy.dir}/MPS/plugins/debugger-api" />
109   - <mkdir dir="${deploy.dir}/MPS/plugins/debugger-java/lib/debugger-java.jar.tmp/modules" />
110   - <mkdir dir="${deploy.dir}/MPS/plugins/debugger-java/lib/debugger-java.jar.tmp" />
111   - <mkdir dir="${deploy.dir}/MPS/plugins/debugger-java/lib" />
112   - <mkdir dir="${deploy.dir}/MPS/plugins/debugger-java/META-INF" />
113   - <mkdir dir="${deploy.dir}/MPS/plugins/debugger-java/languages" />
114   - <mkdir dir="${deploy.dir}/MPS/plugins/debugger-java" />
115   - <mkdir dir="${deploy.dir}/MPS/plugins/debugger-java-customViewers.jar.tmp/META-INF" />
116   - <mkdir dir="${deploy.dir}/MPS/plugins/debugger-java-customViewers.jar.tmp" />
117   - <mkdir dir="${deploy.dir}/MPS/plugins/execution-configurations/META-INF" />
118   - <mkdir dir="${deploy.dir}/MPS/plugins/execution-configurations/lib/execution-configurations.jar.tmp/modules" />
119   - <mkdir dir="${deploy.dir}/MPS/plugins/execution-configurations/lib/execution-configurations.jar.tmp" />
120   - <mkdir dir="${deploy.dir}/MPS/plugins/execution-configurations/lib" />
121   - <mkdir dir="${deploy.dir}/MPS/plugins/execution-configurations/languages" />
122   - <mkdir dir="${deploy.dir}/MPS/plugins/execution-configurations" />
123   - <mkdir dir="${deploy.dir}/MPS/plugins/execution-languages/META-INF" />
124   - <mkdir dir="${deploy.dir}/MPS/plugins/execution-languages/lib/execution-languages.jar.tmp/modules" />
125   - <mkdir dir="${deploy.dir}/MPS/plugins/execution-languages/lib/execution-languages.jar.tmp" />
126   - <mkdir dir="${deploy.dir}/MPS/plugins/execution-languages/lib" />
127   - <mkdir dir="${deploy.dir}/MPS/plugins/execution-languages/languages" />
128   - <mkdir dir="${deploy.dir}/MPS/plugins/execution-languages" />
129   - <mkdir dir="${deploy.dir}/MPS/plugins" />
130   - <mkdir dir="${deploy.dir}/MPS/samples.zip.tmp/MPSSamples" />
131   - <mkdir dir="${deploy.dir}/MPS/samples.zip.tmp" />
132   - <mkdir dir="${deploy.dir}/MPS/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.runtime.gwt-src.jar.tmp/modules" />
133   - <mkdir dir="${deploy.dir}/MPS/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.runtime.gwt-src.jar.tmp" />
134   - <mkdir dir="${deploy.dir}/MPS/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.runtime-src.jar.tmp" />
135   - <mkdir dir="${deploy.dir}/MPS/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.runtime-src.jar.tmp" />
136   - <mkdir dir="${deploy.dir}/MPS/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.runtime-src.jar.tmp" />
137   - <mkdir dir="${deploy.dir}/MPS/languages/baseLanguage" />
138   - <mkdir dir="${deploy.dir}/MPS/languages/languageDesign" />
139   - <mkdir dir="${deploy.dir}/MPS/languages/execution" />
140   - <mkdir dir="${deploy.dir}/MPS/languages/make" />
141   - <mkdir dir="${deploy.dir}/MPS/languages/xml/jetbrains.mps.xmlUnitTest" />
142   - <mkdir dir="${deploy.dir}/MPS/languages/xml" />
143   - <mkdir dir="${deploy.dir}/MPS/languages/util/dates" />
144   - <mkdir dir="${deploy.dir}/MPS/languages/util/baseLanguage" />
145   - <mkdir dir="${deploy.dir}/MPS/languages/util/ypath" />
146   - <mkdir dir="${deploy.dir}/MPS/languages/util/ui/jetbrains.mps.ui.gwt.runtime" />
147   - <mkdir dir="${deploy.dir}/MPS/languages/util/ui" />
148   - <mkdir dir="${deploy.dir}/MPS/languages/util/quickQueryLanguage" />
149   - <mkdir dir="${deploy.dir}/MPS/languages/util/deprecated/ui" />
150   - <mkdir dir="${deploy.dir}/MPS/languages/util/deprecated/xml" />
151   - <mkdir dir="${deploy.dir}/MPS/languages/util/deprecated" />
152   - <mkdir dir="${deploy.dir}/MPS/languages/util" />
153   - <mkdir dir="${deploy.dir}/MPS/languages/devkits" />
154   - <mkdir dir="${deploy.dir}/MPS/languages" />
155   - <mkdir dir="${deploy.dir}/MPS/plugin" />
156   - <mkdir dir="${deploy.dir}/MPS/help-build.append.idea.version" />
157   - <mkdir dir="${deploy.dir}/MPS" />
158   - <mkdir dir="${deploy.dir}/help-build.pack.mps.src" />
159   - <mkdir dir="${deploy.dir}/${build.number}-buildTools.zip.tmp/tools" />
160   - <mkdir dir="${deploy.dir}/${build.number}-buildTools.zip.tmp/resources" />
161   - <mkdir dir="${deploy.dir}/${build.number}-buildTools.zip.tmp" />
162   - </target>
163   - <target name="do.the.job" depends="folders.create">
164   - <copy todir="${deploy.dir}/MPS/bin">
165   - <fileset dir="${mps_home}/bin" excludes="**/*.hprof, " />
166   - </copy>
167   - <copy todir="${deploy.dir}/MPS/lib">
168   - <fileset dir="${mps_home}/lib" excludes="src/, **/*.zip, " />
169   - </copy>
170   - <antcall target="MPS-external.pack.branding_b1a" />
171   - <copy todir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources/MPSPlugin">
172   - <fileset dir="${mps_home}/MPSPlugin" excludes="**/sandbox/**, " includes="**/*.java, **/*.java" />
173   - </copy>
174   - <copy todir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources/core">
175   - <fileset dir="${mps_home}/core" excludes="**/sandbox/**, " includes="**/*.java, **/*.java" />
176   - </copy>
177   - <copy todir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources/languages">
178   - <fileset dir="${mps_home}/languages" excludes="**/sandbox/**, " includes="**/*.java, **/*.java" />
179   - </copy>
180   - <copy todir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources/plugins">
181   - <fileset dir="${mps_home}/plugins" excludes="**/sandbox/**, " includes="**/*.java, **/*.java" />
182   - </copy>
183   - <copy todir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources/workbench">
184   - <fileset dir="${mps_home}/workbench" excludes="**/sandbox/**, " includes="**/*.java, **/*.java" />
185   - </copy>
186   - <copy todir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources/testbench">
187   - <fileset dir="${mps_home}/testbench" excludes="**/sandbox/**, " includes="**/*.java, **/*.java" />
188   - </copy>
189   - <antcall target="help-build.repack.sources" inheritall="true">
190   - <param name="deploy.dir" value="${deploy.dir}" />
191   - <param name="input.dir" value="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources" />
192   - <param name="output.dir" value="${deploy.dir}/MPS/lib/MPS-src.zip.tmp" />
193   - <param name="base_dir" value="${base_dir}" />
194   - </antcall>
195   - <delete dir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources" />
196   - <zip destfile="${deploy.dir}/MPS/lib/MPS-src.zip" duplicate="preserve" filesonly="true">
197   - <zipfileset dir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp" includes="**/*.java" />
198   - </zip>
199   - <delete dir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp" />
200   - <copy todir="${deploy.dir}/MPS/lib/mps-resources.jar.tmp">
201   - <fileset dir="${mps_home}/workbench/resources/classes" />
202   - </copy>
203   - <jar destfile="${deploy.dir}/MPS/lib/mps-resources.jar" duplicate="preserve" filesonly="true">
204   - <fileset dir="${deploy.dir}/MPS/lib/mps-resources.jar.tmp" />
205   - </jar>
206   - <delete dir="${deploy.dir}/MPS/lib/mps-resources.jar.tmp" />
207   - <copy todir="${deploy.dir}/MPS/lib/mps-resources_en.jar.tmp">
208   - <fileset dir="${mps_home}/workbench/resources_en/classes" />
209   - </copy>
210   - <jar destfile="${deploy.dir}/MPS/lib/mps-resources_en.jar" duplicate="preserve" filesonly="true">
211   - <fileset dir="${deploy.dir}/MPS/lib/mps-resources_en.jar.tmp" />
212   - </jar>
213   - <delete dir="${deploy.dir}/MPS/lib/mps-resources_en.jar.tmp" />
214   - <copy todir="${deploy.dir}/MPS/lib/mps-core.jar.tmp">
215   - <fileset dir="${mps_home}/core/analyzers/classes" />
216   - </copy>
217   - <copy todir="${deploy.dir}/MPS/lib/mps-core.jar.tmp">
218   - <fileset dir="${mps_home}/core/kernel/classes" />
219   - </copy>
220   - <copy todir="${deploy.dir}/MPS/lib/mps-core.jar.tmp">
221   - <fileset dir="${mps_home}/core/runtime/classes" />
222   - </copy>
223   - <copy todir="${deploy.dir}/MPS/lib/mps-core.jar.tmp">
224   - <fileset dir="${mps_home}/core/findUsages-runtime/classes" />
225   - </copy>
226   - <copy todir="${deploy.dir}/MPS/lib/mps-core.jar.tmp">
227   - <fileset dir="${mps_home}/core/refactoring-runtime/classes" />
228   - </copy>
229   - <copy todir="${deploy.dir}/MPS/lib/mps-core.jar.tmp">
230   - <fileset dir="${mps_home}/core/typesystemEngine/classes" />
231   - </copy>
232   - <copy todir="${deploy.dir}/MPS/lib/mps-core.jar.tmp">
233   - <fileset dir="${mps_home}/core/generator/classes" />
234   - </copy>
235   - <copy todir="${deploy.dir}/MPS/lib/mps-core.jar.tmp">
236   - <fileset dir="${mps_home}/core/make-runtime/classes" />
237   - </copy>
238   - <copy todir="${deploy.dir}/MPS/lib/mps-core.jar.tmp">
239   - <fileset dir="${mps_home}/languages/baseLanguage/baseLanguage/solutions/jetbrains.mps.baseLanguage.search/classes" />
240   - </copy>
241   - <copy todir="${deploy.dir}/MPS/lib/mps-core.jar.tmp">
242   - <fileset dir="${mps_home}/languages/baseLanguage/baseLanguage/solutions/jetbrains.mps.baseLanguage.util/classes" />
243   - </copy>
244   - <antcall target="MPS-languages.pack.jetbrains.mps.analyzers.runtime" />
245   - <antcall target="MPS-languages.pack.jetbrains.mps.kernel" />
246   - <antcall target="MPS-languages.pack.jetbrains.mps.runtime" />
247   - <antcall target="MPS-languages.pack.jetbrains.mps.findUsages.runtime" />
248   - <antcall target="MPS-languages.pack.jetbrains.mps.refactoring.runtime" />
249   - <antcall target="MPS-languages.pack.jetbrains.mps.lang.pattern.runtime" />
250   - <antcall target="MPS-languages.pack.jetbrains.mps.traceInfo" />
251   - <antcall target="MPS-languages.pack.jetbrains.mps.traceInfo.cache" />
252   - <antcall target="MPS-languages.pack.jetbrains.mps.dataFlow.runtime" />
253   - <antcall target="MPS-languages.pack.stubUtils" />
254   - <antcall target="MPS-languages.pack.jetbrains.mps.typesystemEngine" />
255   - <antcall target="MPS-languages.pack.jetbrains.mps.generator" />
256   - <antcall target="MPS-languages.pack.jetbrains.mps.make.runtime" />
257   - <antcall target="MPS-languages.pack.jetbrains.mps.make" />
258   - <antcall target="MPS-languages.pack.jetbrains.mps.smodel.resources" />
259   - <antcall target="MPS-languages.pack.jetbrains.mps.baseLanguage.search" />
260   - <antcall target="MPS-languages.pack.JDK" />
261   - <antcall target="MPS-languages.pack.JDK.Tools" />
262   - <antcall target="MPS-languages.pack.MPS.Core" />
263   - <antcall target="MPS-languages.pack.jetbrains.mps.baseLanguage.util" />
264   - <mkdir dir="${deploy.dir}/MPS/lib/mps-core.jar.tmp/modules" />
265   - <jar destfile="${deploy.dir}/MPS/lib/mps-core.jar" duplicate="preserve" filesonly="true">
266   - <fileset dir="${deploy.dir}/MPS/lib/mps-core.jar.tmp" />
267   - </jar>
268   - <delete dir="${deploy.dir}/MPS/lib/mps-core.jar.tmp" />
269   - <copy todir="${deploy.dir}/MPS/lib/mps-editor-api.jar.tmp">
270   - <fileset dir="${mps_home}/editor/editor-api/classes" />
271   - </copy>
272   - <jar destfile="${deploy.dir}/MPS/lib/mps-editor-api.jar" duplicate="preserve" filesonly="true">
273   - <fileset dir="${deploy.dir}/MPS/lib/mps-editor-api.jar.tmp" />
274   - </jar>
275   - <delete dir="${deploy.dir}/MPS/lib/mps-editor-api.jar.tmp" />
276   - <copy todir="${deploy.dir}/MPS/lib/mps-editor.jar.tmp">
277   - <fileset dir="${mps_home}/editor/editor-runtime/classes" />
278   - </copy>
279   - <copy todir="${deploy.dir}/MPS/lib/mps-editor.jar.tmp">
280   - <fileset dir="${mps_home}/editor/actions-runtime/classes" />
281   - </copy>
282   - <copy todir="${deploy.dir}/MPS/lib/mps-editor.jar.tmp">
283   - <fileset dir="${mps_home}/editor/intentions-runtime/classes" />
284   - </copy>
285   - <copy todir="${deploy.dir}/MPS/lib/mps-editor.jar.tmp">
286   - <fileset dir="${mps_home}/editor/typesystemIntegration/classes" />
287   - </copy>
288   - <copy todir="${deploy.dir}/MPS/lib/mps-editor.jar.tmp">
289   - <fileset dir="${mps_home}/workbench/mps-editor/classes" excludes="META-INF/MPSEditor.xml, jetbrains/mps/ide/editor/actions/MPSEditorActions.xml, " />
290   - </copy>
291   - <antcall target="MPS-languages.pack.MPS.Editor" />
292   - <antcall target="MPS-languages.pack.jetbrains.mps.ide.editor" />
293   - <antcall target="MPS-languages.pack.jetbrains.mps.editor.runtime" />
294   - <antcall target="MPS-languages.pack.typesystemIntegration" />
295   - <mkdir dir="${deploy.dir}/MPS/lib/mps-editor.jar.tmp/modules" />
296   - <jar destfile="${deploy.dir}/MPS/lib/mps-editor.jar" duplicate="preserve" filesonly="true">
297   - <fileset dir="${deploy.dir}/MPS/lib/mps-editor.jar.tmp" />
298   - </jar>
299   - <delete dir="${deploy.dir}/MPS/lib/mps-editor.jar.tmp" />
300   - <copy todir="${deploy.dir}/MPS/lib/mps-platform.jar.tmp">
301   - <fileset dir="${mps_home}/workbench/mps-platform/classes" excludes="META-INF/MPSCore.xml, jetbrains/mps/ide/platform/actions/PlatformActions.xml, " />
302   - </copy>
303   - <copy todir="${deploy.dir}/MPS/lib/mps-platform.jar.tmp">
304   - <fileset dir="${mps_home}/workbench/mps-debugger/classes" />
305   - </copy>
306   - <antcall target="MPS-languages.pack.MPS.Platform" />
307   - <antcall target="MPS-languages.pack.jetbrains.mps.ide.platform" />
308   - <mkdir dir="${deploy.dir}/MPS/lib/mps-platform.jar.tmp/modules" />
309   - <jar destfile="${deploy.dir}/MPS/lib/mps-platform.jar" duplicate="preserve" filesonly="true">
310   - <fileset dir="${deploy.dir}/MPS/lib/mps-platform.jar.tmp" />
311   - </jar>
312   - <delete dir="${deploy.dir}/MPS/lib/mps-platform.jar.tmp" />
313   - <copy todir="${deploy.dir}/MPS/lib/mps-workbench.jar.tmp">
314   - <fileset dir="${mps_home}/languages/util/runConfigurations/solutions/jetbrains.mps.execution.api/classes" />
315   - </copy>
316   - <copy todir="${deploy.dir}/MPS/lib/mps-workbench.jar.tmp">
317   - <fileset dir="${mps_home}/languages/util/runConfigurations/solutions/jetbrains.mps.execution.impl/classes" />
318   - </copy>
319   - <copy todir="${deploy.dir}/MPS/lib/mps-workbench.jar.tmp">
320   - <fileset dir="${mps_home}/languages/util/uiLanguage/runtime/classes" />
321   - </copy>
322   - <copy todir="${deploy.dir}/MPS/lib/mps-workbench.jar.tmp">
323   - <fileset dir="${mps_home}/workbench/typesystemUi/classes" />
324   - </copy>
325   - <copy todir="${deploy.dir}/MPS/lib/mps-workbench.jar.tmp">
326   - <fileset dir="${mps_home}/workbench/mps-workbench/classes" excludes="idea/IdeaApplicationInfo.xml, " />
327   - </copy>
328   - <copy todir="${deploy.dir}/MPS/lib/mps-workbench.jar.tmp">
329   - <fileset dir="${mps_home}/MPSPlugin/apiclasses" />
330   - </copy>
331   - <copy todir="${deploy.dir}/MPS/lib/mps-workbench.jar.tmp/jetbrains">
332   - <fileset dir="${mps_home}/workbench/mps-platform/source_gen/jetbrains" includes="mps/ide/platform/actions/PlatformActions.xml, " />
333   - </copy>
334   - <copy todir="${deploy.dir}/MPS/lib/mps-workbench.jar.tmp/jetbrains">
335   - <fileset dir="${mps_home}/workbench/mps-editor/source_gen/jetbrains" includes="mps/ide/editor/actions/MPSEditorActions.xml, " />
336   - </copy>
337   - <mkdir dir="${deploy.dir}/MPS/lib/mps-workbench.jar.tmp/jetbrains" />
338   - <copy todir="${deploy.dir}/MPS/lib/mps-workbench.jar.tmp/META-INF">
339   - <fileset dir="${mps_home}/workbench/mps-platform/source/META-INF" includes="MPSCore.xml, " />
340   - </copy>
341   - <copy todir="${deploy.dir}/MPS/lib/mps-workbench.jar.tmp/META-INF">
342   - <fileset dir="${mps_home}/workbench/mps-editor/source/META-INF" includes="MPSEditor.xml, " />
343   - </copy>
344   - <mkdir dir="${deploy.dir}/MPS/lib/mps-workbench.jar.tmp/META-INF" />
345   - <antcall target="MPS-languages.pack.MPS.Workbench" />
346   - <antcall target="MPS-languages.pack.jetbrains.mps.ide" />
347   - <antcall target="MPS-languages.pack.jetbrains.mps.ide.uiLanguage.runtime" />
348   - <antcall target="MPS-languages.pack.jetbrains.mps.execution.api" />
349   - <mkdir dir="${deploy.dir}/MPS/lib/mps-workbench.jar.tmp/modules" />
350   - <jar destfile="${deploy.dir}/MPS/lib/mps-workbench.jar" duplicate="preserve" filesonly="true">
351   - <fileset dir="${deploy.dir}/MPS/lib/mps-workbench.jar.tmp" />
352   - </jar>
353   - <delete dir="${deploy.dir}/MPS/lib/mps-workbench.jar.tmp" />
354   - <copy todir="${deploy.dir}/MPS/lib/mps-boot.jar.tmp">
355   - <fileset dir="${mps_home}/startup/classes" />
356   - </copy>
357   - <jar destfile="${deploy.dir}/MPS/lib/mps-boot.jar" duplicate="preserve" filesonly="true">
358   - <fileset dir="${deploy.dir}/MPS/lib/mps-boot.jar.tmp" />
359   - </jar>
360   - <delete dir="${deploy.dir}/MPS/lib/mps-boot.jar.tmp" />
361   - <copy todir="${deploy.dir}/MPS/lib/mps-test.jar.tmp">
362   - <fileset dir="${mps_home}/testbench/classes" />
363   - </copy>
364   - <antcall target="MPS-languages.pack.Testbench" />
365   - <mkdir dir="${deploy.dir}/MPS/lib/mps-test.jar.tmp/modules" />
366   - <jar destfile="${deploy.dir}/MPS/lib/mps-test.jar" duplicate="preserve" filesonly="true">
367   - <fileset dir="${deploy.dir}/MPS/lib/mps-test.jar.tmp" />
368   - </jar>
369   - <delete dir="${deploy.dir}/MPS/lib/mps-test.jar.tmp" />
370   - <copy todir="${deploy.dir}/MPS/lib/mps-collections.jar.tmp">
371   - <fileset dir="${mps_home}/languages/baseLanguage/collections/runtime/classes" />
372   - </copy>
373   - <antcall target="MPS-languages.pack.collections.runtime" />
374   - <mkdir dir="${deploy.dir}/MPS/lib/mps-collections.jar.tmp/modules" />
375   - <jar destfile="${deploy.dir}/MPS/lib/mps-collections.jar" duplicate="preserve" filesonly="true">
376   - <fileset dir="${deploy.dir}/MPS/lib/mps-collections.jar.tmp" />
377   - </jar>
378   - <delete dir="${deploy.dir}/MPS/lib/mps-collections.jar.tmp" />
379   - <copy todir="${deploy.dir}/MPS/lib/mps-closures.jar.tmp">
380   - <fileset dir="${mps_home}/languages/baseLanguage/closures/runtime/classes" />
381   - </copy>
382   - <antcall target="MPS-languages.pack.closures.runtime" />
383   - <mkdir dir="${deploy.dir}/MPS/lib/mps-closures.jar.tmp/modules" />
384   - <jar destfile="${deploy.dir}/MPS/lib/mps-closures.jar" duplicate="preserve" filesonly="true">
385   - <fileset dir="${deploy.dir}/MPS/lib/mps-closures.jar.tmp" />
386   - </jar>
387   - <delete dir="${deploy.dir}/MPS/lib/mps-closures.jar.tmp" />
388   - <copy todir="${deploy.dir}/MPS/lib/mps-tuples.jar.tmp">
389   - <fileset dir="${mps_home}/languages/baseLanguage/tuples/runtime/classes" />
390   - </copy>
391   - <antcall target="MPS-languages.pack.jetbrains.mps.baseLanguage.tuples.runtime" />
392   - <mkdir dir="${deploy.dir}/MPS/lib/mps-tuples.jar.tmp/modules" />
393   - <jar destfile="${deploy.dir}/MPS/lib/mps-tuples.jar" duplicate="preserve" filesonly="true">
394   - <fileset dir="${deploy.dir}/MPS/lib/mps-tuples.jar.tmp" />
395   - </jar>
396   - <delete dir="${deploy.dir}/MPS/lib/mps-tuples.jar.tmp" />
397   - <copy todir="${deploy.dir}/MPS/lib/mps-backend.jar.tmp">
398   - <fileset dir="${mps_home}/core/ant/classes" includes="**/*.class, **/*.xml, **/trace.info, " />
399   - </copy>
400   - <echo file="${deploy.dir}/MPS/lib/mps-backend.jar.tmp/build.number">build.number=${build.number}${line.separator}date=${DSTAMP}${line.separator}revision.number=${build.vcs.number}${line.separator}configuration.name=${teamcity.buildConfName}${line.separator}version=${version}</echo>
401   - <antcall target="MPS-languages.pack.Ant" />
402   - <antcall target="MPS-languages.pack.jetbrains.mps.ant" />
403   - <mkdir dir="${deploy.dir}/MPS/lib/mps-backend.jar.tmp/modules" />
404   - <jar destfile="${deploy.dir}/MPS/lib/mps-backend.jar" duplicate="preserve" filesonly="true">
405   - <fileset dir="${deploy.dir}/MPS/lib/mps-backend.jar.tmp" />
406   - </jar>
407   - <delete dir="${deploy.dir}/MPS/lib/mps-backend.jar.tmp" />
408   - <mkdir dir="${deploy.dir}/MPS/lib" />
409   - <copy todir="${deploy.dir}/MPS/license">
410   - <fileset dir="${mps_home}/license" />
411   - </copy>
412   - <copy todir="${deploy.dir}/MPS/plugins/ideaIntegration.jar.tmp">
413   - <fileset dir="${mps_home}/plugins/ideaIntegration/classes" />
414   - </copy>
415   - <antcall target="MPS-external.replace_a1a3a" />
416   - <mkdir dir="${deploy.dir}/MPS/plugins/ideaIntegration.jar.tmp/META-INF" />
417   - <jar destfile="${deploy.dir}/MPS/plugins/ideaIntegration.jar" duplicate="preserve" filesonly="true">
418   - <fileset dir="${deploy.dir}/MPS/plugins/ideaIntegration.jar.tmp" excludes="" />
419   - </jar>
420   - <delete dir="${deploy.dir}/MPS/plugins/ideaIntegration.jar.tmp" />
421   - <copy todir="${deploy.dir}/MPS/plugins/vcs/lib/vcs.jar.tmp">
422   - <fileset dir="${mps_home}/plugins/vcs/classes" />
423   - </copy>
424   - <antcall target="MPS-external.replace_a1a0b3a" />
425   - <mkdir dir="${deploy.dir}/MPS/plugins/vcs/lib/vcs.jar.tmp/META-INF" />
426   - <jar destfile="${deploy.dir}/MPS/plugins/vcs/lib/vcs.jar" duplicate="preserve" filesonly="true">
427   - <fileset dir="${deploy.dir}/MPS/plugins/vcs/lib/vcs.jar.tmp" excludes="" />
428   - </jar>
429   - <delete dir="${deploy.dir}/MPS/plugins/vcs/lib/vcs.jar.tmp" />
430   - <copy todir="${deploy.dir}/MPS/plugins/vcs/lib/mps-vcs-core.jar.tmp">
431   - <fileset dir="${mps_home}/plugins/vcs/lib/classes" />
432   - </copy>
433   - <jar destfile="${deploy.dir}/MPS/plugins/vcs/lib/mps-vcs-core.jar" duplicate="preserve" filesonly="true">
434   - <fileset dir="${deploy.dir}/MPS/plugins/vcs/lib/mps-vcs-core.jar.tmp" excludes="" />
435   - </jar>
436   - <delete dir="${deploy.dir}/MPS/plugins/vcs/lib/mps-vcs-core.jar.tmp" />
437   - <mkdir dir="${deploy.dir}/MPS/plugins/vcs/lib" />
438   - <mkdir dir="${deploy.dir}/MPS/plugins/vcs" />
439   - <antcall target="MPS-languages.pack.jetbrains.mps.ide.mpsdevkit" />
440   - <mkdir dir="${deploy.dir}/MPS/plugins/mpsdevkit/lib/mpsdevkit.jar.tmp/modules" />
441   - <copy todir="${deploy.dir}/MPS/plugins/mpsdevkit/lib/mpsdevkit.jar.tmp">
442   - <fileset dir="${mps_home}/plugins/mpsdevkit/classes" />
443   - </copy>
444   - <jar destfile="${deploy.dir}/MPS/plugins/mpsdevkit/lib/mpsdevkit.jar" duplicate="preserve" filesonly="true">
445   - <fileset dir="${deploy.dir}/MPS/plugins/mpsdevkit/lib/mpsdevkit.jar.tmp" excludes="" />
446   - </jar>
447   - <delete dir="${deploy.dir}/MPS/plugins/mpsdevkit/lib/mpsdevkit.jar.tmp" />
448   - <mkdir dir="${deploy.dir}/MPS/plugins/mpsdevkit/lib" />
449   - <antcall target="MPS-external.replace_a1c3a" />
450   - <mkdir dir="${deploy.dir}/MPS/plugins/mpsdevkit/META-INF" />
451   - <mkdir dir="${deploy.dir}/MPS/plugins/mpsdevkit" />
452   - <copy todir="${deploy.dir}/MPS/plugins/mpsmake.jar.tmp">
453   - <fileset dir="${mps_home}/plugins/mpsmake/classes" />
454   - </copy>
455   - <antcall target="MPS-external.replace_a1d3a" />
456   - <mkdir dir="${deploy.dir}/MPS/plugins/mpsmake.jar.tmp/META-INF" />
457   - <jar destfile="${deploy.dir}/MPS/plugins/mpsmake.jar" duplicate="preserve" filesonly="true">
458   - <fileset dir="${deploy.dir}/MPS/plugins/mpsmake.jar.tmp" excludes="" />
459   - </jar>
460   - <delete dir="${deploy.dir}/MPS/plugins/mpsmake.jar.tmp" />
461   - <copy todir="${deploy.dir}/MPS/plugins/migrationAssistant.jar.tmp">
462   - <fileset dir="${mps_home}/plugins/migrationAssistant/classes" />
463   -