diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e9815d7d1..b800fd766 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,9 +11,13 @@ on: publish: description: Whether to publish the build result to Maven repositories type: boolean - default: false + default: 'false' required: false - + publish_rcp: + description: Whether to publish the RCP to Github packages + type: boolean + default: 'false' + required: true jobs: build: runs-on: ubuntu-latest @@ -72,7 +76,7 @@ jobs: publish: # Only publish on push (to maintenance or master) or on dispatch if requested - if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && inputs.publish == 'true') + if: ${{ github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && inputs.publish == 'true') }} runs-on: ubuntu-latest steps: @@ -94,3 +98,33 @@ jobs: -Pgpr.token=${{ secrets.GITHUB_TOKEN }} \ -Partifacts.itemis.cloud.user=${{ secrets.ARTIFACTS_ITEMIS_CLOUD_USER }} \ -Partifacts.itemis.cloud.pw=${{ secrets.ARTIFACTS_ITEMIS_CLOUD_PW }} + + publish_rcps: + # Only publish on push (to maintenance or master) or on dispatch if requested + if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.publish_rcp == 'true' }} + + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 17 + + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v3 + + - name: Publish FASTEN-Windows RCP to Github Packages + run: | + ./gradlew publishFASTEN_WIN_RCPPublicationToGitHubPackagesRepository \ + -Pgpr.user=${{ github.actor }} \ + -Pgpr.token=${{ secrets.GITHUB_TOKEN }} \ + + - name: Publish FASTEN-Linux RCPs to Github Packages + run: | + ./gradlew publishFASTEN_LINUX_RCPPublicationToGitHubPackagesRepository \ + -Pgpr.user=${{ github.actor }} \ + -Pgpr.token=${{ secrets.GITHUB_TOKEN }} \ + diff --git a/build.gradle.kts b/build.gradle.kts index f35ab44ec..30821243a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,6 +16,7 @@ plugins { } val jbrVers = "17.0.8.1-b1000.32" +val jbrWindowsVers = "jbr_jcef-17.0.8.1-windows-x64-b1000.32" downloadJbr { jbrVersion = jbrVers @@ -83,6 +84,7 @@ configurations { val jbrWin by creating val jbrMac by creating val jbrLinux by creating + val docx4j by creating dependencies { mps("com.jetbrains:mps:$mpsVersion") @@ -92,6 +94,8 @@ configurations { jbrWin("com.jetbrains.jdk:jbr_jcef:$jbrVers:windows-x64@tgz") jbrMac("com.jetbrains.jdk:jbr_jcef:$jbrVers:osx-x64@tgz") jbrLinux("com.jetbrains.jdk:jbr_jcef:$jbrVers:linux-x64@tgz") + docx4j("org.docx4j:docx4j-diffx:11.4.11") + docx4j("org.docx4j:docx4j-JAXB-MOXy:11.4.11") } } @@ -171,12 +175,20 @@ tasks { } } + val resolveLanguageLibs by registering(Copy::class) { dependsOn(configureJava) from({ configurations["languageLibs"].resolve().map(::zipTree) }) into(dependenciesDir) } + val resolveDocx4j by registering(Sync::class) { + duplicatesStrategy = DuplicatesStrategy.INCLUDE + dependsOn(configureJava) + from({ configurations["docx4j"].resolve() }) + into("code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib") + } + // "com.fasten.safety.rcp.pluginSolution" makes use of the mbeddr actionsfilter plugin. // The "actionsfilter" plugin and dependencies must be copied to "MPS\plugins" folder in order to load properly. val copy_mbeddr_actionsfilter by registering { @@ -205,7 +217,7 @@ tasks { fun scriptFile(name: String): Provider = layout.buildDirectory.file("scripts/$name") val build_allScripts_unpatched by registering(BuildLanguages::class) { - dependsOn(resolveMps, resolveLanguageLibs) + dependsOn(resolveMps, resolveLanguageLibs,resolveDocx4j) script = scriptFile("build_all_scripts.xml") } @@ -363,21 +375,40 @@ tasks { val deleteJBR by registering(Delete::class) { dependsOn(unpackDistribution) - delete("$artifactsDir/com.mbeddr.formal.safetyDistribution/tmp/fasten-${version}/jbr") + delete("$artifactsDir/com.mbeddr.formal.safetyDistribution/tmp/fasten-${version}/jbr/") + } + + val fix_JNA_for_Windows by registering(Copy::class) { + dependsOn(unpackDistribution) + from("$artifactsDir/com.mbeddr.formal.safetyDistribution/tmp/fasten-${version}/lib/jna/amd64/") + into("$artifactsDir/com.mbeddr.formal.safetyDistribution/tmp/fasten-${version}/lib/jna/") + } + + val fix_BIN_for_Windows by registering(Copy::class) { + dependsOn(unpackDistribution) + from("$artifactsDir/com.mbeddr.formal.safetyDistribution/tmp/fasten-${version}/bin/win/") + into("$artifactsDir/com.mbeddr.formal.safetyDistribution/tmp/fasten-${version}/bin/") } - val removeJBR by registering(Zip::class) { - dependsOn(deleteJBR) - from("$artifactsDir/com.mbeddr.formal.safetyDistribution/tmp/fasten-${version}") - archiveFileName.set("fasten-${version}_with_removed_JBR.zip") - destinationDirectory.set(file("$artifactsDir/com.mbeddr.formal.safetyDistribution")) + val unpack_windows_JBR by registering(Copy::class) { + dependsOn(resolveJBR_Win, deleteJBR, fix_JNA_for_Windows, fix_BIN_for_Windows) + from(tarTree("$jdkDir/jbr_jcef-windows-x64.tgz")) + into("$artifactsDir/com.mbeddr.formal.safetyDistribution/tmp") } val package_fasten_safety_distribution_win by registering(Zip::class) { - dependsOn(resolveJBR_Win, build_fasten_safety_distribution, removeJBR) + dependsOn(resolveJBR_Win, build_fasten_safety_distribution, unpack_windows_JBR) archiveBaseName.set("fasten-${version}-Win") - from(zipTree("$artifactsDir/com.mbeddr.formal.safetyDistribution/fasten-${version}_with_removed_JBR.zip")) - from(tarTree("$jdkDir/jbr_jcef-windows-x64.tgz")) + from("$artifactsDir/com.mbeddr.formal.safetyDistribution/tmp/fasten-${version}/") + from("$artifactsDir/com.mbeddr.formal.safetyDistribution/tmp/$jbrWindowsVers") { + into("jbr") + } + } + + val package_fasten_safety_distribution_linux by registering(Zip::class) { + dependsOn(build_fasten_safety_distribution) + archiveBaseName.set("fasten-${version}-Linux") + from("$artifactsDir/com.mbeddr.formal.safetyDistribution/fasten-${version}.zip") } val build_all_languages by registering { @@ -517,6 +548,16 @@ publishing { } } } + create("FASTEN_WIN_RCP") { + groupId = "fasten" + artifactId = "win.rcp" + artifact(tasks.named("package_fasten_safety_distribution_win")) + } + create("FASTEN_LINUX_RCP") { + groupId = "fasten" + artifactId = "linux.rcp" + artifact(tasks.named("package_fasten_safety_distribution_linux")) + } } } diff --git a/code/languages/com.fasten.symo/.mps/libraries.xml b/code/languages/com.fasten.symo/.mps/libraries.xml new file mode 100644 index 000000000..6b84430d8 --- /dev/null +++ b/code/languages/com.fasten.symo/.mps/libraries.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/code/languages/com.fasten.symo/.mps/modules.xml b/code/languages/com.fasten.symo/.mps/modules.xml index 5faf165de..f2b999871 100644 --- a/code/languages/com.fasten.symo/.mps/modules.xml +++ b/code/languages/com.fasten.symo/.mps/modules.xml @@ -3,8 +3,11 @@ + + + diff --git a/code/languages/com.fasten.symo/languages/com.symo.plantuml/com.symo.plantuml.mpl b/code/languages/com.fasten.symo/languages/com.symo.plantuml/com.symo.plantuml.mpl new file mode 100644 index 000000000..63d783c18 --- /dev/null +++ b/code/languages/com.fasten.symo/languages/com.symo.plantuml/com.symo.plantuml.mpl @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 377bf088-4ffc-48ac-910f-fb1c66ffa60e(com.symo.plantuml.lib) + 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) + 848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime) + 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) + c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text) + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + 5ad14eca-28d7-4bce-b8e0-648908a49062(org.apache.batik) + 563a0770-eb88-4f4f-83ed-f708776fc2fe(de.itemis.stubs.batik) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.fasten.symo/languages/com.symo.plantuml/generator/templates/com.symo.plantuml.generator.templates@generator.mps b/code/languages/com.fasten.symo/languages/com.symo.plantuml/generator/templates/com.symo.plantuml.generator.templates@generator.mps new file mode 100644 index 000000000..309e9f3d7 --- /dev/null +++ b/code/languages/com.fasten.symo/languages/com.symo.plantuml/generator/templates/com.symo.plantuml.generator.templates@generator.mps @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.behavior.mps b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.behavior.mps new file mode 100644 index 000000000..8107a3c74 --- /dev/null +++ b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.behavior.mps @@ -0,0 +1,845 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.constraints.mps b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.constraints.mps new file mode 100644 index 000000000..9a056dec0 --- /dev/null +++ b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.constraints.mps @@ -0,0 +1,188 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.editor.mps b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.editor.mps new file mode 100644 index 000000000..b4a106824 --- /dev/null +++ b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.editor.mps @@ -0,0 +1,1946 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.structure.mps b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.structure.mps new file mode 100644 index 000000000..5b69a414c --- /dev/null +++ b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.structure.mps @@ -0,0 +1,509 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.typesystem.mps b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.typesystem.mps new file mode 100644 index 000000000..aab6b7f5e --- /dev/null +++ b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.typesystem.mps @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.diffx.lib/com.mpsbasics.docx4j.diffx.lib.msd b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/com.symo.plantuml.lib.msd similarity index 54% rename from code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.diffx.lib/com.mpsbasics.docx4j.diffx.lib.msd rename to code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/com.symo.plantuml.lib.msd index ecdcc49e3..007f64f22 100644 --- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.diffx.lib/com.mpsbasics.docx4j.diffx.lib.msd +++ b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/com.symo.plantuml.lib.msd @@ -1,19 +1,25 @@ - + - - + + + + + + + + - + - + + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - 71bb25aa-20fa-4c18-8954-1b176576f52d(com.mpsbasics.docx4j.lib) @@ -23,8 +29,7 @@ - - + diff --git a/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/lib/plantuml-epl-1.2024.7.jar b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/lib/plantuml-epl-1.2024.7.jar new file mode 100644 index 000000000..b1d6740cb Binary files /dev/null and b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/lib/plantuml-epl-1.2024.7.jar differ diff --git a/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/lib/xml-apis-ext.jar b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/lib/xml-apis-ext.jar new file mode 100644 index 000000000..a7869d68a Binary files /dev/null and b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/lib/xml-apis-ext.jar differ diff --git a/code/languages/com.fasten.symo/solutions/com.symo.plantuml.sandbox/com.symo.plantuml.sandbox.msd b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.sandbox/com.symo.plantuml.sandbox.msd new file mode 100644 index 000000000..1986db381 --- /dev/null +++ b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.sandbox/com.symo.plantuml.sandbox.msd @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.fasten.symo/solutions/com.symo.plantuml.sandbox/models/com.symo.plantuml.sandbox._010_smoke.mps b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.sandbox/models/com.symo.plantuml.sandbox._010_smoke.mps new file mode 100644 index 000000000..11963f9c6 --- /dev/null +++ b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.sandbox/models/com.symo.plantuml.sandbox._010_smoke.mps @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/com.mbeddr.formal.base.arch.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/com.mbeddr.formal.base.arch.mpl index e227c745c..f94deca38 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/com.mbeddr.formal.base.arch.mpl +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/com.mbeddr.formal.base.arch.mpl @@ -35,6 +35,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/com.mbeddr.formal.base.operatorspanel.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/com.mbeddr.formal.base.operatorspanel.mpl index 25705a0b5..fee7aed38 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/com.mbeddr.formal.base.operatorspanel.mpl +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/com.mbeddr.formal.base.operatorspanel.mpl @@ -27,6 +27,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/com.mbeddr.formal.nusmv.arch.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/com.mbeddr.formal.nusmv.arch.mpl index d9cd246ec..df4bbd6a8 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/com.mbeddr.formal.nusmv.arch.mpl +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/com.mbeddr.formal.nusmv.arch.mpl @@ -98,6 +98,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/com.mbeddr.formal.nusmv.cbd.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/com.mbeddr.formal.nusmv.cbd.mpl index 586433bf4..f56495e4f 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/com.mbeddr.formal.nusmv.cbd.mpl +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/com.mbeddr.formal.nusmv.cbd.mpl @@ -46,6 +46,7 @@ + @@ -126,6 +127,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/com.mbeddr.formal.nusmv.importer.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/com.mbeddr.formal.nusmv.importer.mpl index cd77a1037..d644aa61c 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/com.mbeddr.formal.nusmv.importer.mpl +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/com.mbeddr.formal.nusmv.importer.mpl @@ -133,6 +133,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/com.mbeddr.formal.nusmv.sm.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/com.mbeddr.formal.nusmv.sm.mpl index 709f4eb25..3a7c22d28 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/com.mbeddr.formal.nusmv.sm.mpl +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/com.mbeddr.formal.nusmv.sm.mpl @@ -90,6 +90,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/com.mbeddr.formal.base.tooling.msd b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/com.mbeddr.formal.base.tooling.msd index edaad65d5..4a9d86f82 100644 --- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/com.mbeddr.formal.base.tooling.msd +++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/com.mbeddr.formal.base.tooling.msd @@ -41,6 +41,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/com.mbeddr.formal.nusmv.cbd.pluginSolution.msd b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/com.mbeddr.formal.nusmv.cbd.pluginSolution.msd index db195f1fa..33c4db693 100644 --- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/com.mbeddr.formal.nusmv.cbd.pluginSolution.msd +++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/com.mbeddr.formal.nusmv.cbd.pluginSolution.msd @@ -33,6 +33,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/com.mbeddr.formal.nusmv.importer.rt.msd b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/com.mbeddr.formal.nusmv.importer.rt.msd index 30fe24296..bfb69133c 100644 --- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/com.mbeddr.formal.nusmv.importer.rt.msd +++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/com.mbeddr.formal.nusmv.importer.rt.msd @@ -39,6 +39,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/com.mbeddr.formal.nusmv.pluginSolution.msd b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/com.mbeddr.formal.nusmv.pluginSolution.msd index 11cfe8a68..9ae0ebc51 100644 --- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/com.mbeddr.formal.nusmv.pluginSolution.msd +++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/com.mbeddr.formal.nusmv.pluginSolution.msd @@ -40,6 +40,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/com.mbeddr.formal.rcp.tutorialActions.msd b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/com.mbeddr.formal.rcp.tutorialActions.msd index 84b13a475..c6b39a858 100644 --- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/com.mbeddr.formal.rcp.tutorialActions.msd +++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/com.mbeddr.formal.rcp.tutorialActions.msd @@ -22,6 +22,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/test.mbeddr.formal.nusmv.msd b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/test.mbeddr.formal.nusmv.msd index 91905ee19..ea65e0b25 100644 --- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/test.mbeddr.formal.nusmv.msd +++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/test.mbeddr.formal.nusmv.msd @@ -57,6 +57,7 @@ + diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.msd b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.msd index 565945294..c6b4f089e 100644 --- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.msd +++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.msd @@ -33,6 +33,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/com.mbeddr.formal.safety.gsn.doc.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/com.mbeddr.formal.safety.gsn.doc.mpl index 8582c2ede..59a93ee72 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/com.mbeddr.formal.safety.gsn.doc.mpl +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/com.mbeddr.formal.safety.gsn.doc.mpl @@ -42,6 +42,7 @@ + @@ -91,6 +92,7 @@ + @@ -202,6 +204,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.behavior.mps index d3909d66b..f87cc0298 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.behavior.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.behavior.mps @@ -18,6 +18,9 @@ + + + @@ -52,6 +55,7 @@ + @@ -72,9 +76,11 @@ + + @@ -90,6 +96,9 @@ + + + @@ -105,7 +114,9 @@ + + @@ -116,6 +127,9 @@ + + + @@ -144,6 +158,10 @@ + + + + @@ -163,6 +181,7 @@ + @@ -332,91 +351,205 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - + + + + - + - + - - - + + + + + + + + + + - - + + + + - - - + + + - - - - - - + + + + + + + + + + + + + + - - - + + + - - - - - - - - + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + - - - + + + + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/models/com.mbeddr.formal.safety.gsn.pdfexport.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/models/com.mbeddr.formal.safety.gsn.pdfexport.behavior.mps index 8dd4ce898..585e8faa8 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/models/com.mbeddr.formal.safety.gsn.pdfexport.behavior.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/models/com.mbeddr.formal.safety.gsn.pdfexport.behavior.mps @@ -147,7 +147,15 @@ + + + + + + + + @@ -156,10 +164,25 @@ - - + + + + + + + + + + + + + + + + + @@ -251,21 +274,48 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + @@ -273,7 +323,12 @@ - + + + + + + diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps index d5db9b880..645b26b6e 100644 --- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps +++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps @@ -489,15 +489,18 @@ - - + + - + + + + @@ -1107,18 +1110,18 @@ - - - + + + - + - + - + - - + + @@ -1126,18 +1129,18 @@ - - - + + + - + - + - + - - + + @@ -1145,18 +1148,18 @@ - - - + + + - + - + - + - - + + @@ -1164,18 +1167,18 @@ - - - + + + - + - + - + - - + + @@ -1183,18 +1186,18 @@ - - - + + + - + - + - + - - + + @@ -1202,21 +1205,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1224,21 +1224,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1246,21 +1243,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1268,21 +1262,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1290,21 +1281,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1312,21 +1300,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1334,21 +1319,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1356,21 +1338,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1378,21 +1357,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1400,21 +1376,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1422,21 +1395,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1444,21 +1414,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1466,21 +1433,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1488,21 +1452,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1510,21 +1471,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1532,21 +1490,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1554,21 +1509,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1576,21 +1528,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1598,21 +1547,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1620,21 +1566,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1642,21 +1585,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1664,21 +1604,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1686,21 +1623,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1708,21 +1642,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1730,21 +1661,75 @@ - - - + + + - + - + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2100,6 +2085,16 @@ + + + + + + + + + + @@ -2614,68 +2609,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2702,11 +2635,6 @@ - - - - - diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/com.fasten.safety.doc2word.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/com.fasten.safety.doc2word.msd index ba298ff94..be0869e1b 100644 --- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/com.fasten.safety.doc2word.msd +++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/com.fasten.safety.doc2word.msd @@ -76,6 +76,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/com.fasten.safety.rcp.pluginSolution.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/com.fasten.safety.rcp.pluginSolution.msd index dec26f0f7..8bf1a9fa3 100644 --- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/com.fasten.safety.rcp.pluginSolution.msd +++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/com.fasten.safety.rcp.pluginSolution.msd @@ -101,6 +101,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps index 6ecdbc212..409078420 100644 --- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps +++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps @@ -230,6 +230,7 @@ + @@ -243,6 +244,8 @@ + + @@ -345,7 +348,7 @@ - + @@ -579,25 +582,28 @@ - - - - - - - + + - + - - - + + + + + + + + + + + @@ -643,6 +649,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -1335,18 +1362,18 @@ - - - + + + - + - + - + - - + + @@ -1354,18 +1381,18 @@ - - - + + + - + - + - + - - + + @@ -1373,18 +1400,18 @@ - - - + + + - + - + - + - - + + @@ -1392,18 +1419,18 @@ - - - + + + - + - + - + - - + + @@ -1411,18 +1438,18 @@ - - - + + + - + - + - + - - + + @@ -1430,21 +1457,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1452,21 +1476,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1474,21 +1495,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1496,21 +1514,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1518,21 +1533,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1540,21 +1552,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1562,21 +1571,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1584,21 +1590,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1606,21 +1609,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1628,21 +1628,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1650,21 +1647,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1672,21 +1666,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1694,21 +1685,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1716,21 +1704,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1738,21 +1723,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1760,21 +1742,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1782,21 +1761,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1804,21 +1780,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1826,21 +1799,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1848,21 +1818,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1870,21 +1837,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1892,21 +1856,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1914,21 +1875,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1936,21 +1894,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1958,21 +1913,75 @@ - - - + + + - + - + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2328,6 +2337,16 @@ + + + + + + + + + + @@ -2842,68 +2861,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2930,11 +2887,6 @@ - - - - - @@ -3123,6 +3075,228 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16063,7 +16237,7 @@ - + @@ -16071,7 +16245,7 @@ - + @@ -16094,7 +16268,7 @@ - + @@ -16194,7 +16368,7 @@ - + @@ -16544,6 +16718,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16932,6 +17133,9 @@ + + + @@ -16971,12 +17175,21 @@ + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/com.mbeddr.formal.safety.gsn.sandbox.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/com.mbeddr.formal.safety.gsn.sandbox.msd index bd790b265..614373313 100644 --- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/com.mbeddr.formal.safety.gsn.sandbox.msd +++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/com.mbeddr.formal.safety.gsn.sandbox.msd @@ -79,6 +79,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/com.mbeddr.formal.safety.gsn.smv.pluginSolution.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/com.mbeddr.formal.safety.gsn.smv.pluginSolution.msd index a1d7441e6..e4e732628 100644 --- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/com.mbeddr.formal.safety.gsn.smv.pluginSolution.msd +++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/com.mbeddr.formal.safety.gsn.smv.pluginSolution.msd @@ -32,6 +32,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/com.mbeddr.formal.safety.gsn.spin.pluginSolution.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/com.mbeddr.formal.safety.gsn.spin.pluginSolution.msd index d0bde5f07..57f6cac72 100644 --- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/com.mbeddr.formal.safety.gsn.spin.pluginSolution.msd +++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/com.mbeddr.formal.safety.gsn.spin.pluginSolution.msd @@ -24,6 +24,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test.com.fasten.safety.doc2word.msd b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test.com.fasten.safety.doc2word.msd index 935f2a7d2..858fefc32 100644 --- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test.com.fasten.safety.doc2word.msd +++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test.com.fasten.safety.doc2word.msd @@ -48,6 +48,7 @@ + @@ -81,6 +82,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/test.mbeddr.formal.gsn.msd b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/test.mbeddr.formal.gsn.msd index 960930e32..224f804b2 100644 --- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/test.mbeddr.formal.gsn.msd +++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/test.mbeddr.formal.gsn.msd @@ -74,6 +74,7 @@ + diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/com.mbeddr.formal.spin.hdl.mpl b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/com.mbeddr.formal.spin.hdl.mpl index a536868f6..75ce0e8ca 100644 --- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/com.mbeddr.formal.spin.hdl.mpl +++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/com.mbeddr.formal.spin.hdl.mpl @@ -166,6 +166,7 @@ + diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/com.mbeddr.formal.spin.mpl b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/com.mbeddr.formal.spin.mpl index 61ff439e1..a7a4b0d61 100644 --- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/com.mbeddr.formal.spin.mpl +++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/com.mbeddr.formal.spin.mpl @@ -93,6 +93,7 @@ + diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/com.mbeddr.formal.spin.pluginSolution.msd b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/com.mbeddr.formal.spin.pluginSolution.msd index ca64c91c7..af552ba83 100644 --- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/com.mbeddr.formal.spin.pluginSolution.msd +++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/com.mbeddr.formal.spin.pluginSolution.msd @@ -29,6 +29,7 @@ + diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/test.mbeddr.formal.spin.msd b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/test.mbeddr.formal.spin.msd index f389f897a..28b3bb2ad 100644 --- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/test.mbeddr.formal.spin.msd +++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/test.mbeddr.formal.spin.msd @@ -38,6 +38,7 @@ + diff --git a/code/languages/com.mpsbasics/.mps/libraries.xml b/code/languages/com.mpsbasics/.mps/libraries.xml new file mode 100644 index 000000000..6b84430d8 --- /dev/null +++ b/code/languages/com.mpsbasics/.mps/libraries.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/code/languages/com.mpsbasics/.mps/modules.xml b/code/languages/com.mpsbasics/.mps/modules.xml index 114a6c14c..87dacf675 100644 --- a/code/languages/com.mpsbasics/.mps/modules.xml +++ b/code/languages/com.mpsbasics/.mps/modules.xml @@ -6,7 +6,6 @@ - diff --git a/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/models/com.mpsbasics.pdfexporter.behavior.mps b/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/models/com.mpsbasics.pdfexporter.behavior.mps index 89db3762b..bb9224127 100644 --- a/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/models/com.mpsbasics.pdfexporter.behavior.mps +++ b/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/models/com.mpsbasics.pdfexporter.behavior.mps @@ -5,6 +5,7 @@ + @@ -114,7 +115,6 @@ - @@ -150,6 +150,9 @@ + + + @@ -215,6 +218,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -224,9 +251,13 @@ + + + + @@ -241,6 +272,9 @@ + + + @@ -257,6 +291,9 @@ + + + @@ -269,9 +306,26 @@ + + + + + + + + + + + + + + + + + @@ -279,7 +333,7 @@ - + @@ -287,8 +341,29 @@ - + + + + + + + + + + + + + + + + + + + + + + @@ -300,8 +375,8 @@ - - + + @@ -436,28 +511,13 @@ - - - - - - - - - - - - - - - - - - - - + + + + + - + @@ -719,6 +779,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -726,7 +808,12 @@ - + + + + + + @@ -735,23 +822,36 @@ - - + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -765,17 +865,22 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -783,6 +888,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -790,7 +961,12 @@ - + + + + + + @@ -799,8 +975,8 @@ - - + + @@ -830,6 +1006,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -837,7 +1035,12 @@ - + + + + + + @@ -860,9 +1063,7 @@ - - - + @@ -964,16 +1165,6 @@ - - - - - - - - - - @@ -1106,8 +1297,9 @@ - - + + + @@ -1395,14 +1587,15 @@ - + - + - - + + + @@ -1465,8 +1658,16 @@ + + + + + + + + @@ -1480,7 +1681,9 @@ - + + + @@ -1847,8 +2050,6 @@ - - @@ -1857,15 +2058,6 @@ - - - - - - - - - @@ -1927,8 +2119,6 @@ - - @@ -1954,8 +2144,9 @@ - - + + + @@ -2243,8 +2434,16 @@ + + + + + + + + @@ -2258,7 +2457,9 @@ - + + + diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.build/models/com.mpsbasics.build.build.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.build/models/com.mpsbasics.build.build.mps index 2fda48187..338fc2094 100644 --- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.build/models/com.mpsbasics.build.build.mps +++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.build/models/com.mpsbasics.build.build.mps @@ -11,6 +11,9 @@ + + + @@ -115,7 +118,6 @@ - @@ -247,25 +249,28 @@ - - - - - - - + + - + - - - + + + + + + + + + + + @@ -455,7 +460,6 @@ - @@ -494,18 +498,18 @@ - - - + + + - + - + - + - - + + @@ -513,18 +517,18 @@ - - - + + + - + - + - + - - + + @@ -532,18 +536,18 @@ - - - + + + - + - + - + - - + + @@ -551,18 +555,18 @@ - - - + + + - + - + - + - - + + @@ -570,18 +574,18 @@ - - - + + + - + - + - + - - + + @@ -589,21 +593,18 @@ - - - + + + - + - + - + - - - - - + + @@ -611,21 +612,18 @@ - - - + + + - + - + - + - - - - - + + @@ -633,21 +631,18 @@ - - - + + + - + - + - + - - - - - + + @@ -655,21 +650,18 @@ - - - + + + - + - + - + - - - - - + + @@ -677,21 +669,18 @@ - - - + + + - + - + - + - - - - - + + @@ -699,21 +688,18 @@ - - - + + + - + - + - + - - - - - + + @@ -721,21 +707,18 @@ - - - + + + - + - + - + - - - - - + + @@ -743,21 +726,18 @@ - - - + + + - + - + - + - - - - - + + @@ -765,21 +745,18 @@ - - - + + + - + - + - + - - - - - + + @@ -787,21 +764,18 @@ - - - + + + - + - + - + - - - - - + + @@ -809,21 +783,18 @@ - - - + + + - + - + - + - - - - - + + @@ -831,21 +802,18 @@ - - - + + + - + - + - + - - - - - + + @@ -853,21 +821,18 @@ - - - + + + - + - + - + - - - - - + + @@ -875,21 +840,18 @@ - - - + + + - + - + - + - - - - - + + @@ -897,21 +859,18 @@ - - - + + + - + - + - + - - - - - + + @@ -919,21 +878,18 @@ - - - + + + - + - + - + - - - - - + + @@ -941,21 +897,18 @@ - - - + + + - + - + - + - - - - - + + @@ -963,21 +916,18 @@ - - - + + + - + - + - + - - - - - + + @@ -985,21 +935,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1007,21 +954,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1029,21 +973,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1051,21 +992,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1073,21 +1011,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1095,21 +1030,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1117,21 +1049,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1139,49 +1068,37 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + - + - - - + + + - - + + @@ -1189,23 +1106,29 @@ - - - - - - + + + - + - - + + + + + + + + + + + @@ -1232,11 +1155,6 @@ - - - - - diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.diffx.lib/lib/docx4j-diffx-11.4.9.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.diffx.lib/lib/docx4j-diffx-11.4.9.jar deleted file mode 100644 index 889174853..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.diffx.lib/lib/docx4j-diffx-11.4.9.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/com.mpsbasics.docx4j.lib.msd b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/com.mpsbasics.docx4j.lib.msd index eb03c4566..eece533fb 100644 --- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/com.mpsbasics.docx4j.lib.msd +++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/com.mpsbasics.docx4j.lib.msd @@ -1,73 +1,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/.gitignore b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/.gitignore new file mode 100644 index 000000000..c96a04f00 --- /dev/null +++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/antlr-2.7.7.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/antlr-2.7.7.jar deleted file mode 100644 index 5e5f14b35..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/antlr-2.7.7.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/antlr-runtime-3.5.2.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/antlr-runtime-3.5.2.jar deleted file mode 100644 index d48e3e867..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/antlr-runtime-3.5.2.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/checker-qual-2.8.1.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/checker-qual-2.8.1.jar deleted file mode 100644 index 09269be6a..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/checker-qual-2.8.1.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-codec-1.12.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-codec-1.12.jar deleted file mode 100644 index 531478ea9..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-codec-1.12.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-compress-1.21.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-compress-1.21.jar deleted file mode 100644 index 4892334d0..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-compress-1.21.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-io-2.7.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-io-2.7.jar deleted file mode 100644 index 588945892..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-io-2.7.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-lang3-3.9.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-lang3-3.9.jar deleted file mode 100644 index 0d8969392..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-lang3-3.9.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/error_prone_annotations-2.3.3.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/error_prone_annotations-2.3.3.jar deleted file mode 100644 index 8fe4938d9..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/error_prone_annotations-2.3.3.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/fontbox-2.0.24.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/fontbox-2.0.24.jar deleted file mode 100644 index e93794c15..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/fontbox-2.0.24.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jakarta.activation-2.0.1.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jakarta.activation-2.0.1.jar deleted file mode 100644 index 521c7c49f..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jakarta.activation-2.0.1.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jakarta.mail-2.0.1.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jakarta.mail-2.0.1.jar deleted file mode 100644 index 17e07ccfe..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jakarta.mail-2.0.1.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jakarta.xml.bind-api-3.0.1.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jakarta.xml.bind-api-3.0.1.jar deleted file mode 100644 index f890cba5e..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jakarta.xml.bind-api-3.0.1.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jaxb-svg11-11.4.0.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jaxb-svg11-11.4.0.jar deleted file mode 100644 index 9e2a2d8bf..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jaxb-svg11-11.4.0.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jcl-over-slf4j-2.0.0-alpha5.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jcl-over-slf4j-2.0.0-alpha5.jar deleted file mode 100644 index a472dc73c..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jcl-over-slf4j-2.0.0-alpha5.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/mbassador-1.3.2.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/mbassador-1.3.2.jar deleted file mode 100644 index 203655868..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/mbassador-1.3.2.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/org.eclipse.persistence.asm-9.1.0.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/org.eclipse.persistence.asm-9.1.0.jar deleted file mode 100644 index d1b3b5997..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/org.eclipse.persistence.asm-9.1.0.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/org.eclipse.persistence.core-3.0.2.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/org.eclipse.persistence.core-3.0.2.jar deleted file mode 100644 index 2ca27d75a..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/org.eclipse.persistence.core-3.0.2.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/org.eclipse.persistence.moxy-3.0.2.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/org.eclipse.persistence.moxy-3.0.2.jar deleted file mode 100644 index f762d2da1..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/org.eclipse.persistence.moxy-3.0.2.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/qdox-1.12.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/qdox-1.12.jar deleted file mode 100644 index 3d850e5f5..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/qdox-1.12.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/slf4j-api-2.0.0-alpha6.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/slf4j-api-2.0.0-alpha6.jar deleted file mode 100644 index 6e43ddd65..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/slf4j-api-2.0.0-alpha6.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/stringtemplate-3.2.1.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/stringtemplate-3.2.1.jar deleted file mode 100644 index d0e11b719..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/stringtemplate-3.2.1.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/wmf2svg-0.9.8.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/wmf2svg-0.9.8.jar deleted file mode 100644 index 50fa35544..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/wmf2svg-0.9.8.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/xalan-interpretive-11.0.0.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/xalan-interpretive-11.0.0.jar deleted file mode 100644 index 80011e32c..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/xalan-interpretive-11.0.0.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/xalan-serializer-11.0.0.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/xalan-serializer-11.0.0.jar deleted file mode 100644 index cc95d45fa..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/xalan-serializer-11.0.0.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/xmlgraphics-commons-2.7.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/xmlgraphics-commons-2.7.jar deleted file mode 100644 index 7396f1307..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/xmlgraphics-commons-2.7.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-JAXB-MOXy-11.4.9.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-JAXB-MOXy-11.4.9.jar deleted file mode 100644 index 2152221fe..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-JAXB-MOXy-11.4.9.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-core-11.4.9.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-core-11.4.9.jar deleted file mode 100644 index 4f52fb23a..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-core-11.4.9.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-openxml-objects-11.4.9.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-openxml-objects-11.4.9.jar deleted file mode 100644 index f00409f57..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-openxml-objects-11.4.9.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-openxml-objects-pml-11.4.9.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-openxml-objects-pml-11.4.9.jar deleted file mode 100644 index ad1a7b3fa..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-openxml-objects-pml-11.4.9.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-openxml-objects-sml-11.4.9.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-openxml-objects-sml-11.4.9.jar deleted file mode 100644 index 783ddaad3..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-openxml-objects-sml-11.4.9.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/com.mpsbasics.docx4j.testutils.msd b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/com.mpsbasics.docx4j.testutils.msd index eb751678e..0680d2478 100644 --- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/com.mpsbasics.docx4j.testutils.msd +++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/com.mpsbasics.docx4j.testutils.msd @@ -1,7 +1,7 @@ - + @@ -13,7 +13,6 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 71bb25aa-20fa-4c18-8954-1b176576f52d(com.mpsbasics.docx4j.lib) - 1cb48442-05da-4cad-b5c5-e31ddd69e322(com.mpsbasics.docx4j.diffx.lib) diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/models/com.mpsbasics.docx4j.testutils.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/models/com.mpsbasics.docx4j.testutils.mps index c3a6123d4..45de3e373 100644 --- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/models/com.mpsbasics.docx4j.testutils.mps +++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/models/com.mpsbasics.docx4j.testutils.mps @@ -15,7 +15,7 @@ - + @@ -323,7 +323,7 @@ - + diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox.sandbox/models/com.mpsbasics.pdfbox.sandbox._010_smoke.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox.sandbox/models/com.mpsbasics.pdfbox.sandbox._010_smoke.mps index e5cc0f2c3..aa250f744 100644 --- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox.sandbox/models/com.mpsbasics.pdfbox.sandbox._010_smoke.mps +++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox.sandbox/models/com.mpsbasics.pdfbox.sandbox._010_smoke.mps @@ -63,7 +63,7 @@ - + @@ -75,6 +75,9 @@ + + + diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/com.mpsbasics.pdfbox.msd b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/com.mpsbasics.pdfbox.msd index bab47a5ef..f55c86b8d 100644 --- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/com.mpsbasics.pdfbox.msd +++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/com.mpsbasics.pdfbox.msd @@ -26,31 +26,38 @@ d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker) 5ad14eca-28d7-4bce-b8e0-648908a49062(org.apache.batik) 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) + b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons) + 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) + + + + + diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/models/com.mpsbasics.pdfbox.utils.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/models/com.mpsbasics.pdfbox.utils.mps index 7ac02f2da..e66088975 100644 --- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/models/com.mpsbasics.pdfbox.utils.mps +++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/models/com.mpsbasics.pdfbox.utils.mps @@ -8,6 +8,10 @@ + + + + @@ -18,17 +22,38 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -37,9 +62,14 @@ + + + + + @@ -48,6 +78,10 @@ + + + + @@ -63,6 +97,7 @@ + @@ -73,13 +108,21 @@ + + + + + + + + @@ -93,6 +136,7 @@ + @@ -101,6 +145,7 @@ + @@ -108,10 +153,12 @@ + + @@ -119,16 +166,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -148,6 +242,13 @@ + + + + + + + @@ -156,6 +257,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -179,6 +300,25 @@ + + + + + + + + + + + + + + + + + + + @@ -191,6 +331,7 @@ + @@ -203,7 +344,7 @@ - + @@ -214,21 +355,53 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -347,7 +520,90 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -379,25 +635,16 @@ - - + + + + + + - - - - - - - - - - - - - - - + + @@ -447,7 +694,1103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gradle.lockfile b/gradle.lockfile index 35dcca6cb..51ca10063 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -8,8 +8,8 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.5=modelcheckBackend com.fasterxml.jackson:jackson-bom:2.13.5=modelcheckBackend com.fasterxml.woodstox:woodstox-core:6.4.0=modelcheckBackend com.jetbrains.jdk:jbr_jcef:17.0.8.1-b1000.32=jbrLinux,jbrMac,jbrWin -com.jetbrains:mps:2023.2.1=mps -com.mbeddr:platform:2023.2.24906.0fb1edb=languageLibs +com.jetbrains:mps:2023.2.2=mps +com.mbeddr:platform:2023.2.24950.f1d53c3=languageLibs com.xenomachina:kotlin-argparser:2.0.7=executeBackend,generateBackend,modelcheckBackend,remigrateBackend com.xenomachina:xenocom:0.0.7=executeBackend,generateBackend,modelcheckBackend,remigrateBackend de.itemis.mps.build-backends:execute-generators:1.15.1.98.8f853d3=generateBackend @@ -29,5 +29,5 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21=executeBackend,generateBackend,mo org.jetbrains.kotlin:kotlin-stdlib:1.6.21=executeBackend,generateBackend,modelcheckBackend,remigrateBackend org.jetbrains.kotlin:kotlin-test:1.6.21=modelcheckBackend org.jetbrains:annotations:13.0=executeBackend,generateBackend,modelcheckBackend,remigrateBackend -org.mpsqa:all-in-one:2023.2.752.8c191d0=languageLibs +org.mpsqa:all-in-one:2023.2.847.4de185f=languageLibs empty= diff --git a/rcp_resources/bin/fasten.bat b/rcp_resources/bin/fasten.bat index 1a41ef6f6..7ac35753f 100644 --- a/rcp_resources/bin/fasten.bat +++ b/rcp_resources/bin/fasten.bat @@ -4,14 +4,14 @@ :: JetBrains MPS startup script. :: Generated by MPS ::---------------------------------------------------------------------- -SET IDEA_PATHS_SELECTOR=MPS2022.2 -SET PRODUCT=MPS +SET IDEA_PATHS_SELECTOR=MPS2023.2 +SET PRODUCT=mps :: --------------------------------------------------------------------- :: Ensure IDE_HOME points to the directory where the IDE is installed. :: --------------------------------------------------------------------- SET IDE_BIN_DIR=%~dp0 -FOR /F "delims=" %%i in ("%IDE_BIN_DIR%\..") DO SET IDE_HOME=%%~fi +FOR /F "delims=" %%i in ("%IDE_BIN_DIR%\..") DO SET "IDE_HOME=%%~fi" IF "%IDE_BIN_DIR:~-8%" == "bin\win\" ( echo. @@ -31,34 +31,30 @@ IF "%IDE_BIN_DIR:~-8%" == "bin\win\" ( SET JDK= SET IDEA_VENDOR_NAME=JetBrains -IF EXIST "%MPS_JDK%" SET JDK=%MPS_JDK% +IF EXIST "%MPS_JDK%" SET "JDK=%MPS_JDK%" IF EXIST "%JDK%" GOTO check SET BITS=64 -SET USER_JDK64_FILE=%APPDATA%\%IDEA_VENDOR_NAME%\MPS2022.2\mps%BITS%.exe.jdk +SET USER_JDK64_FILE=%APPDATA%\%IDEA_VENDOR_NAME%\MPS2023.2\mps%BITS%.exe.jdk SET BITS= -SET USER_JDK_FILE=%APPDATA%\%IDEA_VENDOR_NAME%\MPS2022.2\mps%BITS%.exe.jdk +SET USER_JDK_FILE=%APPDATA%\%IDEA_VENDOR_NAME%\MPS2023.2\mps%BITS%.exe.jdk IF EXIST "%USER_JDK64_FILE%" ( SET /P JDK=<%USER_JDK64_FILE% ) ELSE ( IF EXIST "%USER_JDK_FILE%" SET /P JDK=<%USER_JDK_FILE% ) IF NOT "%JDK%" == "" ( - IF NOT EXIST "%JDK%" SET JDK="%IDE_HOME%\%JDK%" + IF NOT EXIST "%JDK%" SET "JDK=%IDE_HOME%\%JDK%" IF EXIST "%JDK%" GOTO check ) -IF "%PROCESSOR_ARCHITECTURE%" == "AMD64" ( - IF EXIST "%IDE_HOME%\jbr" SET JDK=%IDE_HOME%\jbr - IF EXIST "%JDK%" GOTO check -) -IF EXIST "%IDE_HOME%\jbr-x86" SET JDK=%IDE_HOME%\jbr-x86 +IF EXIST "%IDE_HOME%\jbr" SET "JDK=%IDE_HOME%\jbr" IF EXIST "%JDK%" GOTO check -IF EXIST "%JDK_HOME%" SET JDK=%JDK_HOME% +IF EXIST "%JDK_HOME%" SET "JDK=%JDK_HOME%" IF EXIST "%JDK%" GOTO check -IF EXIST "%JAVA_HOME%" SET JDK=%JAVA_HOME% +IF EXIST "%JAVA_HOME%" SET "JDK=%JAVA_HOME%" :check SET JAVA_EXE=%JDK%\bin\javaw.exe @@ -69,7 +65,7 @@ IF NOT EXIST "%JAVA_EXE%" ( ) SET JRE=%JDK% -IF EXIST "%JRE%\jre" SET JRE=%JDK%\jre +IF EXIST "%JRE%\jre" SET "JRE=%JDK%\jre" SET BITS= FINDSTR /B /C:"OS_ARCH=\"x86_64\"" "%JRE%\release" > NUL @@ -131,7 +127,7 @@ IF "%VM_OPTIONS_FILE%%USER_VM_OPTIONS_FILE%" == "" ( SET COMMON_JVM_ARGS="-XX:ErrorFile=%USERPROFILE%\java_error_in_%PRODUCT%_%%p.log" "-XX:HeapDumpPath=%USERPROFILE%\java_error_in_%PRODUCT%.hprof" -Didea.paths.selector=%IDEA_PATHS_SELECTOR% -Didea.vendor.name="%IDEA_VENDOR_NAME%" %IDE_PROPERTIES_PROPERTY% -SET IDE_JVM_ARGS=-Didea.platform.prefix=Idea -Didea.jre.check=true -Djava.system.class.loader=com.intellij.util.lang.PathClassLoader +SET IDE_JVM_ARGS=-Didea.platform.prefix=Idea -Didea.jre.check=true -Dpty4j.preferred.native.folder="%IDE_HOME%/lib/pty4j" -Djna.boot.library.path="%IDE_HOME%/lib/jna" -Djava.system.class.loader=com.intellij.util.lang.PathClassLoader SET ALL_JVM_ARGS=%ACC% %COMMON_JVM_ARGS% %IDE_JVM_ARGS% SET CLASS_PATH=%IDE_HOME%\lib\* @@ -147,7 +143,7 @@ start "" "%JAVA_EXE%" ^ %ALL_JVM_ARGS% ^ -Didea.main.class.name=%MAIN_CLASS% ^ -cp "%CLASS_PATH%" ^ - --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.nio.charset=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.base/jdk.internal.vm=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/sun.security.ssl=ALL-UNNAMED --add-opens=java.base/sun.security.util=ALL-UNNAMED --add-opens=java.desktop/java.awt=ALL-UNNAMED --add-opens=java.desktop/java.awt.dnd.peer=ALL-UNNAMED --add-opens=java.desktop/java.awt.event=ALL-UNNAMED --add-opens=java.desktop/java.awt.image=ALL-UNNAMED --add-opens=java.desktop/java.awt.peer=ALL-UNNAMED --add-opens=java.desktop/javax.swing=ALL-UNNAMED --add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens=java.desktop/sun.awt.datatransfer=ALL-UNNAMED --add-opens=java.desktop/sun.awt.image=ALL-UNNAMED --add-opens=java.desktop/sun.awt=ALL-UNNAMED --add-opens=java.desktop/sun.font=ALL-UNNAMED --add-opens=java.desktop/sun.java2d=ALL-UNNAMED --add-opens=java.desktop/sun.swing=ALL-UNNAMED --add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED --add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-opens=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-opens=jdk.jdi/com.sun.tools.jdi=ALL-UNNAMED --add-opens=java.desktop/sun.awt.windows=ALL-UNNAMED ^ + --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.nio.charset=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.base/jdk.internal.vm=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/sun.nio.fs=ALL-UNNAMED --add-opens=java.base/sun.security.ssl=ALL-UNNAMED --add-opens=java.base/sun.security.util=ALL-UNNAMED --add-opens=java.desktop/java.awt=ALL-UNNAMED --add-opens=java.desktop/java.awt.dnd.peer=ALL-UNNAMED --add-opens=java.desktop/java.awt.event=ALL-UNNAMED --add-opens=java.desktop/java.awt.image=ALL-UNNAMED --add-opens=java.desktop/java.awt.peer=ALL-UNNAMED --add-opens=java.desktop/javax.swing=ALL-UNNAMED --add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens=java.desktop/sun.awt.datatransfer=ALL-UNNAMED --add-opens=java.desktop/sun.awt.image=ALL-UNNAMED --add-opens=java.desktop/sun.awt=ALL-UNNAMED --add-opens=java.desktop/sun.font=ALL-UNNAMED --add-opens=java.desktop/sun.java2d=ALL-UNNAMED --add-opens=java.desktop/sun.swing=ALL-UNNAMED --add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED --add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-opens=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-opens=jdk.jdi/com.sun.tools.jdi=ALL-UNNAMED --add-opens=java.desktop/sun.awt.windows=ALL-UNNAMED ^ %MAIN_CLASS% ^ %* diff --git a/rcp_resources/icons/fasten16.svg b/rcp_resources/icons/fasten16.svg new file mode 100644 index 000000000..aea999826 --- /dev/null +++ b/rcp_resources/icons/fasten16.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/rcp_resources/icons/fasten32.svg b/rcp_resources/icons/fasten32.svg new file mode 100644 index 000000000..1d0a0f0ad --- /dev/null +++ b/rcp_resources/icons/fasten32.svg @@ -0,0 +1 @@ + \ No newline at end of file