Skip to content

Commit

Permalink
Rename Kinematics -> KinematicChains
Browse files Browse the repository at this point in the history
fixes #2
  • Loading branch information
scymtym committed Jan 29, 2020
1 parent 82e5173 commit 3af033b
Show file tree
Hide file tree
Showing 20 changed files with 128 additions and 157 deletions.
2 changes: 1 addition & 1 deletion .mps/.name
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Kinematics
KinematicChains
6 changes: 3 additions & 3 deletions .mps/modules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<project version="4">
<component name="MPSProject">
<projectModules>
<modulePath path="$PROJECT_DIR$/languages/Kinematics/Kinematics.mpl" folder="" />
<modulePath path="$PROJECT_DIR$/languages/Kinematics/sandbox/Kinematics.sandbox.msd" folder="" />
<modulePath path="$PROJECT_DIR$/solutions/Kinematics.build/Kinematics.build.msd" folder="" />
<modulePath path="$PROJECT_DIR$/languages/KinematicChains/KinematicChains.mpl" folder="" />
<modulePath path="$PROJECT_DIR$/solutions/KinematicChains.build/KinematicChains.build.msd" folder="" />
<modulePath path="$PROJECT_DIR$/solutions/KinematicChains.sandbox/KinematicChains.sandbox.msd" folder="" />
</projectModules>
</component>
</project>
129 changes: 64 additions & 65 deletions build-plugin-mps.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<project name="Kinematics" default="build">
<project name="KinematicChains" default="build">
<!-- Generated by MPS -->
<property name="build.dir" location="build" />
<property name="build.tmp" location="${build.dir}/tmp/Kinematics" />
<property name="build.layout" location="${build.dir}/artifacts/Kinematics" />
<property name="build.tmp" location="${build.dir}/tmp/KinematicChains" />
<property name="build.layout" location="${build.dir}/artifacts/KinematicChains" />
<property name="mps_home" location="" />
<property name="current_version" value="1.0.0" />
<property name="artifacts.mps" location="${mps_home}" />
Expand All @@ -27,13 +27,13 @@

<target name="assemble" depends="classes, declare-mps-tasks">
<mkdir dir="${build.layout}" />
<mkdir dir="${build.tmp}/default/Kinematics.zip" />
<mkdir dir="${build.tmp}/default/Kinematics.zip/Kinematics" />
<mkdir dir="${build.tmp}/default/Kinematics.zip/Kinematics/META-INF" />
<echoxml file="${build.tmp}/default/Kinematics.zip/Kinematics/META-INF/plugin.xml">
<mkdir dir="${build.tmp}/default/KinematicChains.zip" />
<mkdir dir="${build.tmp}/default/KinematicChains.zip/KinematicChains" />
<mkdir dir="${build.tmp}/default/KinematicChains.zip/KinematicChains/META-INF" />
<echoxml file="${build.tmp}/default/KinematicChains.zip/KinematicChains/META-INF/plugin.xml">
<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
<id>Kinematics</id>
<name>Kinematics</name>
<id>KinematicChains</id>
<name>KinematicChains</name>
<description>DSL covers the kinematic description of a robot (incl. URDF)</description>
<version>${current_version}</version>
<vendor url="https://ekvv.uni-bielefeld.de/pers_publ/publ/PersonDetail.jsp?personId=46595843">Dennis Leroy Wigand</vendor>
Expand All @@ -47,12 +47,12 @@
</extensions>
</idea-plugin>
</echoxml>
<mkdir dir="${build.tmp}/default/Kinematics.zip/Kinematics/languages" />
<mkdir dir="${build.tmp}/default/Kinematics.zip/Kinematics/languages/Kinematics" />
<mkdir dir="${build.tmp}/default/Kinematics.jar" />
<mkdir dir="${build.tmp}/default/Kinematics.jar/META-INF" />
<echoxml file="${build.tmp}/default/Kinematics.jar/META-INF/module.xml">
<module namespace="Kinematics" type="language" uuid="d6881f78-a85d-4c9e-931e-30879e67afdd">
<mkdir dir="${build.tmp}/default/KinematicChains.zip/KinematicChains/languages" />
<mkdir dir="${build.tmp}/default/KinematicChains.zip/KinematicChains/languages/KinematicChains" />
<mkdir dir="${build.tmp}/default/KinematicChains.jar" />
<mkdir dir="${build.tmp}/default/KinematicChains.jar/META-INF" />
<echoxml file="${build.tmp}/default/KinematicChains.jar/META-INF/module.xml">
<module namespace="KinematicChains" type="language" uuid="d6881f78-a85d-4c9e-931e-30879e67afdd">
<dependencies>
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="rt" />
<module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="rt" />
Expand Down Expand Up @@ -135,36 +135,36 @@
<language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
<language id="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" />
</uses>
<library jar="../../languages/Kinematics/lib/jdom-2.0.6.jar" />
<library jar="../../languages/KinematicChains/lib/jdom-2.0.6.jar" />
<classpath>
<entry path="." />
</classpath>
<sources jar="Kinematics-src.jar" descriptor="Kinematics.mpl" />
<sources jar="KinematicChains-src.jar" descriptor="KinematicChains.mpl" />
</module>
</echoxml>
<jar destfile="${build.tmp}/default/Kinematics.zip/Kinematics/languages/Kinematics/Kinematics.jar" duplicate="preserve">
<fileset dir="${build.tmp}/java/out/Kinematics" />
<fileset dir="${basedir}/languages/Kinematics" includes="icons/**, resources/**" />
<fileset dir="${basedir}/languages/Kinematics/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
<fileset dir="${build.tmp}/default/Kinematics.jar" />
<jar destfile="${build.tmp}/default/KinematicChains.zip/KinematicChains/languages/KinematicChains/KinematicChains.jar" duplicate="preserve">
<fileset dir="${build.tmp}/java/out/KinematicChains" />
<fileset dir="${basedir}/languages/KinematicChains" includes="icons/**, resources/**" />
<fileset dir="${basedir}/languages/KinematicChains/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
<fileset dir="${build.tmp}/default/KinematicChains.jar" />
</jar>
<copyModels todir="${build.tmp}/customProcessors/copyModels/languages-Kinematics-models">
<fileset dir="${basedir}/languages/Kinematics/models" includes="**/*.mps, **/*.mpsr, **/.model" />
<copyModels todir="${build.tmp}/customProcessors/copyModels/languages-KinematicChains-models">
<fileset dir="${basedir}/languages/KinematicChains/models" 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/source_gen">
<jar destfile="${build.tmp}/default/KinematicChains.zip/KinematicChains/languages/KinematicChains/KinematicChains-src.jar" duplicate="preserve">
<fileset dir="${basedir}/languages/KinematicChains/source_gen">
<exclude name="**/trace.info" />
<exclude name="**/exports" />
<exclude name="**/checkpoints" />
<exclude name="**/*.mps" />
</fileset>
<zipfileset file="${basedir}/languages/Kinematics/Kinematics.mpl" prefix="module" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-Kinematics-models" prefix="module/models" />
<zipfileset file="${basedir}/languages/KinematicChains/KinematicChains.mpl" prefix="module" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-KinematicChains-models" prefix="module/models" />
</jar>
<mkdir dir="${build.tmp}/default/Kinematics.build.jar" />
<mkdir dir="${build.tmp}/default/Kinematics.build.jar/META-INF" />
<echoxml file="${build.tmp}/default/Kinematics.build.jar/META-INF/module.xml">
<module namespace="Kinematics.build" type="solution" uuid="e698fac9-be95-401f-abc7-69942a3f3953">
<mkdir dir="${build.tmp}/default/KinematicChains.build.jar" />
<mkdir dir="${build.tmp}/default/KinematicChains.build.jar/META-INF" />
<echoxml file="${build.tmp}/default/KinematicChains.build.jar/META-INF/module.xml">
<module namespace="KinematicChains.build" type="solution" uuid="e698fac9-be95-401f-abc7-69942a3f3953">
<dependencies>
<module ref="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" kind="cl" />
</dependencies>
Expand All @@ -176,37 +176,36 @@
<classpath>
<entry path="." />
</classpath>
<sources jar="Kinematics.build-src.jar" descriptor="Kinematics.build.msd" />
<sources jar="KinematicChains.build-src.jar" descriptor="KinematicChains.build.msd" />
</module>
</echoxml>
<jar destfile="${build.tmp}/default/Kinematics.zip/Kinematics/languages/Kinematics/Kinematics.build.jar" duplicate="preserve">
<fileset dir="${build.tmp}/java/out/Kinematics.build" />
<fileset dir="${basedir}/solutions/Kinematics.build" includes="icons/**, resources/**" />
<fileset dir="${basedir}/solutions/Kinematics.build/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
<fileset dir="${build.tmp}/default/Kinematics.build.jar" />
<jar destfile="${build.tmp}/default/KinematicChains.zip/KinematicChains/languages/KinematicChains/KinematicChains.build.jar" duplicate="preserve">
<fileset dir="${build.tmp}/java/out/KinematicChains.build" />
<fileset dir="${basedir}/solutions/KinematicChains.build/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
<fileset dir="${build.tmp}/default/KinematicChains.build.jar" />
</jar>
<copyModels todir="${build.tmp}/customProcessors/copyModels/solutions-Kinematics.build-models">
<fileset dir="${basedir}/solutions/Kinematics.build/models" includes="**/*.mps, **/*.mpsr, **/.model" />
<copyModels todir="${build.tmp}/customProcessors/copyModels/solutions-KinematicChains.build-models">
<fileset dir="${basedir}/solutions/KinematicChains.build/models" includes="**/*.mps, **/*.mpsr, **/.model" />
</copyModels>
<jar destfile="${build.tmp}/default/Kinematics.zip/Kinematics/languages/Kinematics/Kinematics.build-src.jar" duplicate="preserve">
<fileset dir="${basedir}/solutions/Kinematics.build/source_gen">
<jar destfile="${build.tmp}/default/KinematicChains.zip/KinematicChains/languages/KinematicChains/KinematicChains.build-src.jar" duplicate="preserve">
<fileset dir="${basedir}/solutions/KinematicChains.build/source_gen">
<exclude name="**/trace.info" />
<exclude name="**/exports" />
<exclude name="**/checkpoints" />
<exclude name="**/*.mps" />
</fileset>
<zipfileset file="${basedir}/solutions/Kinematics.build/Kinematics.build.msd" prefix="module" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-Kinematics.build-models" prefix="module/models" />
<zipfileset file="${basedir}/solutions/KinematicChains.build/KinematicChains.build.msd" prefix="module" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-KinematicChains.build-models" prefix="module/models" />
</jar>
<zip destfile="${build.layout}/Kinematics.zip">
<zipfileset file="${basedir}/languages/Kinematics/lib/jdom-2.0.6.jar" prefix="Kinematics/languages/Kinematics/lib" />
<fileset dir="${build.tmp}/default/Kinematics.zip" />
<zip destfile="${build.layout}/KinematicChains.zip">
<zipfileset file="${basedir}/languages/KinematicChains/lib/jdom-2.0.6.jar" prefix="KinematicChains/languages/KinematicChains/lib" />
<fileset dir="${build.tmp}/default/KinematicChains.zip" />
</zip>
<mkdir dir="${build.layout}/lib" />
<copy todir="${build.layout}/lib">
<fileset file="${basedir}/languages/Kinematics/lib/jdom-2.0.6.jar" />
<fileset file="${basedir}/languages/KinematicChains/lib/jdom-2.0.6.jar" />
</copy>
<echo file="${build.layout}/build.properties">Kinematics.current_version=${current_version}${line.separator}mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}</echo>
<echo file="${build.layout}/build.properties">KinematicChains.current_version=${current_version}${line.separator}mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}</echo>
</target>

<target name="buildDependents" />
Expand All @@ -220,7 +219,7 @@
<delete dir="${build.layout}" />
</target>

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

<target name="processResources" />

Expand Down Expand Up @@ -361,8 +360,8 @@
<library file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.workflow.preset.jar" />
<library file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.ide.build.jar" />
<chunk>
<module file="${basedir}/languages/Kinematics/Kinematics.mpl" />
<module file="${basedir}/solutions/Kinematics.build/Kinematics.build.msd" />
<module file="${basedir}/languages/KinematicChains/KinematicChains.mpl" />
<module file="${basedir}/solutions/KinematicChains.build/KinematicChains.build.msd" />
</chunk>
<jvmargs>
<arg value="-ea" />
Expand All @@ -378,13 +377,13 @@

<target name="makeDependents" />

<target name="java.compile.Kinematics" depends="fetchDependencies">
<mkdir dir="${basedir}/languages/Kinematics/source_gen" />
<mkdir dir="${build.tmp}/java/out/Kinematics" />
<javac destdir="${build.tmp}/java/out/Kinematics" fork="true" encoding="utf8" includeantruntime="false" debug="true">
<target name="java.compile.KinematicChains" depends="fetchDependencies">
<mkdir dir="${basedir}/languages/KinematicChains/source_gen" />
<mkdir dir="${build.tmp}/java/out/KinematicChains" />
<javac destdir="${build.tmp}/java/out/KinematicChains" fork="true" encoding="utf8" includeantruntime="false" debug="true">
<compilerarg value="-Xlint:none" />
<src>
<path location="${basedir}/languages/Kinematics/source_gen" />
<path location="${basedir}/languages/KinematicChains/source_gen" />
</src>
<classpath>
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
Expand Down Expand Up @@ -416,7 +415,7 @@
<fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
<fileset file="${artifacts.mps}/lib/mps-icons.jar" />
<fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
<fileset file="${basedir}/languages/Kinematics/lib/jdom-2.0.6.jar" />
<fileset file="${basedir}/languages/KinematicChains/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" />
Expand All @@ -438,20 +437,20 @@
</javac>
</target>

<target name="java.compile.Kinematics.build">
<mkdir dir="${basedir}/solutions/Kinematics.build/source_gen" />
<mkdir dir="${build.tmp}/java/out/Kinematics.build" />
<javac destdir="${build.tmp}/java/out/Kinematics.build" fork="true" encoding="utf8" includeantruntime="false" debug="true">
<target name="java.compile.KinematicChains.build">
<mkdir dir="${basedir}/solutions/KinematicChains.build/source_gen" />
<mkdir dir="${build.tmp}/java/out/KinematicChains.build" />
<javac destdir="${build.tmp}/java/out/KinematicChains.build" fork="true" encoding="utf8" includeantruntime="false" debug="true">
<compilerarg value="-Xlint:none" />
<src>
<path location="${basedir}/solutions/Kinematics.build/source_gen" />
<path location="${basedir}/solutions/KinematicChains.build/source_gen" />
</src>
<classpath />
</javac>
</target>

<target name="cleanSources">
<delete dir="${basedir}/languages/Kinematics/source_gen" />
<delete dir="${basedir}/solutions/Kinematics.build/source_gen" />
<delete dir="${basedir}/languages/KinematicChains/source_gen" />
<delete dir="${basedir}/solutions/KinematicChains.build/source_gen" />
</target>
</project>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<language namespace="Kinematics" uuid="d6881f78-a85d-4c9e-931e-30879e67afdd" languageVersion="3" moduleVersion="0">
<language namespace="KinematicChains" uuid="d6881f78-a85d-4c9e-931e-30879e67afdd" languageVersion="3" moduleVersion="0">
<models>
<modelRoot contentPath="${module}" type="default">
<sourceRoot location="models" />
Expand Down Expand Up @@ -74,7 +74,7 @@
<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="d6881f78-a85d-4c9e-931e-30879e67afdd(KinematicChains)" version="0" />
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
<module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
<module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<model ref="r:508cb62d-392f-4e80-8340-a4df853548eb(Kinematics.behavior)">
<model ref="r:508cb62d-392f-4e80-8340-a4df853548eb(KinematicChains.behavior)">
<persistence version="9" />
<languages>
<use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
Expand All @@ -8,7 +8,7 @@
</languages>
<imports>
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
<import index="cewj" ref="r:cd13618c-02ad-4af8-a3e4-3414c58c4613(Kinematics.structure)" implicit="true" />
<import index="cewj" ref="r:cd13618c-02ad-4af8-a3e4-3414c58c4613(KinematicChains.structure)" implicit="true" />
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
</imports>
<registry>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<model ref="r:c14fa7b8-1df5-443f-89e6-4d51c3d5322c(Kinematics.constraints)">
<model ref="r:c14fa7b8-1df5-443f-89e6-4d51c3d5322c(KinematicChains.constraints)">
<persistence version="9" />
<languages>
<devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
</languages>
<imports>
<import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
<import index="cewj" ref="r:cd13618c-02ad-4af8-a3e4-3414c58c4613(Kinematics.structure)" implicit="true" />
<import index="cewj" ref="r:cd13618c-02ad-4af8-a3e4-3414c58c4613(KinematicChains.structure)" implicit="true" />
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
</imports>
<registry>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<model ref="r:4f38c9dc-6fbd-47e0-b9aa-3bcea73b4cc8(Kinematics.editor)">
<model ref="r:4f38c9dc-6fbd-47e0-b9aa-3bcea73b4cc8(KinematicChains.editor)">
<persistence version="9" />
<languages>
<use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="13" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
<imports>
<import index="cewj" ref="r:cd13618c-02ad-4af8-a3e4-3414c58c4613(Kinematics.structure)" implicit="true" />
<import index="cewj" ref="r:cd13618c-02ad-4af8-a3e4-3414c58c4613(KinematicChains.structure)" implicit="true" />
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
</imports>
<registry>
Expand Down
Loading

0 comments on commit 3af033b

Please sign in to comment.