Skip to content

Commit

Permalink
Do not publish platform test build script
Browse files Browse the repository at this point in the history
Move it to a separate solution that will not be part of the
distribution.
  • Loading branch information
sergej-koscejev committed Aug 17, 2024
1 parent 4c7c4f8 commit 7d39c8e
Show file tree
Hide file tree
Showing 7 changed files with 2,480 additions and 2,141 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ Semantic Versioning and the changes are simply documented in reverse chronologic

# August 2024

## com.mbeddr.platform

### Removed

- The tests build script (`com.mbeddr.platform.tests.ts.build`) is no longer part of the `com.mbeddr.platform` build
solution.

## com.mbeddr.rcp, com.mbeddr.allInOne

### Removed
Expand Down
63 changes: 62 additions & 1 deletion build/com.mbeddr.allScripts/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,45 @@
<zipfileset file="${mbeddr.github.core.home}/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/com.mbeddr.platform.msd" prefix="module" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-com.mbeddr.platform-models" prefix="module/models" />
</jar>
<mkdir dir="${build.tmp}/default/com.mbeddr.platform.tests.build.jar" />
<mkdir dir="${build.tmp}/default/com.mbeddr.platform.tests.build.jar/META-INF" />
<echoxml file="${build.tmp}/default/com.mbeddr.platform.tests.build.jar/META-INF/module.xml">
<module namespace="com.mbeddr.platform.tests.build" type="solution" uuid="c0ea564d-353d-4607-8b37-02e98106a159">
<dependencies>
<module ref="3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)" kind="cl" />
<module ref="f1fb7b1c-ce0d-423c-9369-4a661d600029(de.itemis.mps.extensions.build)" kind="cl" />
<module ref="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" kind="cl" />
</dependencies>
<uses>
<language id="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" />
<language id="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" />
<language id="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" />
</uses>
<classpath>
<entry path="." />
</classpath>
<sources jar="com.mbeddr.platform.tests.build-src.jar" descriptor="com.mbeddr.platform.tests.build.msd" />
</module>
</echoxml>
<jar destfile="${build.layout}/mbeddr.allScripts/languages/mbeddr-platform/com.mbeddr.platform.tests.build.jar" duplicate="preserve">
<fileset dir="${build.tmp}/java/out/com.mbeddr.platform.tests.build" />
<fileset dir="${mbeddr.github.core.home}/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build" includes="icons/**, resources/**" />
<fileset dir="${mbeddr.build}/solutions/com.mbeddr.platform.tests.build/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
<fileset dir="${build.tmp}/default/com.mbeddr.platform.tests.build.jar" />
</jar>
<copyModels todir="${build.tmp}/customProcessors/copyModels/solutions-com.mbeddr.platform.tests.build-models">
<fileset dir="${mbeddr.build}/solutions/com.mbeddr.platform.tests.build/models" includes="**/*.mps, **/*.mpsr, **/.model" />
</copyModels>
<jar destfile="${build.layout}/mbeddr.allScripts/languages/mbeddr-platform/com.mbeddr.platform.tests.build-src.jar" duplicate="preserve">
<fileset dir="${mbeddr.build}/solutions/com.mbeddr.platform.tests.build/source_gen">
<exclude name="**/trace.info" />
<exclude name="**/exports" />
<exclude name="**/checkpoints" />
<exclude name="**/*.mps" />
</fileset>
<zipfileset file="${mbeddr.github.core.home}/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/com.mbeddr.platform.tests.build.msd" prefix="module" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-com.mbeddr.platform.tests.build-models" prefix="module/models" />
</jar>
<mkdir dir="${build.layout}/de.itemis.mps.extensions.build" />
<copy todir="${build.layout}/de.itemis.mps.extensions.build">
<fileset dir="${artifacts.de.itemis.mps.extensions}/de.itemis.mps.extensions.build" />
Expand All @@ -556,7 +595,7 @@
<delete dir="${build.layout}" />
</target>

<target name="compileJava" depends="java.compile.com.mbeddr.allScripts, java.compile.com.mbeddr.debugger.testing.build.dev.build, java.compile.com.mbeddr.core.tests.build, java.compile.com.mbeddr.core.tests.performance.build, java.compile.com.mbeddr.debugger.tests.dev.build, java.compile.com.mbeddr.cc.tests.dev.build, java.compile.com.mbeddr.ext.tests.build, java.compile.com.mbeddr.platform, java.compile.com.mbeddr.build, java.compile.com.mbeddr.xmodel.build" />
<target name="compileJava" depends="java.compile.com.mbeddr.allScripts, java.compile.com.mbeddr.debugger.testing.build.dev.build, java.compile.com.mbeddr.core.tests.build, java.compile.com.mbeddr.core.tests.performance.build, java.compile.com.mbeddr.debugger.tests.dev.build, java.compile.com.mbeddr.cc.tests.dev.build, java.compile.com.mbeddr.ext.tests.build, java.compile.com.mbeddr.platform, java.compile.com.mbeddr.platform.tests.build, java.compile.com.mbeddr.build, java.compile.com.mbeddr.xmodel.build" />

<target name="processResources" />

Expand Down Expand Up @@ -680,6 +719,7 @@
<module file="${mbeddr.github.core.home}/code/languages/com.mbeddr.build/solutions/com.mbeddr.debugger.tests.dev.build/com.mbeddr.debugger.tests.dev.build.msd" />
<module file="${mbeddr.github.core.home}/code/languages/com.mbeddr.build/solutions/com.mbeddr.ext.build/build.msd" />
<module file="${mbeddr.github.core.home}/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/com.mbeddr.platform.msd" />
<module file="${mbeddr.github.core.home}/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/com.mbeddr.platform.tests.build.msd" />
<module file="${mbeddr.github.core.home}/code/languages/com.mbeddr.build/solutions/com.mbeddr.xmodel.build/com.mbeddr.xmodel.build.msd" />
</chunk>
<jvmargs>
Expand Down Expand Up @@ -877,6 +917,26 @@
</copy>
</target>

<target name="java.compile.com.mbeddr.platform.tests.build" depends="java.compile.com.mbeddr.platform">
<mkdir dir="${mbeddr.build}/solutions/com.mbeddr.platform.tests.build/source_gen" />
<mkdir dir="${build.tmp}/java/out/com.mbeddr.platform.tests.build" />
<javac destdir="${build.tmp}/java/out/com.mbeddr.platform.tests.build" fork="false" encoding="utf8" includeantruntime="false" debug="true" source="1.8" target="1.8">
<compilerarg value="-Xlint:none" />
<src>
<path location="${mbeddr.build}/solutions/com.mbeddr.platform.tests.build/source_gen" />
</src>
<classpath>
<pathelement path="${build.tmp}/java/out/com.mbeddr.platform" />
<fileset file="${artifacts.de.itemis.mps.extensions}/de.itemis.mps.extensions.build/languages/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.jar" />
</classpath>
</javac>
<copy todir="${build.tmp}/java/out/com.mbeddr.platform.tests.build">
<fileset dir="${mbeddr.build}/solutions/com.mbeddr.platform.tests.build/source_gen">
<include name="**/*.info" />
</fileset>
</copy>
</target>

<target name="java.compile.com.mbeddr.build" depends="java.compile.com.mbeddr.platform">
<mkdir dir="${mbeddr.build}/solutions/com.mbeddr.build/source_gen" />
<mkdir dir="${build.tmp}/java/out/com.mbeddr.build" />
Expand Down Expand Up @@ -928,6 +988,7 @@
<delete dir="${mbeddr.build}/solutions/com.mbeddr.debugger.tests.dev.build/source_gen" />
<delete dir="${mbeddr.build}/solutions/com.mbeddr.ext.build/source_gen" />
<delete dir="${mbeddr.build}/solutions/com.mbeddr.platform/source_gen" />
<delete dir="${mbeddr.build}/solutions/com.mbeddr.platform.tests.build/source_gen" />
<delete dir="${mbeddr.build}/solutions/com.mbeddr.xmodel.build/source_gen" />
</target>
</project>
1 change: 1 addition & 0 deletions code/languages/com.mbeddr.build/.mps/modules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.debugger-test.build.dev.build/com.mbeddr.debugger-test.build.dev.build.msd" folder="debugger-testing" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.debugger.tests.dev.build/com.mbeddr.debugger.tests.dev.build.msd" folder="debugger" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.ext.build/build.msd" folder="ext" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.platform.tests.build/com.mbeddr.platform.tests.build.msd" folder="platform" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.platform/com.mbeddr.platform.msd" folder="platform" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.templates/com.mbeddr.build.templates.msd" folder="templates" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.xmodel.build/com.mbeddr.xmodel.build.msd" folder="" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -968,6 +968,94 @@
</node>
</node>
</node>
<node concept="1E1JtA" id="1OC8uDvEIaT" role="2G$12L">
<property role="BnDLt" value="true" />
<property role="TrG5h" value="com.mbeddr.platform.tests.build" />
<property role="3LESm3" value="c0ea564d-353d-4607-8b37-02e98106a159" />
<node concept="398BVA" id="1OC8uDvEIaU" role="3LF7KH">
<ref role="398BVh" node="7uZw0yZ2_Jf" resolve="mbeddr.github.core.home" />
<node concept="2Ry0Ak" id="1OC8uDvEIaV" role="iGT6I">
<property role="2Ry0Am" value="code" />
<node concept="2Ry0Ak" id="1OC8uDvEIaW" role="2Ry0An">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="1OC8uDvEIaX" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.build" />
<node concept="2Ry0Ak" id="1OC8uDvEIaY" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="1OC8uDvEIaZ" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.platform.tests.build" />
<node concept="2Ry0Ak" id="1OC8uDvEIbl" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.platform.tests.build.msd" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="1OC8uDvEIb1" role="3bR37C">
<node concept="3bR9La" id="1OC8uDvEIb2" role="1SiIV1">
<ref role="3bR37D" to="90a9:PE3B26VOkn" resolve="de.itemis.mps.extensions.build" />
</node>
</node>
<node concept="1SiIV0" id="1OC8uDvEIb3" role="3bR37C">
<node concept="3bR9La" id="1OC8uDvEIb4" role="1SiIV1">
<ref role="3bR37D" to="ffeo:78GwwOvB3tw" resolve="jetbrains.mps.ide.build" />
</node>
</node>
<node concept="3rtmxn" id="1OC8uDvEIb5" role="3bR31x">
<node concept="3LXTmp" id="1OC8uDvEIb6" role="3rtmxm">
<node concept="3qWCbU" id="1OC8uDvEIb7" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="398BVA" id="1OC8uDvEIb8" role="3LXTmr">
<ref role="398BVh" node="7uZw0yZ2_Jf" resolve="mbeddr.github.core.home" />
<node concept="2Ry0Ak" id="1OC8uDvEIb9" role="iGT6I">
<property role="2Ry0Am" value="code" />
<node concept="2Ry0Ak" id="1OC8uDvEIba" role="2Ry0An">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="1OC8uDvEIbb" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.build" />
<node concept="2Ry0Ak" id="1OC8uDvEIbc" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="1OC8uDvEIfc" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.platform.tests.build" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1BupzO" id="1OC8uDvEIbe" role="3bR31x">
<property role="3ZfqAx" value="models" />
<property role="1Hdu6h" value="true" />
<property role="1HemKv" value="true" />
<node concept="3LXTmp" id="1OC8uDvEIeu" role="1HemKq">
<node concept="398BVA" id="1OC8uDvEIe8" role="3LXTmr">
<ref role="398BVh" node="2UI1wmC32Vl" resolve="mbeddr.build" />
<node concept="2Ry0Ak" id="1OC8uDvEIe9" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="1OC8uDvEIea" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.platform.tests.build" />
<node concept="2Ry0Ak" id="1OC8uDvEIeb" role="2Ry0An">
<property role="2Ry0Am" value="models" />
</node>
</node>
</node>
</node>
<node concept="3qWCbU" id="1OC8uDvEIev" role="3LXTna">
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
</node>
</node>
</node>
<node concept="1SiIV0" id="1OC8uDvEIe6" role="3bR37C">
<node concept="3bR9La" id="1OC8uDvEIe7" role="1SiIV1">
<ref role="3bR37D" node="6ucYLjoxZBc" resolve="com.mbeddr.platform" />
</node>
</node>
</node>
</node>
<node concept="2G$12M" id="3AVJcIMl$pT" role="3989C9">
<property role="TrG5h" value="mbeddr" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<solution name="com.mbeddr.platform.tests.build" uuid="c0ea564d-353d-4607-8b37-02e98106a159" moduleVersion="0" compileInMPS="true">
<models>
<modelRoot type="default" contentPath="${module}">
<sourceRoot location="models" />
</modelRoot>
</models>
<facets>
<facet compile="mps" classes="mps" ext="no" type="java">
<classes generated="true" path="${module}/classes_gen" />
</facet>
</facets>
<sourcePath />
<dependencies>
<dependency reexport="false">3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)</dependency>
<dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
<dependency reexport="false">f1fb7b1c-ce0d-423c-9369-4a661d600029(de.itemis.mps.extensions.build)</dependency>
</dependencies>
<languageVersions>
<language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
<language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="7" />
<language slang="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" version="1" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
</languageVersions>
<dependencyVersions>
<module reference="3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)" version="0" />
<module reference="c0ea564d-353d-4607-8b37-02e98106a159(com.mbeddr.platform.tests.build)" version="0" />
<module reference="f1fb7b1c-ce0d-423c-9369-4a661d600029(de.itemis.mps.extensions.build)" version="0" />
<module reference="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" version="0" />
</dependencyVersions>
</solution>

Loading

0 comments on commit 7d39c8e

Please sign in to comment.