Skip to content

Commit

Permalink
fix problem with custommps generation on build
Browse files Browse the repository at this point in the history
  • Loading branch information
@juliabeliaeva
juliabeliaeva committed Feb 1, 2011
1 parent 5947ce6 commit d27582c
Show file tree
Hide file tree
Showing 203 changed files with 15,056 additions and 376 deletions.
365 changes: 195 additions & 170 deletions build/MPS-compile.xml
View file

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions build/MPS-languages.xml
View file
Expand Up @@ -281,13 +281,15 @@
</jar>
</target>
<target name="pack.jetbrains.mps.baseLanguage.unitTest.lib_x2f0">
<mkdir dir="core/baseLanguage/unitTest/solutions/jetbrains.mps.baseLnaguage.unitTest.lib/classes_gen" />
<mkdir dir="core/baseLanguage/unitTest/solutions/jetbrains.mps.baseLnaguage.unitTest.lib/source_gen.caches" />
<mkdir dir="core/baseLanguage/unitTest/solutions/jetbrains.mps.baseLnaguage.unitTest.lib/test_gen.caches" />
<jar destfile="${deploy.dir}/MPS/core/baseLanguage/jetbrains.mps.baseLanguage.unitTest.lib.mpsarch.jar" compress="true" duplicate="preserve" filesonly="true">
<zipfileset file="core/baseLanguage/unitTest/solutions/jetbrains.mps.baseLnaguage.unitTest.lib/jetbrains.mps.baseLnaguage.unitTest.lib.msd" prefix="module" />
<zipfileset dir="core/baseLanguage/unitTest/solutions/jetbrains.mps.baseLnaguage.unitTest.lib/source_gen.caches" prefix="source_gen.caches" />
<zipfileset dir="core/baseLanguage/unitTest/solutions/jetbrains.mps.baseLnaguage.unitTest.lib/test_gen.caches" prefix="test_gen.caches" />
<zipfileset dir="core/baseLanguage/unitTest/solutions/jetbrains.mps.baseLnaguage.unitTest.lib" excludes="**/*.iml, **/*.java, **/*.class, **/*.mpr, **/*.mws, **/*.mpl, **/*.msd, **/*.devkit, **/*.ipr" prefix="module" />
<zipfileset dir="core/baseLanguage/unitTest/solutions/jetbrains.mps.baseLnaguage.unitTest.lib/classes_gen" />
</jar>
</target>
<target name="pack.jetbrains.mps.baseLanguage.test_y2f0">
Expand Down
1 change: 1 addition & 0 deletions platform/buildlanguage/BuildLanguage.mpr
View file
Expand Up @@ -137,6 +137,7 @@
<option name="mySupportsUserInfoFilter" value="true" />
</component>
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="" />
<mapping directory="$APPLICATION_HOME_DIR$" vcs="Git" />
</component>
</project>
Expand Down
83 changes: 83 additions & 0 deletions ...uage/languages/buildlanguage/source_gen.caches/jetbrains/mps/buildlanguage/actions/.debug
View file
@@ -0,0 +1,83 @@
<?xml version="1.0" encoding="UTF-8"?>
<debugInfo>
<unitInfo fileName="QueriesGenerated.java" startLine="211" startPosition="51" endLine="228" endPosition="7" unitName="jetbrains.mps.buildlanguage.actions.QueriesGenerated$6" />
<unitInfo fileName="QueriesGenerated.java" startLine="48" startPosition="53" endLine="66" endPosition="9" unitName="jetbrains.mps.buildlanguage.actions.QueriesGenerated$1" />
<unitInfo fileName="QueriesGenerated.java" startLine="73" startPosition="53" endLine="91" endPosition="9" unitName="jetbrains.mps.buildlanguage.actions.QueriesGenerated$2" />
<unitInfo fileName="QueriesGenerated.java" startLine="155" startPosition="51" endLine="174" endPosition="7" unitName="jetbrains.mps.buildlanguage.actions.QueriesGenerated$4" />
<unitInfo fileName="QueriesGenerated.java" startLine="183" startPosition="51" endLine="202" endPosition="7" unitName="jetbrains.mps.buildlanguage.actions.QueriesGenerated$5" />
<unitInfo fileName="QueriesGenerated.java" startLine="103" startPosition="53" endLine="125" endPosition="9" unitName="jetbrains.mps.buildlanguage.actions.QueriesGenerated$3" />
<unitInfo fileName="QueriesGenerated.java" startLine="27" startPosition="0" endLine="233" endPosition="0" unitName="jetbrains.mps.buildlanguage.actions.QueriesGenerated" />
<root nodeId="1196869239711">
<nodeInfo nodeId="1196869303147" fileName="QueriesGenerated.java" startLine="49" startPosition="94" endLine="50" endPosition="127" />
<nodeInfo nodeId="1196869318111" fileName="QueriesGenerated.java" startLine="50" startPosition="127" endLine="51" endPosition="66" />
<nodeInfo nodeId="1196869664780" fileName="QueriesGenerated.java" startLine="55" startPosition="60" endLine="56" endPosition="34" />
<nodeInfo nodeId="1196869401578" fileName="QueriesGenerated.java" startLine="74" startPosition="94" endLine="75" endPosition="127" />
<nodeInfo nodeId="1196869401584" fileName="QueriesGenerated.java" startLine="75" startPosition="127" endLine="76" endPosition="67" />
<nodeInfo nodeId="1196869686082" fileName="QueriesGenerated.java" startLine="80" startPosition="60" endLine="81" endPosition="35" />
<scopeInfo nodeId="1201708668620" fileName="QueriesGenerated.java" startLine="30" startPosition="197" endLine="31" endPosition="152" />
<scopeInfo nodeId="1196869657888" fileName="QueriesGenerated.java" startLine="55" startPosition="60" endLine="56" endPosition="34" />
<scopeInfo nodeId="1209908430607" fileName="QueriesGenerated.java" startLine="59" startPosition="57" endLine="60" endPosition="26" />
<scopeInfo nodeId="1196869682894" fileName="QueriesGenerated.java" startLine="80" startPosition="60" endLine="81" endPosition="35" />
<scopeInfo nodeId="1209908440876" fileName="QueriesGenerated.java" startLine="84" startPosition="57" endLine="85" endPosition="27" />
<scopeInfo nodeId="1196869295567" fileName="QueriesGenerated.java" startLine="49" startPosition="94" endLine="52" endPosition="26">
<varInfo nodeId="1196869303148" varName="result" />
</scopeInfo>
<scopeInfo nodeId="1196869401577" fileName="QueriesGenerated.java" startLine="74" startPosition="94" endLine="77" endPosition="26">
<varInfo nodeId="1196869401579" varName="result" />
</scopeInfo>
</root>
<root nodeId="1197109279495">
<nodeInfo nodeId="1197109443728" fileName="QueriesGenerated.java" startLine="156" startPosition="51" endLine="157" endPosition="120" />
<nodeInfo nodeId="1197109464909" fileName="QueriesGenerated.java" startLine="157" startPosition="120" endLine="158" endPosition="80" />
<nodeInfo nodeId="1197109501373" fileName="QueriesGenerated.java" startLine="158" startPosition="80" endLine="159" endPosition="85" />
<nodeInfo nodeId="1197109515761" fileName="QueriesGenerated.java" startLine="159" startPosition="85" endLine="160" endPosition="25" />
<nodeInfo nodeId="1218634224067" fileName="QueriesGenerated.java" startLine="184" startPosition="51" endLine="185" endPosition="120" />
<nodeInfo nodeId="1218634224073" fileName="QueriesGenerated.java" startLine="185" startPosition="120" endLine="186" endPosition="80" />
<nodeInfo nodeId="1218634224078" fileName="QueriesGenerated.java" startLine="186" startPosition="80" endLine="187" endPosition="86" />
<nodeInfo nodeId="1218634224085" fileName="QueriesGenerated.java" startLine="187" startPosition="86" endLine="188" endPosition="25" />
<scopeInfo nodeId="1197109401174" fileName="QueriesGenerated.java" startLine="156" startPosition="51" endLine="160" endPosition="25">
<varInfo nodeId="1197109443729" varName="newNode" />
</scopeInfo>
<scopeInfo nodeId="1218634224066" fileName="QueriesGenerated.java" startLine="184" startPosition="51" endLine="188" endPosition="25">
<varInfo nodeId="1218634224068" varName="newNode" />
</scopeInfo>
</root>
<root nodeId="1197476859335">
<nodeInfo nodeId="1197477243375" fileName="QueriesGenerated.java" startLine="104" startPosition="94" endLine="105" endPosition="119" />
<nodeInfo nodeId="1197477281711" fileName="QueriesGenerated.java" startLine="105" startPosition="119" endLine="106" endPosition="88" />
<nodeInfo nodeId="1197477356371" fileName="QueriesGenerated.java" startLine="106" startPosition="88" endLine="107" endPosition="27" />
<scopeInfo nodeId="1197476939574" fileName="QueriesGenerated.java" startLine="114" startPosition="83" endLine="115" endPosition="81" />
<scopeInfo nodeId="1197477046710" fileName="QueriesGenerated.java" startLine="118" startPosition="57" endLine="119" endPosition="27" />
<scopeInfo nodeId="1197476927931" fileName="QueriesGenerated.java" startLine="104" startPosition="94" endLine="107" endPosition="27">
<varInfo nodeId="1197477243376" varName="newNode" />
</scopeInfo>
</root>
<root nodeId="1201259600297">
<nodeInfo nodeId="1201259735279" fileName="QueriesGenerated.java" startLine="212" startPosition="51" endLine="213" endPosition="84" />
<scopeInfo nodeId="1201259678302" fileName="QueriesGenerated.java" startLine="38" startPosition="196" endLine="39" endPosition="95" />
<scopeInfo nodeId="1201259711572" fileName="QueriesGenerated.java" startLine="212" startPosition="51" endLine="214" endPosition="42" />
</root>
<root nodeId="1201708820341">
<scopeInfo nodeId="1201708881513" fileName="QueriesGenerated.java" startLine="34" startPosition="197" endLine="35" endPosition="158" />
</root>
<root nodeId="353793545803348363">
<nodeInfo nodeId="353793545803348370" fileName="Util.java" startLine="12" startPosition="112" endLine="13" endPosition="205" />
<nodeInfo nodeId="353793545803348385" fileName="Util.java" startLine="15" startPosition="107" endLine="16" endPosition="267" />
<nodeInfo nodeId="353793545803348402" fileName="Util.java" startLine="18" startPosition="118" endLine="19" endPosition="220" />
<nodeInfo nodeId="353793545803348415" fileName="Util.java" startLine="20" startPosition="5" endLine="21" endPosition="17" />
<nodeInfo nodeId="353793545803348400" fileName="Util.java" startLine="17" startPosition="10" endLine="20" endPosition="5" />
<nodeInfo nodeId="353793545803348383" fileName="Util.java" startLine="14" startPosition="10" endLine="20" endPosition="5" />
<nodeInfo nodeId="353793545803348368" fileName="Util.java" startLine="11" startPosition="69" endLine="20" endPosition="5" />
<nodeInfo nodeId="353793545803348364" fileName="Util.java" startLine="10" startPosition="19" endLine="23" endPosition="0" />
<scopeInfo nodeId="353793545803348369" fileName="Util.java" startLine="12" startPosition="112" endLine="13" endPosition="205" />
<scopeInfo nodeId="353793545803348384" fileName="Util.java" startLine="15" startPosition="107" endLine="16" endPosition="267" />
<scopeInfo nodeId="353793545803348401" fileName="Util.java" startLine="18" startPosition="118" endLine="19" endPosition="220" />
<scopeInfo nodeId="353793545803348367" fileName="Util.java" startLine="11" startPosition="69" endLine="21" endPosition="17" />
<scopeInfo nodeId="353793545803348364" fileName="Util.java" startLine="10" startPosition="19" endLine="23" endPosition="0">
<varInfo nodeId="353793545803348417" varName="parentNode" />
<varInfo nodeId="353793545803348419" varName="type" />
</scopeInfo>
<unitInfo nodeId="353793545803348363" fileName="Util.java" startLine="10" startPosition="0" endLine="24" endPosition="0" unitName="jetbrains.mps.buildlanguage.actions.Util" />
</root>
</debugInfo>

37 changes: 37 additions & 0 deletions ...nguages/buildlanguage/source_gen.caches/jetbrains/mps/buildlanguage/actions/.dependencies
View file
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<dependenciesRoot>
<dependency className="jetbrains.mps.buildlanguage.actions.QueriesGenerated" file="QueriesGenerated.java">
<classNode dependClassName="java.lang.Integer" />
<classNode dependClassName="java.lang.Object" />
<classNode dependClassName="java.lang.String" />
<classNode dependClassName="java.util.ArrayList" />
<classNode dependClassName="java.util.List" />
<classNode dependClassName="java.util.regex.Pattern" />
<classNode dependClassName="jetbrains.mps.buildlanguage.actions.Util" />
<classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
<classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations" />
<classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
<classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SModelOperations" />
<classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
<classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations" />
<classNode dependClassName="jetbrains.mps.smodel.IOperationContext" />
<classNode dependClassName="jetbrains.mps.smodel.SModel" />
<classNode dependClassName="jetbrains.mps.smodel.SNode" />
<classNode dependClassName="jetbrains.mps.smodel.action.AbstractSideTransformHintSubstituteAction" />
<classNode dependClassName="jetbrains.mps.smodel.action.ChildSubstituteActionsHelper" />
<classNode dependClassName="jetbrains.mps.smodel.action.DefaultSimpleSubstituteAction" />
<classNode dependClassName="jetbrains.mps.smodel.action.INodeSubstituteAction" />
<classNode dependClassName="jetbrains.mps.smodel.action.NodeSubstituteActionsFactoryContext" />
<classNode dependClassName="jetbrains.mps.smodel.action.NodeSubstitutePreconditionContext" />
<classNode dependClassName="jetbrains.mps.smodel.action.SideTransformActionsBuilderContext" />
<classNode dependClassName="jetbrains.mps.smodel.action.SideTransformPreconditionContext" />
<classNode dependClassName="jetbrains.mps.util.NameUtil" />
</dependency>
<dependency className="jetbrains.mps.buildlanguage.actions.Util" file="Util.java">
<classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
<classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
<classNode dependClassName="jetbrains.mps.smodel.SNode" />
<classNode dependClassName="jetbrains.mps.util.NameUtil" />
</dependency>
</dependenciesRoot>

1 change: 1 addition & 0 deletions ...urce_gen.caches/jetbrains/mps/buildlanguage/actions/.hash.1gku6bm94e97tvcny2dbaybwsu1lfcm
View file
@@ -0,0 +1 @@
1gku6bm94e97tvcny2dbaybwsu1lfcm

0 comments on commit d27582c

Please sign in to comment.