Permalink
Browse files

update paths after moving platform languages -> languages/util

  • Loading branch information...
1 parent 7749614 commit 4f1c9e9f2c61441a5436c8e41b5a2de8d5c1e796 @inspirer inspirer committed Jun 6, 2011
View
@@ -10,7 +10,7 @@
<maximumStackSize value="32" />
<properties />
</buildFile>
- <buildFile url="file://$PROJECT_DIR$/platform/buildlanguage/ant/tests/jetbrains/mps/build/ant/test.generate.task.xml">
+ <buildFile url="file://$PROJECT_DIR$/languages/util/buildlanguage/ant/tests/jetbrains/mps/build/ant/test.generate.task.xml">
<additionalClassPath />
<antReference projectDefault="true" />
<customJdkName value="" />
View
@@ -8,15 +8,15 @@
<module fileurl="file://$PROJECT_DIR$/core/baseLanguage/tuples/runtime/Tuples-runtime.iml" filepath="$PROJECT_DIR$/core/baseLanguage/tuples/runtime/Tuples-runtime.iml" group="core/baseLanguage" />
<module fileurl="file://$PROJECT_DIR$/core/actions-runtime/actions-runtime.iml" filepath="$PROJECT_DIR$/core/actions-runtime/actions-runtime.iml" group="workbench" />
<module fileurl="file://$PROJECT_DIR$/core/analyzers/analyzers.iml" filepath="$PROJECT_DIR$/core/analyzers/analyzers.iml" group="core" />
- <module fileurl="file://$PROJECT_DIR$/platform/buildlanguage/ant/ant.iml" filepath="$PROJECT_DIR$/platform/buildlanguage/ant/ant.iml" group="platform/build" />
+ <module fileurl="file://$PROJECT_DIR$/languages/util/buildlanguage/ant/ant.iml" filepath="$PROJECT_DIR$/languages/util/buildlanguage/ant/ant.iml" group="platform/build" />
<module fileurl="file://$PROJECT_DIR$/core/baseLanguage/baseLanguage/baseLanguage.iml" filepath="$PROJECT_DIR$/core/baseLanguage/baseLanguage/baseLanguage.iml" group="core/baseLanguage" />
<module fileurl="file://$PROJECT_DIR$/core/baseLanguage/collections/collections.iml" filepath="$PROJECT_DIR$/core/baseLanguage/collections/collections.iml" group="core/baseLanguage" />
<module fileurl="file://$PROJECT_DIR$/core/baseLanguage/collections/runtime/collections-runtime.iml" filepath="$PROJECT_DIR$/core/baseLanguage/collections/runtime/collections-runtime.iml" group="core/baseLanguage" />
<module fileurl="file://$PROJECT_DIR$/core/debug/debug.iml" filepath="$PROJECT_DIR$/core/debug/debug.iml" group="core/debug" />
<module fileurl="file://$PROJECT_DIR$/core/debug-api/debug-api.iml" filepath="$PROJECT_DIR$/core/debug-api/debug-api.iml" group="core/debug" />
<module fileurl="file://$PROJECT_DIR$/plugins/debugger-api/debugger-api.iml" filepath="$PROJECT_DIR$/plugins/debugger-api/debugger-api.iml" group="plugins" />
<module fileurl="file://$PROJECT_DIR$/plugins/debugger-java/debugger-java.iml" filepath="$PROJECT_DIR$/plugins/debugger-java/debugger-java.iml" group="plugins" />
- <module fileurl="file://$PROJECT_DIR$/platform/buildlanguage/languages/distrib/distrib.iml" filepath="$PROJECT_DIR$/platform/buildlanguage/languages/distrib/distrib.iml" group="platform/build" />
+ <module fileurl="file://$PROJECT_DIR$/languages/util/buildlanguage/languages/distrib/distrib.iml" filepath="$PROJECT_DIR$/languages/util/buildlanguage/languages/distrib/distrib.iml" group="platform/build" />
<module fileurl="file://$PROJECT_DIR$/core/editor-runtime/editor-runtime.iml" filepath="$PROJECT_DIR$/core/editor-runtime/editor-runtime.iml" group="core" />
<module fileurl="file://$PROJECT_DIR$/core/findUsages-runtime/findUsages-runtime.iml" filepath="$PROJECT_DIR$/core/findUsages-runtime/findUsages-runtime.iml" group="core" />
<module fileurl="file://$PROJECT_DIR$/core/generator/generator-engine.iml" filepath="$PROJECT_DIR$/core/generator/generator-engine.iml" group="core/kernel" />
@@ -33,7 +33,7 @@
<module fileurl="file://$PROJECT_DIR$/plugins/mpseditor/mpseditor.iml" filepath="$PROJECT_DIR$/plugins/mpseditor/mpseditor.iml" group="plugins" />
<module fileurl="file://$PROJECT_DIR$/plugins/mpsjava/mpsjava.iml" filepath="$PROJECT_DIR$/plugins/mpsjava/mpsjava.iml" group="plugins" />
<module fileurl="file://$PROJECT_DIR$/plugins/mpsmake/mpsmake.iml" filepath="$PROJECT_DIR$/plugins/mpsmake/mpsmake.iml" group="plugins" />
- <module fileurl="file://$PROJECT_DIR$/platform/buildlanguage/languages/packaging/packaging.iml" filepath="$PROJECT_DIR$/platform/buildlanguage/languages/packaging/packaging.iml" group="platform/build" />
+ <module fileurl="file://$PROJECT_DIR$/languages/util/buildlanguage/languages/packaging/packaging.iml" filepath="$PROJECT_DIR$/languages/util/buildlanguage/languages/packaging/packaging.iml" group="platform/build" />
<module fileurl="file://$PROJECT_DIR$/core/plugin-runtime/plugin-runtime.iml" filepath="$PROJECT_DIR$/core/plugin-runtime/plugin-runtime.iml" group="core" />
<module fileurl="file://$PROJECT_DIR$/core/refactoring-runtime/refactoring-runtime.iml" filepath="$PROJECT_DIR$/core/refactoring-runtime/refactoring-runtime.iml" group="core" />
<module fileurl="file://$PROJECT_DIR$/resources/resources.iml" filepath="$PROJECT_DIR$/resources/resources.iml" group="workbench" />
@@ -47,7 +47,7 @@
<module fileurl="file://$PROJECT_DIR$/core/typesystemEngine/typesystemEngine.iml" filepath="$PROJECT_DIR$/core/typesystemEngine/typesystemEngine.iml" group="core/kernel" />
<module fileurl="file://$PROJECT_DIR$/core/typesystemIntegration/typesystemIntegration.iml" filepath="$PROJECT_DIR$/core/typesystemIntegration/typesystemIntegration.iml" group="workbench" />
<module fileurl="file://$PROJECT_DIR$/workbench/typesystemUi/typesystemUi.iml" filepath="$PROJECT_DIR$/workbench/typesystemUi/typesystemUi.iml" group="workbench" />
- <module fileurl="file://$PROJECT_DIR$/platform/uiLanguage/runtime/uiLanguage-runtime.iml" filepath="$PROJECT_DIR$/platform/uiLanguage/runtime/uiLanguage-runtime.iml" group="platform" />
+ <module fileurl="file://$PROJECT_DIR$/languages/util/uiLanguage/runtime/uiLanguage-runtime.iml" filepath="$PROJECT_DIR$/languages/util/uiLanguage/runtime/uiLanguage-runtime.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/workbench/uiTests/uiTests.iml" filepath="$PROJECT_DIR$/workbench/uiTests/uiTests.iml" />
<module fileurl="file://$PROJECT_DIR$/core/baseLanguage/unitTest/solutions/runtime/unitTest-runtime.iml" filepath="$PROJECT_DIR$/core/baseLanguage/unitTest/solutions/runtime/unitTest-runtime.iml" group="core/baseLanguage" />
<module fileurl="file://$PROJECT_DIR$/plugins/vcs/vcs.iml" filepath="$PROJECT_DIR$/plugins/vcs/vcs.iml" group="plugins" />
@@ -158,7 +158,7 @@
<arg file="${homepage.icon}" />
<arg file="${help.folder.tmp}" />
<classpath>
- <pathelement path="${mps_home}/platform/buildlanguage/languages/distrib/classes" />
+ <pathelement path="${mps_home}/languages/util/buildlanguage/languages/distrib/classes" />
<pathelement path="${mps_home}/core/runtime/classes" />
</classpath>
</java>
View
@@ -22,7 +22,6 @@
<mkdir dir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources/MPSPlugin" />
<mkdir dir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources/core" />
<mkdir dir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources/languages" />
- <mkdir dir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources/platform" />
<mkdir dir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources/plugins" />
<mkdir dir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources/resources" />
<mkdir dir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources/workbench" />
@@ -76,9 +75,6 @@
<copy todir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources/languages">
<fileset dir="${mps_home}/languages" excludes="**/sandbox/**, " includes="**/*.java, **/*.java" />
</copy>
- <copy todir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources/platform">
- <fileset dir="${mps_home}/platform" excludes="**/sandbox/**, " includes="**/*.java, **/*.java" />
- </copy>
<copy todir="${deploy.dir}/MPS/lib/MPS-src.zip.tmp/help-build.repack.sources/plugins">
<fileset dir="${mps_home}/plugins" excludes="**/sandbox/**, " includes="**/*.java, **/*.java" />
</copy>
@@ -185,7 +181,7 @@
<fileset dir="${mps_home}/workbench/typesystemUi/classes" />
</copy>
<copy todir="${deploy.dir}/MPS/lib/mps.jar.tmp">
- <fileset dir="${mps_home}/platform/uiLanguage/runtime/classes" />
+ <fileset dir="${mps_home}/languages/util/uiLanguage/runtime/classes" />
</copy>
<copy todir="${deploy.dir}/MPS/lib/mps.jar.tmp">
<fileset dir="${mps_home}/MPSPlugin/apiclasses" />
@@ -412,7 +408,7 @@
<antcall target="MPS-languages.pack.jetbrains.mps.nanoj" />
<mkdir dir="${deploy.dir}/MPS/languages/util" />
<copy todir="${deploy.dir}/MPS/languages/generate.ant.task.jar.tmp">
- <fileset dir="${mps_home}/platform/buildlanguage/ant/classes" includes="**/*.class, **/*.xml, " />
+ <fileset dir="${mps_home}/languages/util/buildlanguage/ant/classes" includes="**/*.class, **/*.xml, " />
</copy>
<jar destfile="${deploy.dir}/MPS/languages/generate.ant.task.jar" duplicate="preserve" filesonly="true">
<fileset dir="${deploy.dir}/MPS/languages/generate.ant.task.jar.tmp" />
@@ -35,15 +35,15 @@
<modulePath path="${mps_home}/core/kernel/resources/jetbrains.mps.smodel.resources.msd" folder="" />
<modulePath path="${mps_home}/testbench/solutions/jetbrains.mps.testbench.make.msd" folder="" />
<modulePath path="${mps_home}/plugins/mpsmake/solution/jetbrains.mps.ide.make.msd" />
- <modulePath path="${mps_home}/platform/buildlanguage/solutions/jetbrains.mps.build.antsupport/jetbrains.mps.build.antsupport.msd" />
+ <modulePath path="${mps_home}/languages/util/buildlanguage/solutions/jetbrains.mps.build.antsupport/jetbrains.mps.build.antsupport.msd" />
<modulePath path="${mps_home}/testbench/solution/jetbrains.mps.testbench.msd" folder="" />
<modulePath path="${project}/languages/facet/facet.mpl" />
<modulePath path="${project}/languages/script/script.mpl" folder="" />
<modulePath path="${project}/languages/outlook/outlook.mpl" folder="" />
<modulePath path="${mps_home}/core/languageDesign/plugin/plugin.mpl" />
<modulePath path="${mps_home}/testbench/languages/suite.mpl" folder="" />
<modulePath path="${mps_home}/workbench/runConfigurations/solutions/jetbrains.mps.execution.api/jetbrains.mps.execution.api.msd" />
- <modulePath path="${mps_home}/platform/quickQueryLanguage/quickQueryLanguage.mpl" />
+ <modulePath path="${mps_home}/languages/util/quickQueryLanguage/quickQueryLanguage.mpl" />
</projectModules>
<genConfs>
<genConfModule name="facet" moduleRef="jetbrains.mps.make.facet" />
@@ -4,7 +4,7 @@
<modelRoot path="${solution_descriptor}/" namespacePrefix="" />
</models>
<stubModelEntries>
- <stubModelEntry path="${mps_home}/platform" include="false">
+ <stubModelEntry path="${mps_home}/languages/util" include="false">
<manager moduleId="86ef8290-12bb-4ca7-947f-093788f263a9" className="jetbrains.mps.lang.project.stubs.ProjectStubs" />
</stubModelEntry>
</stubModelEntries>
@@ -31,10 +31,10 @@
</component>
<component name="MPSProject">
<projectModules>
- <modulePath path="${mps_home}/platform/bash/solutions/jetbrains.mps.bash.sandbox/jetbrains.mps.bash.sandbox.msd" folder="bash" />
+ <modulePath path="${mps_home}/languages/util/bash/solutions/jetbrains.mps.bash.sandbox/jetbrains.mps.bash.sandbox.msd" folder="bash" />
<modulePath path="${project}/solutions/jetbrains.mps.buildlangauge.mpsautobuild/jetbrains.mps.buildlangauge.mpsautobuild.msd" folder="customMPS" />
<modulePath path="${project}/solutions/jetbrains.mps.build.antsupport/jetbrains.mps.build.antsupport.msd" folder="ant" />
- <modulePath path="${mps_home}/platform/bash/languages/bash/bash.mpl" folder="bash" />
+ <modulePath path="${mps_home}/languages/util/bash/languages/bash/bash.mpl" folder="bash" />
<modulePath path="${project}/languages/buildlanguage/buildlanguage.mpl" folder="buildlanguage" />
<modulePath path="${project}/languages/custommps/custommps.mpl" folder="customMPS" />
<modulePath path="${project}/languages/dependency/dependency.mpl" folder="packaging" />
@@ -37,7 +37,7 @@
<target name="testBuildLanguage">
<mps.generate mpshome="${module.home}/../../.." loglevel="info" fork="true">
- <modules dir="${module.home}/../../../platform/buildlanguage"/>
+ <modules dir="${module.home}/../../../languages/util/buildlanguage"/>
</mps.generate>
</target>
@@ -1843,7 +1843,7 @@
<node role="templateNode" roleId="tpf8.1177093586806" type="tpsk.FileName" typeId="tpsk.1199031681512" id="1580548376419850388">
<node role="value" roleId="tpsk.1199031757132" type="tpsk.PlusOperation" typeId="tpsk.1197108973325" id="1580548376419850389">
<node role="right" roleId="tpsk.1197107881958" type="tpsk.StringLiteral" typeId="tpsk.1196861005114" id="1580548376419850390">
- <property name="value" nameId="tpsk.1196861024475" value="/platform/buildlanguage/languages/distrib/classes" />
+ <property name="value" nameId="tpsk.1196861024475" value="/languages/util/buildlanguage/languages/distrib/classes" />
</node>
<node role="left" roleId="tpsk.1197107855106" type="tpsk.PropertyReference" typeId="tpsk.1196853662806" id="1580548376419850391">
<link role="propertyDeclaration" roleId="tpsk.1196853671400" targetNodeId="1230642359528" resolveInfo="mps_home" />
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<solution name="jetbrains.mps.build.antsupport" uuid="77c9a130-703f-4530-bf21-6580757768d0" compileInMPS="false" generatorOutputPath="${mps_home}/platform/buildlanguage/ant/source_gen">
+<solution name="jetbrains.mps.build.antsupport" uuid="77c9a130-703f-4530-bf21-6580757768d0" compileInMPS="false" generatorOutputPath="${mps_home}/languages/util/buildlanguage/ant/source_gen">
<models>
<modelRoot path="${solution_descriptor}/" namespacePrefix="" />
</models>
<stubModelEntries>
- <stubModelEntry path="${mps_home}/platform/buildlanguage/ant/classes">
+ <stubModelEntry path="${mps_home}/languages/util/buildlanguage/ant/classes">
<manager moduleId="f3061a53-9226-4cc5-a443-f952ceaf5816" className="jetbrains.mps.baseLanguage.stubs.JavaStubs" />
</stubModelEntry>
</stubModelEntries>
@@ -4,7 +4,7 @@
<modelRoot path="${solution_descriptor}/" namespacePrefix="" />
</models>
<stubModelEntries>
- <stubModelEntry path="${mps_home}/platform/ui/languages/swing/lib/swingx-1.6.jar" include="false">
+ <stubModelEntry path="${mps_home}/languages/util/ui/languages/swing/lib/swingx-1.6.jar" include="false">
<manager moduleId="f3061a53-9226-4cc5-a443-f952ceaf5816" className="jetbrains.mps.baseLanguage.stubs.JavaStubs" />
</stubModelEntry>
</stubModelEntries>
@@ -4,7 +4,7 @@
<modelRoot path="${solution_descriptor}/" namespacePrefix="" />
</models>
<stubModelEntries>
- <stubModelEntry path="${mps_home}/platform/ui/languages/swt/lib/macosx/64/swt.jar" include="false">
+ <stubModelEntry path="${mps_home}/languages/util/ui/languages/swt/lib/macosx/64/swt.jar" include="false">
<manager moduleId="f3061a53-9226-4cc5-a443-f952ceaf5816" className="jetbrains.mps.baseLanguage.stubs.JavaStubs" />
</stubModelEntry>
</stubModelEntries>
@@ -4,7 +4,7 @@
<modelRoot path="${solution_descriptor}/" namespacePrefix="" />
</models>
<stubModelEntries>
- <stubModelEntry path="${mps_home}/platform/xmlUnitTest/languages/xmlUnitTest/lib/xmlunit-1.3.jar" include="false">
+ <stubModelEntry path="${mps_home}/languages/util/xmlUnitTest/languages/xmlUnitTest/lib/xmlunit-1.3.jar" include="false">
<manager moduleId="f3061a53-9226-4cc5-a443-f952ceaf5816" className="jetbrains.mps.baseLanguage.stubs.JavaStubs" />
</stubModelEntry>
</stubModelEntries>
@@ -3,7 +3,7 @@
<property environment="env"/>
<property file="./test.properties"/>
<taskdef resource="jetbrains/mps/build/ant/antlib.xml"
- classpath="${mps_home}/platform/generate.ant.task.jar"/>
+ classpath="${mps_home}/languages/util/generate.ant.task.jar"/>
<target name="test">
<mps.test.generation fork="true" mpshome="${mps_home}" loglevel="info" invokeTests="true">
@@ -21,9 +21,9 @@
</projectSolutions>
<projectLanguages>
<languagePath path="${project}/xml.mpl" />
- <languagePath path="${mps_home}/platform/xml/xmlInternal/xmlInternal.mpl" />
- <languagePath path="${mps_home}/platform/xml/xmlSchema/xmlSchema.mpl" />
- <languagePath path="${mps_home}/platform/xml/xmlQuery/xmlQuery.mpl" folder="" />
+ <languagePath path="${mps_home}/languages/util/xml/xmlInternal/xmlInternal.mpl" />
+ <languagePath path="${mps_home}/languages/util/xml/xmlSchema/xmlSchema.mpl" />
+ <languagePath path="${mps_home}/languages/util/xml/xmlQuery/xmlQuery.mpl" folder="" />
</projectLanguages>
<projectDevkits />
<genConfs>
@@ -2,7 +2,7 @@
<property name="mps.home" value="${ant.file.make_all_modules}/../.."/>
<taskdef resource="jetbrains/mps/build/ant/antlib.xml"
- classpath="${mps.home}/platform/buildlanguage/ant/classes"/>
+ classpath="${mps.home}/languages/util/buildlanguage/ant/classes"/>
<jvmargs id="mps.args">
<arg value="-Xss1024k"/>
Oops, something went wrong.

0 comments on commit 4f1c9e9

Please sign in to comment.