Rebuild build solution
This commit is contained in:
parent
3793b78efb
commit
ca7f630235
|
|
@ -526,9 +526,7 @@
|
|||
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
|
||||
<module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
|
||||
<module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" kind="cl" />
|
||||
<module ref="af65afd8-f0dd-4942-87d9-63a55f2a9db1(jetbrains.mps.lang.behavior)" kind="cl" />
|
||||
<module ref="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" kind="cl" />
|
||||
<module ref="65e59b42-e7f3-45ec-8692-6c7829780afe(jetbrains.mps.lang.smodelExt)" kind="cl" />
|
||||
<module ref="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" kind="cl" />
|
||||
</dependencies>
|
||||
<uses>
|
||||
|
|
@ -3021,7 +3019,7 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.behaviorExt" depends="fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.behaviorExt" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.smodelExt, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.behaviorExt/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.behaviorExt" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.behaviorExt" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -3036,9 +3034,7 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-context.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-problem.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
|
||||
|
|
@ -3057,6 +3053,10 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.smodelExt" />
|
||||
<fileset file="${artifacts.mps}/lib/annotations.jar" />
|
||||
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/log4j.jar" />
|
||||
|
|
@ -3064,6 +3064,8 @@
|
|||
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/ecj-4.16.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
|
||||
|
|
@ -3071,7 +3073,9 @@
|
|||
<fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.template.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
|
||||
<fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
|
||||
|
|
@ -4536,7 +4540,7 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.baseLanguage.tuplesExt" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.smodelExt, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.baseLanguage.tuplesExt" depends="java.compile.jetbrains.mps.baseLanguageExt, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.tuplesExt/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.tuplesExt" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.tuplesExt" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -4573,7 +4577,6 @@
|
|||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.smodelExt" />
|
||||
<fileset file="${artifacts.mps}/lib/annotations.jar" />
|
||||
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/log4j.jar" />
|
||||
|
|
@ -4581,20 +4584,14 @@
|
|||
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/ecj-4.16.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
|
||||
<fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
|
||||
<fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.template.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
|
||||
<fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
|
||||
<fileset file="${artifacts.coderules}/deploy/jetbrains.mps.logic.jar" />
|
||||
|
|
@ -5637,7 +5634,6 @@
|
|||
<pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
|
||||
<pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
|
||||
<pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
|
||||
<pathelement location="${build.layout}/deploy/jetbrains.mps.lang.smodelExt.jar" />
|
||||
</path>
|
||||
<pathconvert pathsep="${path.separator}" property="mps.libraries.path.string" refid="mps.libraries.path" />
|
||||
<path id="mps.plugins.path">
|
||||
|
|
|
|||
|
|
@ -582,6 +582,16 @@
|
|||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="1tzntNAvpnW" role="3bR37C">
|
||||
<node concept="3bR9La" id="1tzntNAvpnX" role="1SiIV1">
|
||||
<ref role="3bR37D" node="69UmpDmJW26" resolve="jetbrains.mps.baseLanguageExt" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="1tzntNAvpnY" role="3bR37C">
|
||||
<node concept="3bR9La" id="1tzntNAvpnZ" role="1SiIV1">
|
||||
<ref role="3bR37D" node="6Dg__VJQ3B2" resolve="jetbrains.mps.lang.smodelExt" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1E1JtD" id="61G6TdEeMYr" role="2G$12L">
|
||||
<property role="TrG5h" value="jetbrains.mps.lang.typesystemExt" />
|
||||
|
|
@ -1946,16 +1956,6 @@
|
|||
<ref role="3bR37D" to="ffeo:7Kfy9QB6L2N" resolve="jetbrains.mps.baseLanguage.tuples.runtime" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="1tzntNAo2P1" role="3bR37C">
|
||||
<node concept="3bR9La" id="1tzntNAo2P2" role="1SiIV1">
|
||||
<ref role="3bR37D" to="ffeo:7Kfy9QB6L4p" resolve="jetbrains.mps.lang.behavior" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="1tzntNAo2P3" role="3bR37C">
|
||||
<node concept="3bR9La" id="1tzntNAo2P4" role="1SiIV1">
|
||||
<ref role="3bR37D" node="6Dg__VJQ3B2" resolve="jetbrains.mps.lang.smodelExt" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1E1JtA" id="3mSr9E04JGq" role="2G$12L">
|
||||
<property role="BnDLt" value="true" />
|
||||
|
|
|
|||
Loading…
Reference in New Issue