Skip to content

Commit

Permalink
Merge branch 'maintenance/MPS-2022.2' into bugfix/fix_icons_2022.2
Browse files Browse the repository at this point in the history 
# Conflicts:
#	code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/models/org.mpsqa.build.allScripts.mps
  • Loading branch information
@alexanderpann
alexanderpann committed Dec 12, 2023
2 parents bb77683 + 5379f33 commit 0259b31
Show file tree
Hide file tree
Showing 119 changed files with 36,977 additions and 3,867 deletions.
5 changes: 0 additions & 5 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,3 @@ test_gen.caches
# RCP
artifacts/*
build/*


# ---------------------------------------
# Generated by gradle
**/.mps/libraries.xml
24 changes: 14 additions & 10 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ ext.dependencyRepositories = [
]

// Dependency versions
ext.mpsVersion = '2022.2'
ext.mpsVersion = '2022.2.1'

// Project versions
ext.major = '2022'
Expand All @@ -77,9 +77,6 @@ if (ciBuild) {
version = "$major.$minor-SNAPSHOT"
}

ext.publishingRepository = 'https://artifacts.itemis.cloud/repository/maven-mps'


configurations {
mps
languageLibs
Expand Down Expand Up @@ -180,6 +177,12 @@ task build_testing_languages(type: BuildLanguages, dependsOn: [build_base_langua
script "$buildDir/scripts/build-testing-languages.xml"
}

task test_testing(type: TestLanguages, dependsOn: [build_testing_languages]) {
// MPS build language generator is confused about the basedir of the generated script so we set it manually
scriptArgs = ["-Dbasedir=${file('code/languages/org.mpsqa.testing')}"]
script "$buildDir/scripts/test-testing.xml"
}

task build_clones_languages(type: BuildLanguages, dependsOn: [build_base_languages]) {
script "$buildDir/scripts/build-clones-languages.xml"
}
Expand Down Expand Up @@ -222,18 +225,19 @@ task package_mpsqa(type: Zip, dependsOn: build_allInOne_package) {
include 'org.mpsqa.allInOne/**'
}

task run_clones_headless(type: TestLanguages, dependsOn: build_clones_languages) {
task test_clones(type: TestLanguages, dependsOn: build_clones_languages) {
description "Will execute clones tests from command line"
print "mpsqa.home = " + rootDir;
script new File("$buildDir/scripts/build-clones-headless-detector.xml")
script new File("$buildDir/scripts/test-clones.xml")
}

task test_lint(type: TestLanguages, dependsOn: build_lint_analysis_languages) {
description "Will execute lint tests from command line"
script "$buildDir/scripts/build-lint-tests.xml"
}

check.dependsOn run_clones_headless, test_lint
check.dependsOn(tasks.withType(TestLanguages))

assemble.dependsOn(tasks.withType(BuildLanguages))

publishing {
repositories {
Expand Down Expand Up @@ -289,6 +293,6 @@ task cleanMps(type: Delete) {

clean.dependsOn cleanMps

defaultTasks 'build_allInOne_package'
defaultTasks 'build'

task rebuild(dependsOn:[clean, build_allInOne_package])
task rebuild(dependsOn:[clean, build_allInOne_package])
137 changes: 47 additions & 90 deletions build/scripts/build_all_scripts.xml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<project name="org.mpsqa.allScripts" default="build">
<project name="org.mpsqa.allScripts" default="build" basedir="../..">
<!-- Generated by MPS -->
<property name="build.dir" location="build" />
<property name="build.tmp" location="${build.dir}/tmp/org.mpsqa.allScripts" />
<property name="build.layout" location="${build.dir}/artifacts/org.mpsqa.allScripts" />
<property name="mps.home" location="${basedir}/../../../MPS_2020_3_5" />
<property name="mpsqa.home" location="${basedir}/../.." />
<property name="mpsqa.build.home" location="${mpsqa.home}/code/languages/org.mpsqa.build" />
<property name="mps.home" location="" />
<property name="artifacts.mps" location="${mps.home}" />
<property file="${artifacts.mps}/build.properties" prefix="import.mps" />
<property name="mps.build.number" value="${import.mps.mps.build.number}" />
Expand Down Expand Up @@ -38,74 +36,7 @@
<generator-settings id="m2m-defaults" strictMode="true" parallelThreads="8" inplaceTransform="false" warnWrongChild="true" createStaticRefs="true" skipUnmodifiedModels="${mps.generator.skipUnmodifiedModels}" />

<target name="assemble" depends="classes, declare-mps-tasks">
<mkdir dir="${build.layout}/org.mpsqa.build" />
<mkdir dir="${build.layout}/org.mpsqa.build/META-INF" />
<echoxml file="${build.layout}/org.mpsqa.build/META-INF/plugin.xml">
<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
<id>org.mpsqa.build</id>
<name>org.mpsqa.build</name>
<version>0.1</version>
<depends>jetbrains.mps.build</depends>

<extensions defaultExtensionNs="com.intellij">
<mps.LanguageLibrary dir="/languages" />
</extensions>
</idea-plugin>
</echoxml>
<mkdir dir="${build.layout}/org.mpsqa.build/lib" />
<mkdir dir="${build.tmp}/default/org.mpsqa.build.jar" />
<mkdir dir="${build.tmp}/default/org.mpsqa.build.jar/META-INF" />
<echoxml file="${build.tmp}/default/org.mpsqa.build.jar/META-INF/plugin.xml">
<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
<id>org.mpsqa.build</id>
<name>org.mpsqa.build</name>
<version>0.1</version>
<depends>jetbrains.mps.build</depends>

<extensions defaultExtensionNs="com.intellij">
<mps.LanguageLibrary dir="/languages" />
</extensions>
</idea-plugin>
</echoxml>
<jar destfile="${build.layout}/org.mpsqa.build/lib/org.mpsqa.build.jar" duplicate="preserve">
<fileset dir="${build.tmp}/default/org.mpsqa.build.jar" />
</jar>
<mkdir dir="${build.layout}/org.mpsqa.build/languages" />
<mkdir dir="${build.tmp}/default/org.mpsqa.build.jar1" />
<mkdir dir="${build.tmp}/default/org.mpsqa.build.jar1/META-INF" />
<echoxml file="${build.tmp}/default/org.mpsqa.build.jar1/META-INF/module.xml">
<module namespace="org.mpsqa.build" type="solution" uuid="11d4368a-a7e8-4dd9-bfc6-c2de268d1994">
<dependencies>
<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" />
</uses>
<classpath>
<entry path="." />
</classpath>
<sources jar="org.mpsqa.build-src.jar" descriptor="org.mpsqa.build.msd" />
</module>
</echoxml>
<jar destfile="${build.layout}/org.mpsqa.build/languages/org.mpsqa.build.jar" duplicate="preserve">
<fileset dir="${build.tmp}/java/out/org.mpsqa.build" />
<fileset dir="${mpsqa.build.home}/solutions/org.mpsqa.build/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
<fileset dir="${build.tmp}/default/org.mpsqa.build.jar1" />
</jar>
<copyModels todir="${build.tmp}/customProcessors/copyModels/solutions-org.mpsqa.build-models">
<fileset dir="${mpsqa.build.home}/solutions/org.mpsqa.build/models" includes="**/*.mps, **/*.mpsr, **/.model" />
</copyModels>
<jar destfile="${build.layout}/org.mpsqa.build/languages/org.mpsqa.build-src.jar" duplicate="preserve">
<fileset dir="${mpsqa.build.home}/solutions/org.mpsqa.build/source_gen">
<exclude name="**/trace.info" />
<exclude name="**/exports" />
<exclude name="**/checkpoints" />
<exclude name="**/*.mps" />
</fileset>
<zipfileset file="${mpsqa.build.home}/solutions/org.mpsqa.build/org.mpsqa.build.msd" prefix="module" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-org.mpsqa.build-models" prefix="module/models" />
</jar>
<mkdir dir="${build.layout}" />
<echo file="${build.layout}/build.properties">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.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}</echo>
</target>

Expand All @@ -120,7 +51,7 @@
<delete dir="${build.layout}" />
</target>

<target name="compileJava" depends="java.compile.org.mpsqa.build, java.compile.org.mpsqa.lint.build, java.compile.org.mpsqa.clones.build" />
<target name="compileJava" depends="java.compile.org.mpsqa.build.allScripts, java.compile.org.mpsqa.build, java.compile.org.mpsqa.clones.build, java.compile.org.mpsqa.lint.build, java.compile.org.mpsqa.testing.tests.build" />

<target name="processResources" />

Expand Down Expand Up @@ -222,63 +153,89 @@
<library file="${artifacts.mps}/languages/util/jetbrains.mps.runtime.jar" />
<library file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
<chunk>
<module file="${mpsqa.build.home}/solutions/org.mpsqa.build/org.mpsqa.build.msd" />
<module file="${mpsqa.home}/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/org.mpsqa.clones.build.msd" />
<module file="${mpsqa.home}/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/org.mpsqa.lint.build.msd" />
<module file="${basedir}/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/org.mpsqa.build.msd" />
<module file="${basedir}/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/org.mpsqa.build.allScripts.msd" />
<module file="${basedir}/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/org.mpsqa.clones.build.msd" />
<module file="${basedir}/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/org.mpsqa.lint.build.msd" />
<module file="${basedir}/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.tests.build/org.mpsqa.testing.tests.build.msd" />
</chunk>
<jvmargs>
<arg value="-ea" />
<arg value="-Xmx1024m" />
</jvmargs>
<macro name="mps.home" path="${mps.home}" />
<macro name="mpsqa.home" path="${mpsqa.home}" />
<macro name="mpsqa.build.home" path="${mpsqa.build.home}" />
</generate>
</target>

<target name="declare-mps-tasks" />

<target name="makeDependents" />

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

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

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

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

<target name="java.compile.org.mpsqa.clones.build" depends="java.compile.org.mpsqa.build">
<mkdir dir="${mpsqa.home}/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/source_gen" />
<mkdir dir="${build.tmp}/java/out/org.mpsqa.clones.build" />
<javac destdir="${build.tmp}/java/out/org.mpsqa.clones.build" fork="true" encoding="utf8" includeantruntime="false" debug="true">
<target name="java.compile.org.mpsqa.testing.tests.build" depends="java.compile.org.mpsqa.build">
<mkdir dir="${basedir}/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.tests.build/source_gen" />
<mkdir dir="${build.tmp}/java/out/org.mpsqa.testing.tests.build" />
<javac destdir="${build.tmp}/java/out/org.mpsqa.testing.tests.build" fork="true" encoding="utf8" includeantruntime="false" debug="true">
<compilerarg value="-Xlint:none" />
<src>
<path location="${mpsqa.home}/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/source_gen" />
<path location="${basedir}/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.tests.build/source_gen" />
</src>
<classpath path="${build.tmp}/java/out/org.mpsqa.build" />
</javac>
</target>

<target name="cleanSources">
<delete dir="${mpsqa.build.home}/solutions/org.mpsqa.build/source_gen" />
<delete dir="${mpsqa.home}/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/source_gen" />
<delete dir="${mpsqa.home}/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/source_gen" />
<delete dir="${basedir}/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/source_gen" />
<delete dir="${basedir}/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/source_gen" />
<delete dir="${basedir}/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/source_gen" />
<delete dir="${basedir}/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/source_gen" />
<delete dir="${basedir}/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.tests.build/source_gen" />
</target>
</project>
3 changes: 0 additions & 3 deletions code/applications/org.mpsqa.clones.demo/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,6 @@ if (project.hasProperty("MPS_PATHS_SELECTOR")) {
}
*/

ext.publishingRepository = 'https://projects.itemis.de/nexus/content/repositories/mbeddr'


configurations {
mps
// includes also junit tasks support
Expand Down
1 change: 1 addition & 0 deletions code/languages/org.mpsqa.build/.mps/modules.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<project version="4">
<component name="MPSProject">
<projectModules>
<modulePath path="$PROJECT_DIR$/solutions/org.mpsqa.build.allScripts/org.mpsqa.build.allScripts.msd" folder="" />
<modulePath path="$PROJECT_DIR$/solutions/org.mpsqa.build/org.mpsqa.build.msd" folder="" />
</projectModules>
</component>
Expand Down
Loading

0 comments on commit 0259b31

Please sign in to comment.