Skip to content

Commit

Permalink
Remove empty generator
Browse files Browse the repository at this point in the history
This seems to be the right way to it(TM) for MPS 2019.3.
  • Loading branch information
scymtym committed Jan 17, 2020
1 parent 23769c2 commit 82e5173
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 188 deletions.
117 changes: 3 additions & 114 deletions build-plugin-mps.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@
<module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
<module ref="0a98f3e2-decf-4e97-bf80-9109eccc59bb(jetbrains.mps.lang.feedback.problem.rules)" kind="rt" />
<module ref="9abaaae2-decf-4e97-bf80-9109e8b759cc(jetbrains.mps.lang.messages.api)" kind="rt" />
<module ref="528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)" kind="rt" />
<module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" kind="rt" />
<module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
Expand All @@ -87,8 +86,8 @@
<module ref="760a0a8c-eabb-4521-8bfd-65db761a9ba3(jetbrains.mps.baseLanguage.logging)" kind="cl" />
<module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" kind="cl" />
<module ref="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" kind="cl" />
<module ref="528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)" kind="cl" />
<module ref="3a13115c-633c-4c5c-bbcc-75c4219e9555(jetbrains.mps.lang.quotation)" kind="cl" />
<module ref="c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)" kind="cl" />
</dependencies>
<uses>
<language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
Expand All @@ -98,7 +97,6 @@
<language id="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" />
<language id="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" />
<language id="l:96ee7a94-411d-4cf8-9b94-96cad7e52411:jetbrains.mps.baseLanguage.jdk7" />
<language id="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" />
<language id="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" />
<language id="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" />
<language id="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" />
Expand All @@ -124,7 +122,6 @@
<language id="l:517077fd-e44f-4338-a475-1d29781dfdb8:jetbrains.mps.lang.feedback.skeleton" />
<language id="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" />
<language id="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" />
<language id="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" />
<language id="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" />
<language id="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" />
<language id="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" />
Expand All @@ -151,63 +148,10 @@
<fileset dir="${basedir}/languages/Kinematics/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
<fileset dir="${build.tmp}/default/Kinematics.jar" />
</jar>
<mkdir dir="${build.tmp}/default/Kinematics-generator.jar" />
<mkdir dir="${build.tmp}/default/Kinematics-generator.jar/META-INF" />
<echoxml file="${build.tmp}/default/Kinematics-generator.jar/META-INF/module.xml">
<module namespace="Kinematics#4545946235936274613" type="generator" uuid="d43dfedd-bc2c-489c-8ded-6683b0d688f4">
<dependencies>
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="rt" />
<module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="rt" />
<module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="rt" />
<module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" kind="rt" />
<module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" kind="rt" />
<module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" kind="rt" />
<module ref="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" kind="rt" />
<module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" kind="rt" />
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
<module ref="d6881f78-a85d-4c9e-931e-30879e67afdd(Kinematics)" kind="cl" />
</dependencies>
<uses>
<language id="l:d6881f78-a85d-4c9e-931e-30879e67afdd:Kinematics" />
<language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
<language id="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" />
<language id="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" />
<language id="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" />
<language id="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" />
<language id="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" />
<language id="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" />
<language id="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" />
<language id="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" />
<language id="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" />
<language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
<language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
</uses>
<classpath>
<entry path="." />
</classpath>
<sources jar="Kinematics-src.jar" descriptor="Kinematics.mpl" />
</module>
</echoxml>
<jar destfile="${build.tmp}/default/Kinematics.zip/Kinematics/languages/Kinematics/Kinematics-generator.jar" duplicate="preserve">
<fileset dir="${build.tmp}/java/out/Kinematics#4545946235936274613" />
<fileset dir="${basedir}/languages/Kinematics/generator/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
<fileset dir="${build.tmp}/default/Kinematics-generator.jar" />
</jar>
<copyModels todir="${build.tmp}/customProcessors/copyModels/languages-Kinematics-models">
<fileset dir="${basedir}/languages/Kinematics/models" includes="**/*.mps, **/*.mpsr, **/.model" />
</copyModels>
<copyModels todir="${build.tmp}/customProcessors/copyModels/languages-Kinematics-generator-template">
<fileset dir="${basedir}/languages/Kinematics/generator/template" includes="**/*.mps, **/*.mpsr, **/.model" />
</copyModels>
<jar destfile="${build.tmp}/default/Kinematics.zip/Kinematics/languages/Kinematics/Kinematics-src.jar" duplicate="preserve">
<fileset dir="${basedir}/languages/Kinematics/generator/source_gen">
<exclude name="**/trace.info" />
<exclude name="**/exports" />
<exclude name="**/checkpoints" />
<exclude name="**/*.mps" />
</fileset>
<fileset dir="${basedir}/languages/Kinematics/source_gen">
<exclude name="**/trace.info" />
<exclude name="**/exports" />
Expand All @@ -216,7 +160,6 @@
</fileset>
<zipfileset file="${basedir}/languages/Kinematics/Kinematics.mpl" prefix="module" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-Kinematics-models" prefix="module/models" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-Kinematics-generator-template" prefix="module/generator/template" />
</jar>
<mkdir dir="${build.tmp}/default/Kinematics.build.jar" />
<mkdir dir="${build.tmp}/default/Kinematics.build.jar/META-INF" />
Expand Down Expand Up @@ -277,7 +220,7 @@
<delete dir="${build.layout}" />
</target>

<target name="compileJava" depends="java.compile.Kinematics, java.compile.Kinematics#4545946235936274613, java.compile.Kinematics.build" />
<target name="compileJava" depends="java.compile.Kinematics, java.compile.Kinematics.build" />

<target name="processResources" />

Expand Down Expand Up @@ -318,7 +261,6 @@
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.constraints.jar" />
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.constraints.rules.jar" />
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.constraints.rulesAndMessages.jar" />
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.migration.jar" />
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.structure.jar" />
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.typesystem.jar" />
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.general-purpose.jar" />
Expand Down Expand Up @@ -422,7 +364,6 @@
<module file="${basedir}/languages/Kinematics/Kinematics.mpl" />
<module file="${basedir}/solutions/Kinematics.build/Kinematics.build.msd" />
</chunk>
<chunk />
<jvmargs>
<arg value="-ea" />
<arg value="-Xmx512m" />
Expand Down Expand Up @@ -491,63 +432,12 @@
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.quotation.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
<fileset file="${artifacts.mps}/languages/text/jetbrains.mps.lang.text.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
</classpath>
</javac>
</target>

<target name="java.compile.Kinematics#4545946235936274613" depends="java.compile.Kinematics, fetchDependencies">
<mkdir dir="${basedir}/languages/Kinematics/generator/source_gen" />
<mkdir dir="${build.tmp}/java/out/Kinematics#4545946235936274613" />
<javac destdir="${build.tmp}/java/out/Kinematics#4545946235936274613" fork="true" encoding="utf8" includeantruntime="false" debug="true">
<compilerarg value="-Xlint:none" />
<src>
<path location="${basedir}/languages/Kinematics/generator/source_gen" />
</src>
<classpath>
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
<fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
<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" />
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
<fileset file="${artifacts.mps}/lib/mps-logging.jar" />
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
<fileset file="${artifacts.mps}/lib/mps-references.jar" />
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-generator.jar" />
<fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
<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" />
<fileset file="${artifacts.mps}/lib/mps-icons.jar" />
<fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
<pathelement path="${build.tmp}/java/out/Kinematics" />
<fileset file="${basedir}/languages/Kinematics/lib/jdom-2.0.6.jar" />
<fileset file="${artifacts.mps}/lib/annotations.jar" />
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.10.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
</classpath>
</javac>
</target>

<target name="java.compile.Kinematics.build">
<mkdir dir="${basedir}/solutions/Kinematics.build/source_gen" />
<mkdir dir="${build.tmp}/java/out/Kinematics.build" />
Expand All @@ -563,6 +453,5 @@
<target name="cleanSources">
<delete dir="${basedir}/languages/Kinematics/source_gen" />
<delete dir="${basedir}/solutions/Kinematics.build/source_gen" />
<delete dir="${basedir}/languages/Kinematics/generator/source_gen" />
</target>
</project>
41 changes: 0 additions & 41 deletions languages/Kinematics/Kinematics.mpl
Original file line number Diff line number Diff line change
Expand Up @@ -14,44 +14,6 @@
</facet>
</facets>
<accessoryModels />
<generators>
<generator namespace="Kinematics#4545946235936274613" uuid="d43dfedd-bc2c-489c-8ded-6683b0d688f4">
<models>
<modelRoot contentPath="${module}" type="default">
<sourceRoot location="generator/template" />
</modelRoot>
</models>
<external-templates />
<languageVersions>
<language slang="l:d6881f78-a85d-4c9e-931e-30879e67afdd:Kinematics" version="2" />
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="9" />
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="3" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="4" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
<module reference="d6881f78-a85d-4c9e-931e-30879e67afdd(Kinematics)" version="0" />
<module reference="d43dfedd-bc2c-489c-8ded-6683b0d688f4(Kinematics#4545946235936274613)" version="0" />
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
<module reference="9e98f4e2-decf-4e97-bf80-9109e8b759aa(jetbrains.mps.lang.feedback.context)" version="0" />
</dependencyVersions>
<mapping-priorities />
</generator>
</generators>
<stubModelEntries>
<stubModelEntry path="${module}/lib/jdom-2.0.6.jar" />
</stubModelEntries>
Expand Down Expand Up @@ -92,7 +54,6 @@
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="13" />
<language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
<language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
<language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
<language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
Expand All @@ -103,7 +64,6 @@
<language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
<language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
Expand All @@ -127,7 +87,6 @@
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
<module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
<module reference="9e98f4e2-decf-4e97-bf80-9109e8b759aa(jetbrains.mps.lang.feedback.context)" version="0" />
<module reference="528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)" version="0" />
<module reference="3a13115c-633c-4c5c-bbcc-75c4219e9555(jetbrains.mps.lang.quotation)" version="0" />
<module reference="c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)" version="0" />
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<product version="3" modelHash="2c5dyl62qln8yxtt327pc9jtik1r4uz">
<product version="3" modelHash="yig1m93i7usb9kqhvg4y9l92qkquc0">
<files names="QueriesGenerated.java" />
</product>

Loading

0 comments on commit 82e5173

Please sign in to comment.