Permalink
Browse files

build: move license folder -> standalone

  • Loading branch information...
1 parent 79b3204 commit 377487e127e2741fd4ab70d95504405514692113 @inspirer inspirer committed May 31, 2012
View
@@ -90,7 +90,7 @@
</zip>
<mkdir dir="${build.layout}/license" />
<copy todir="${build.layout}/license">
- <fileset dir="${basedir}/license" />
+ <fileset dir="${artifacts.buildStandalone}/license" />
</copy>
<mkdir dir="${build.layout}/plugin" />
<copy todir="${build.layout}/plugin">
@@ -35,6 +35,10 @@
<copy todir="${build.layout}/lib">
<fileset dir="${artifacts.buildWorkbench}/lib" />
</copy>
+ <mkdir dir="${build.layout}/license" />
+ <copy todir="${build.layout}/license">
+ <fileset dir="${basedir}/license" />
+ </copy>
<mkdir dir="${build.layout}/plugins" />
<copy todir="${build.layout}/plugins">
<fileset dir="${artifacts.buildCoreEx}/plugins" />
@@ -8655,14 +8655,8 @@
<property name="text" nameId="3ior.4903714810883755350" value="license" />
</node>
</node>
- <node role="children" roleId="3ior.7389400916848037006" type="3ior.BuildLayout_Copy" typeId="3ior.5248329904287857081" id="4301118715654325737">
- <node role="fileset" roleId="3ior.5248329904287857082" type="3ior.BuildInputFiles" typeId="3ior.5248329904287794596" id="4301118715654325738">
- <node role="dir" roleId="3ior.5248329904287794598" type="3ior.BuildSourceProjectRelativePath" typeId="3ior.5481553824944787378" id="4301118715654325739">
- <node role="compositePart" roleId="3ior.7321017245477039051" type="3ior.BuildCompositePath" typeId="3ior.8618885170173601777" id="4301118715654325740">
- <property name="head" nameId="3ior.8618885170173601779" value="license" />
- </node>
- </node>
- </node>
+ <node role="children" roleId="3ior.7389400916848037006" type="3ior.BuildLayout_ImportContent" typeId="3ior.5610619299013057363" id="1348803421063031340">
+ <link role="target" roleId="3ior.5610619299013057365" targetNodeId="1348803421063031332" resolveInfo="license" />
</node>
</node>
<node role="children" roleId="3ior.7389400916848037006" type="3ior.BuildLayout_Folder" typeId="3ior.7389400916848036984" id="4301118715654325697">
@@ -16882,6 +16876,22 @@
<link role="target" roleId="3ior.5610619299013057365" targetNodeId="6361939271669594326" resolveInfo="lib" />
</node>
</node>
+ <node role="children" roleId="3ior.7389400916848037006" type="3ior.BuildLayout_Folder" typeId="3ior.7389400916848036984" id="1348803421063031332">
+ <node role="containerName" roleId="3ior.4380385936562148502" type="3ior.BuildStringNotEmpty" typeId="3ior.841011766566059607" id="1348803421063031333">
+ <node role="parts" roleId="3ior.4903714810883783243" type="3ior.BuildTextStringPart" typeId="3ior.4903714810883702019" id="1348803421063031334">
+ <property name="text" nameId="3ior.4903714810883755350" value="license" />
+ </node>
+ </node>
+ <node role="children" roleId="3ior.7389400916848037006" type="3ior.BuildLayout_Copy" typeId="3ior.5248329904287857081" id="1348803421063031335">
+ <node role="fileset" roleId="3ior.5248329904287857082" type="3ior.BuildInputFiles" typeId="3ior.5248329904287794596" id="1348803421063031336">
+ <node role="dir" roleId="3ior.5248329904287794598" type="3ior.BuildSourceProjectRelativePath" typeId="3ior.5481553824944787378" id="1348803421063031337">
+ <node role="compositePart" roleId="3ior.7321017245477039051" type="3ior.BuildCompositePath" typeId="3ior.8618885170173601777" id="1348803421063031338">
+ <property name="head" nameId="3ior.8618885170173601779" value="license" />
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
<node role="children" roleId="3ior.7389400916848037006" type="3ior.BuildLayout_Folder" typeId="3ior.7389400916848036984" id="1392391688313033194">
<node role="containerName" roleId="3ior.4380385936562148502" type="3ior.BuildStringNotEmpty" typeId="3ior.841011766566059607" id="1392391688313033195">
<node role="parts" roleId="3ior.4903714810883783243" type="3ior.BuildTextStringPart" typeId="3ior.4903714810883702019" id="1392391688313033196">
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="14rt3pe2dg3oldez04iby0uvb952yh">
+<dependencies version="2" modelHash="a0cj2v2hma090en4dmi6c3posb1xr6">
<dep model="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
<dep model="r:00000000-0000-4000-0000-011c895902e8(jetbrains.mps.lang.generator.structure)" />
<dep model="r:00000000-0000-4000-0000-011c89590575(jetbrains.mps.gtext.structure)" />
@@ -69,7 +69,7 @@
<dep model="r:fdebfc98-bbd7-4c50-8a8d-eda16da9406e(jetbrains.mps.build.generator.template.main@generator)" />
<file name="buildDistribution.xml" />
</source>
- <source id="4301118715654192646" name="buildMPS" hash="a2fhb0nbx9oacmm90bmrlwxt68by2nt">
+ <source id="4301118715654192646" name="buildMPS" hash="-6nea87foqejl6n0rr89koiav110bm9">
<dep root="1392391688312941958" />
<dep model="r:00000000-0000-4000-0000-011c895902e8(jetbrains.mps.lang.generator.structure)" />
<dep model="r:54537613-52b5-40a8-b223-e87f0960b04f(jetbrains.mps.build.mps.generator.template.main@generator)" />
@@ -298,7 +298,7 @@
<dep model="r:fdebfc98-bbd7-4c50-8a8d-eda16da9406e(jetbrains.mps.build.generator.template.main@generator)" />
<file name="buildDevKit.xml" />
</source>
- <source id="1392391688312941958" name="buildStandalone" hash="3rjfrhgsm9wn4ezj9frhhr75qgdzrmg">
+ <source id="1392391688312941958" name="buildStandalone" hash="3c15u68ldfocstyff83ynnu1enw7bos">
<dep root="7926701909975931624" />
<dep model="r:00000000-0000-4000-0000-011c895902e8(jetbrains.mps.lang.generator.structure)" />
<dep model="r:54537613-52b5-40a8-b223-e87f0960b04f(jetbrains.mps.build.mps.generator.template.main@generator)" />
@@ -90,7 +90,7 @@
</zip>
<mkdir dir="${build.layout}/license" />
<copy todir="${build.layout}/license">
- <fileset dir="${basedir}/license" />
+ <fileset dir="${artifacts.buildStandalone}/license" />
</copy>
<mkdir dir="${build.layout}/plugin" />
<copy todir="${build.layout}/plugin">
@@ -35,6 +35,10 @@
<copy todir="${build.layout}/lib">
<fileset dir="${artifacts.buildWorkbench}/lib" />
</copy>
+ <mkdir dir="${build.layout}/license" />
+ <copy todir="${build.layout}/license">
+ <fileset dir="${basedir}/license" />
+ </copy>
<mkdir dir="${build.layout}/plugins" />
<copy todir="${build.layout}/plugins">
<fileset dir="${artifacts.buildCoreEx}/plugins" />
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<debugInfo>
<root nodeId="1392391688312941958">
- <unitInfo nodeId="1392391688312941958" fileName="buildStandalone.xml" startLine="1" startPosition="0" endLine="85" endPosition="10" unitName="jetbrains.mps.ide.build.buildStandalone" />
+ <unitInfo nodeId="1392391688312941958" fileName="buildStandalone.xml" startLine="1" startPosition="0" endLine="89" endPosition="10" unitName="jetbrains.mps.ide.build.buildStandalone" />
</root>
<root nodeId="1545517825663017278">
<unitInfo nodeId="1545517825663017278" fileName="buildVcs.xml" startLine="1" startPosition="0" endLine="146" endPosition="10" unitName="jetbrains.mps.ide.build.buildVcs" />
@@ -872,11 +872,11 @@
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="26" startPosition="8" endLine="26" endPosition="9" conceptFqName="jetbrains.mps.gtext.structure.GText" />
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="26" startPosition="9" endLine="26" endPosition="62" conceptFqName="jetbrains.mps.gtext.structure.GItemList" />
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="26" startPosition="9" endLine="26" endPosition="10" conceptFqName="jetbrains.mps.gtext.structure.GText" />
+ <nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="26" startPosition="10" endLine="26" endPosition="33" conceptFqName="jetbrains.mps.gtext.structure.GItemList" />
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="26" startPosition="10" endLine="26" endPosition="61" conceptFqName="jetbrains.mps.gtext.structure.GItemList" />
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="26" startPosition="10" endLine="26" endPosition="61" conceptFqName="jetbrains.mps.gtext.structure.GItemList" />
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="26" startPosition="10" endLine="26" endPosition="61" conceptFqName="jetbrains.mps.gtext.structure.GItemList" />
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="26" startPosition="10" endLine="26" endPosition="61" conceptFqName="jetbrains.mps.gtext.structure.GItemList" />
- <nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="26" startPosition="10" endLine="26" endPosition="33" conceptFqName="jetbrains.mps.gtext.structure.GItemList" />
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="26" startPosition="10" endLine="26" endPosition="13" conceptFqName="jetbrains.mps.gtext.structure.GText" />
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="26" startPosition="13" endLine="26" endPosition="33" conceptFqName="jetbrains.mps.gtext.structure.GItemList" />
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="26" startPosition="13" endLine="26" endPosition="14" conceptFqName="jetbrains.mps.gtext.structure.GText" />
@@ -1350,11 +1350,11 @@
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="57" startPosition="100" endLine="57" endPosition="101" conceptFqName="jetbrains.mps.gtext.structure.GText" />
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="58" startPosition="0" endLine="58" endPosition="0" conceptFqName="jetbrains.mps.gtext.structure.GIndent" />
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="58" startPosition="0" endLine="58" endPosition="2" conceptFqName="jetbrains.mps.gtext.structure.GText" />
- <nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="59" startPosition="0" endLine="59" endPosition="8" conceptFqName="jetbrains.mps.gtext.structure.GItemList" />
- <nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="59" startPosition="0" endLine="59" endPosition="83" conceptFqName="jetbrains.mps.gtext.structure.GItemList" />
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="59" startPosition="0" endLine="59" endPosition="83" conceptFqName="jetbrains.mps.gtext.structure.GItemList" />
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="59" startPosition="0" endLine="59" endPosition="7" conceptFqName="jetbrains.mps.gtext.structure.GItemList" />
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="59" startPosition="0" endLine="59" endPosition="83" conceptFqName="jetbrains.mps.gtext.structure.GItemList" />
+ <nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="59" startPosition="0" endLine="59" endPosition="8" conceptFqName="jetbrains.mps.gtext.structure.GItemList" />
+ <nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="59" startPosition="0" endLine="59" endPosition="83" conceptFqName="jetbrains.mps.gtext.structure.GItemList" />
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="59" startPosition="0" endLine="59" endPosition="83" conceptFqName="jetbrains.mps.gtext.structure.GItemList" />
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="59" startPosition="0" endLine="59" endPosition="2" conceptFqName="jetbrains.mps.gtext.structure.GText" />
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="59" startPosition="2" endLine="59" endPosition="6" conceptFqName="jetbrains.mps.gtext.structure.GText" />
@@ -1366,8 +1366,8 @@
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="59" startPosition="10" endLine="59" endPosition="18" conceptFqName="jetbrains.mps.gtext.structure.GText" />
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="59" startPosition="18" endLine="59" endPosition="19" conceptFqName="jetbrains.mps.gtext.structure.GText" />
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="59" startPosition="19" endLine="59" endPosition="20" conceptFqName="jetbrains.mps.gtext.structure.GText" />
- <nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="59" startPosition="20" endLine="59" endPosition="43" conceptFqName="jetbrains.mps.gtext.structure.GItemList" />
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="59" startPosition="20" endLine="59" endPosition="42" conceptFqName="jetbrains.mps.gtext.structure.GItemList" />
+ <nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="59" startPosition="20" endLine="59" endPosition="43" conceptFqName="jetbrains.mps.gtext.structure.GItemList" />
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="59" startPosition="20" endLine="59" endPosition="22" conceptFqName="jetbrains.mps.gtext.structure.GText" />
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="59" startPosition="22" endLine="59" endPosition="41" conceptFqName="jetbrains.mps.gtext.structure.GText" />
<nodeInfo nodeId="716066598061903713" fileName="mps.sh" startLine="59" startPosition="41" endLine="59" endPosition="42" conceptFqName="jetbrains.mps.gtext.structure.GText" />

0 comments on commit 377487e

Please sign in to comment.