Skip to content

Commit

Permalink
Merge pull request #2461 from mbeddr/refactor/remove-installers
Browse files Browse the repository at this point in the history 
Remove installers, RCP, all-in-one distribution
  • Loading branch information
@sergej-koscejev
sergej-koscejev authored Aug 1, 2024
2 parents 46ec4f9 + a6a8110 commit 3bd158d
Show file tree
Hide file tree
Showing 46 changed files with 42 additions and 5,081 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
The format is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). The project does _not_ follow
Semantic Versioning and the changes are simply documented in reverse chronological order, grouped by calendar month.

# August 2024

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

### Removed

- RCP, installer, and all-in-one distribution was removed.

# July 2024

## com.mbeddr.analyses
Expand Down
132 changes: 1 addition & 131 deletions build/com.mbeddr.allScripts/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,46 +91,6 @@
<fileset dir="${build.tmp}/default/mbeddr.allScripts.jar" />
</jar>
<mkdir dir="${build.layout}/mbeddr.allScripts/languages" />
<mkdir dir="${build.tmp}/default/com.mbeddr.allInOne.jar" />
<mkdir dir="${build.tmp}/default/com.mbeddr.allInOne.jar/META-INF" />
<echoxml file="${build.tmp}/default/com.mbeddr.allInOne.jar/META-INF/module.xml">
<module namespace="com.mbeddr.allInOne" type="solution" uuid="cbbb9e79-84e5-4c2e-b1a2-11a381c7baf9">
<dependencies>
<module ref="7ac0dfb8-7d5f-4573-ab80-81af2106ce03(com.mbeddr.build)" kind="cl" />
<module ref="3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)" kind="cl" />
<module ref="f1fb7b1c-ce0d-423c-9369-4a661d600029(de.itemis.mps.extensions.build)" kind="cl" />
<module ref="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" kind="cl" />
</dependencies>
<uses>
<language id="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" />
<language id="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" />
</uses>
<classpath>
<entry path="." />
</classpath>
<sources jar="com.mbeddr.allInOne-src.jar" descriptor="allInOne.msd" />
</module>
</echoxml>
<jar destfile="${build.layout}/mbeddr.allScripts/languages/com.mbeddr.allInOne.jar" duplicate="preserve">
<fileset dir="${build.tmp}/java/out/com.mbeddr.allInOne" />
<fileset dir="${mbeddr.github.core.home}/code/languages/com.mbeddr.build/solutions/com.mbeddr.allInOne" includes="icons/**, resources/**" />
<fileset dir="${mbeddr.build}/solutions/com.mbeddr.allInOne/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
<fileset dir="${build.tmp}/default/com.mbeddr.allInOne.jar" />
</jar>
<copyModels todir="${build.tmp}/customProcessors/copyModels/solutions-com.mbeddr.allInOne-models">
<fileset dir="${mbeddr.build}/solutions/com.mbeddr.allInOne/models" includes="**/*.mps, **/*.mpsr, **/.model" />
</copyModels>
<jar destfile="${build.layout}/mbeddr.allScripts/languages/com.mbeddr.allInOne-src.jar" duplicate="preserve">
<fileset dir="${mbeddr.build}/solutions/com.mbeddr.allInOne/source_gen">
<exclude name="**/trace.info" />
<exclude name="**/exports" />
<exclude name="**/checkpoints" />
<exclude name="**/*.mps" />
</fileset>
<zipfileset file="${mbeddr.github.core.home}/code/languages/com.mbeddr.build/solutions/com.mbeddr.allInOne/allInOne.msd" prefix="module" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-com.mbeddr.allInOne-models" prefix="module/models" />
</jar>
<mkdir dir="${build.layout}/mbeddr.allScripts/languages" />
<mkdir dir="${build.tmp}/default/com.mbeddr.build.jar" />
<mkdir dir="${build.tmp}/default/com.mbeddr.build.jar/META-INF" />
<echoxml file="${build.tmp}/default/com.mbeddr.build.jar/META-INF/module.xml">
Expand Down Expand Up @@ -497,50 +457,6 @@
</jar>
<mkdir dir="${build.layout}/mbeddr.allScripts/languages" />
<mkdir dir="${build.layout}/mbeddr.allScripts/languages/mbeddr" />
<mkdir dir="${build.tmp}/default/com.mbeddr.rcp.jar" />
<mkdir dir="${build.tmp}/default/com.mbeddr.rcp.jar/META-INF" />
<echoxml file="${build.tmp}/default/com.mbeddr.rcp.jar/META-INF/module.xml">
<module namespace="com.mbeddr.rcp" type="solution" uuid="4fe640a5-f027-47b6-a81c-85e480b0ecd4">
<dependencies>
<module ref="cbbb9e79-84e5-4c2e-b1a2-11a381c7baf9(com.mbeddr.allInOne)" kind="cl" />
<module ref="7ac0dfb8-7d5f-4573-ab80-81af2106ce03(com.mbeddr.build)" kind="cl" />
<module ref="3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)" kind="cl" />
<module ref="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" kind="cl" />
</dependencies>
<uses>
<language id="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" />
<language id="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" />
<language id="l:d5033cee-f632-44b6-b308-89d4fbde34ff:jetbrains.mps.build.startup" />
<language id="l:698a8d22-a104-47a0-ba8d-10e3ec237f13:jetbrains.mps.build.workflow" />
<language id="l:58f98fef-90ad-4b72-a390-fad66ec7005a:jetbrains.mps.core.properties" />
<language id="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" />
<language id="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" />
</uses>
<classpath>
<entry path="." />
</classpath>
<sources jar="com.mbeddr.rcp-src.jar" descriptor="com.mbeddr.rcp.msd" />
</module>
</echoxml>
<jar destfile="${build.layout}/mbeddr.allScripts/languages/mbeddr/com.mbeddr.rcp.jar" duplicate="preserve">
<fileset dir="${build.tmp}/java/out/com.mbeddr.rcp" />
<fileset dir="${mbeddr.github.core.home}/code/languages/com.mbeddr.build/solutions/com.mbeddr.rcp" includes="icons/**, resources/**" />
<fileset dir="${mbeddr.build}/solutions/com.mbeddr.rcp/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
<fileset dir="${build.tmp}/default/com.mbeddr.rcp.jar" />
</jar>
<copyModels todir="${build.tmp}/customProcessors/copyModels/solutions-com.mbeddr.rcp-models">
<fileset dir="${mbeddr.build}/solutions/com.mbeddr.rcp/models" includes="**/*.mps, **/*.mpsr, **/.model" />
</copyModels>
<jar destfile="${build.layout}/mbeddr.allScripts/languages/mbeddr/com.mbeddr.rcp-src.jar" duplicate="preserve">
<fileset dir="${mbeddr.build}/solutions/com.mbeddr.rcp/source_gen">
<exclude name="**/trace.info" />
<exclude name="**/exports" />
<exclude name="**/checkpoints" />
<exclude name="**/*.mps" />
</fileset>
<zipfileset file="${mbeddr.github.core.home}/code/languages/com.mbeddr.build/solutions/com.mbeddr.rcp/com.mbeddr.rcp.msd" prefix="module" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-com.mbeddr.rcp-models" prefix="module/models" />
</jar>
<mkdir dir="${build.tmp}/default/com.mbeddr.build.jar1" />
<mkdir dir="${build.tmp}/default/com.mbeddr.build.jar1/META-INF" />
<echoxml file="${build.tmp}/default/com.mbeddr.build.jar1/META-INF/module.xml">
Expand Down Expand Up @@ -640,7 +556,7 @@
<delete dir="${build.layout}" />
</target>

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

<target name="processResources" />

Expand Down Expand Up @@ -755,7 +671,6 @@
<library file="${artifacts.mps}/languages/workbench/jetbrains.mps.ide.jar" />
<library file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
<chunk>
<module file="${mbeddr.github.core.home}/code/languages/com.mbeddr.build/solutions/com.mbeddr.allInOne/allInOne.msd" />
<module file="${mbeddr.github.core.home}/code/languages/com.mbeddr.build/solutions/com.mbeddr.allScripts/com.mbeddr.allScripts.msd" />
<module file="${mbeddr.github.core.home}/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/com.mbeddr.build.msd" />
<module file="${mbeddr.github.core.home}/code/languages/com.mbeddr.build/solutions/com.mbeddr.cc.tests.dev.build/com.mbeddr.cc.tests.dev.build.msd" />
Expand All @@ -765,7 +680,6 @@
<module file="${mbeddr.github.core.home}/code/languages/com.mbeddr.build/solutions/com.mbeddr.debugger.tests.dev.build/com.mbeddr.debugger.tests.dev.build.msd" />
<module file="${mbeddr.github.core.home}/code/languages/com.mbeddr.build/solutions/com.mbeddr.ext.build/build.msd" />
<module file="${mbeddr.github.core.home}/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/com.mbeddr.platform.msd" />
<module file="${mbeddr.github.core.home}/code/languages/com.mbeddr.build/solutions/com.mbeddr.rcp/com.mbeddr.rcp.msd" />
<module file="${mbeddr.github.core.home}/code/languages/com.mbeddr.build/solutions/com.mbeddr.xmodel.build/com.mbeddr.xmodel.build.msd" />
</chunk>
<jvmargs>
Expand Down Expand Up @@ -944,27 +858,6 @@
</copy>
</target>

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

<target name="java.compile.com.mbeddr.platform">
<mkdir dir="${mbeddr.build}/solutions/com.mbeddr.platform/source_gen" />
<mkdir dir="${build.tmp}/java/out/com.mbeddr.platform" />
Expand All @@ -984,27 +877,6 @@
</copy>
</target>

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

<target name="java.compile.com.mbeddr.build" depends="java.compile.com.mbeddr.platform">
<mkdir dir="${mbeddr.build}/solutions/com.mbeddr.build/source_gen" />
<mkdir dir="${build.tmp}/java/out/com.mbeddr.build" />
Expand Down Expand Up @@ -1047,7 +919,6 @@
</target>

<target name="cleanSources">
<delete dir="${mbeddr.build}/solutions/com.mbeddr.allInOne/source_gen" />
<delete dir="${mbeddr.build}/solutions/com.mbeddr.allScripts/source_gen" />
<delete dir="${mbeddr.build}/solutions/com.mbeddr.build/source_gen" />
<delete dir="${mbeddr.build}/solutions/com.mbeddr.cc.tests.dev.build/source_gen" />
Expand All @@ -1057,7 +928,6 @@
<delete dir="${mbeddr.build}/solutions/com.mbeddr.debugger.tests.dev.build/source_gen" />
<delete dir="${mbeddr.build}/solutions/com.mbeddr.ext.build/source_gen" />
<delete dir="${mbeddr.build}/solutions/com.mbeddr.platform/source_gen" />
<delete dir="${mbeddr.build}/solutions/com.mbeddr.rcp/source_gen" />
<delete dir="${mbeddr.build}/solutions/com.mbeddr.xmodel.build/source_gen" />
</target>
</project>
59 changes: 0 additions & 59 deletions build/com.mbeddr/analyses.test/build.gradle
View file

This file was deleted.

2 changes: 1 addition & 1 deletion build/com.mbeddr/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ String minorVersion = '-Dminor.version=' + ext.mbeddrMinor
ext.mbeddr_home = ['-Dmbeddr.github.core.home=' + file(rootProject.projectDir.absolutePath).getAbsolutePath(), minorVersion, majorVersion, buildVersion]
ext.slall_home = ['-Dsl-all.home=' + file(artifactsDir.absolutePath + '/de.itemis.mps.extensions').getAbsolutePath(), minorVersion, majorVersion, buildVersion]
ext.dependsOnMPS_scriptArgs = [mps_home, build_dir, artifacts_root]
ext["itemis.mps.gradle.ant.defaultScriptArgs"] = ext.dependsOnMbeddr_scriptArgs = [*dependsOnMPS_scriptArgs, *mbeddr_home, *slall_home, "-Dmps.generator.skipUnmodifiedModels=true"]
ext["itemis.mps.gradle.ant.defaultScriptArgs"] = ext.dependsOnMbeddr_scriptArgs = [*dependsOnMPS_scriptArgs, *mbeddr_home, *slall_home]

// path locations
ext.mbeddrScripts_basePath = file(ant.properties['mbeddr.github.core.home'] + "/build").getAbsolutePath()
Expand Down
63 changes: 1 addition & 62 deletions build/com.mbeddr/distribution/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,71 +29,10 @@ task build_all_in_one(type: BuildLanguages, dependsOn: [':build:com.mbeddr:platf
script script_build_mbeddrAllInOne
}

task build_platform_distribution(type: BuildLanguages, dependsOn: [':build:com.mbeddr:platform:copy_allScripts', resolve_mbeddr]) {
script scriptFile('com.mbeddr.platform/build-distribution.xml')
// Support incremental build
inputs.file(script)
}

task package_tutorial(type: Zip) {
from rootProject.projectDir.absolutePath + "/code/applications/tutorial"
destinationDirectory = new File(rootProject.projectDir.absolutePath + "/artifacts/" + "com.mbeddr.tutorial")
archiveFileName = "com.mbeddr.tutorial.zip"
}

task prepare_distribution(dependsOn: [build_all_in_one, build_platform_distribution, package_tutorial])


def script_build_mbeddr_branding = new File(scriptsBasePath + "/com.mbeddr.rcp/" + "mps.xml")
def script_build_mbeddrRCP = new File(scriptsBasePath + "/com.mbeddr.rcp/" + "mpsDistribution.xml")

task build_mbeddr_branding(type: BuildLanguages, dependsOn: prepare_distribution) {
script script_build_mbeddr_branding
}

task build_mbeddrRCP(type: RunAntScript, dependsOn: build_mbeddr_branding) {
script script_build_mbeddrRCP
targets 'clean', 'assemble'
}


def installer_repo = project.hasProperty('InstallerRepo') ? project.getProperty('InstallerRepo') : rootProject.projectDir.absolutePath + '/../mbeddr.installer.win'

task resolve_jreWindows(type: Copy) {
from {
configurations.jreWin.collect { tarTree(resources.gzip(it)) }
}
exclude("LICENSE")
into installer_repo + "/files/mbeddr/"
}

task prepare_installer(type: Copy, dependsOn: [build_mbeddrRCP, resolve_jreWindows]) {
from {
zipTree(rootProject.projectDir.absolutePath + "/artifacts/mpsDistribution/" + "mbeddr-win.zip")
}
into installer_repo + "/files/"
}


task build_installer(type:Exec, dependsOn: [prepare_installer]) {
workingDir installer_repo

//on windows:
commandLine 'cmd', '/c', "NSIS\\makensis.exe", installer_repo + "\\mbeddr.nsi"

//store the output instead of printing to the console:
standardOutput = new ByteArrayOutputStream()

//extension method stopTomcat.output() can be used to obtain the output:
ext.output = {
return standardOutput.toString()
}
}

task build_dmg(type: CreateDmg) {
dependsOn build_mbeddrRCP
rcpArtifact rootProject.file('artifacts/mpsDistribution/mbeddr-macos.zip')
jdkDependency "com.jetbrains.jdk:jbr:${jdkVersion}:osx-x64@tgz"
backgroundImage rootProject.file('rcp/icons/mbeddr-logo.png')
dmgFile rootProject.file('buildUtil/mbeddr-macos.dmg')
}
task prepare_distribution(dependsOn: [build_all_in_one, ':build:com.mbeddr:platform:build_platform_distribution', package_tutorial])
6 changes: 0 additions & 6 deletions build/com.mbeddr/platform/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,6 @@ task test_mbeddr_platform(type: TestLanguages, dependsOn: build_platform) {

task build_platform_distribution(type: BuildLanguages, dependsOn: [build_platform, test_mbeddr_platform]) {
script scriptFile('com.mbeddr.platform/build-distribution.xml')

// Support incremental build
inputs.file(script)
inputs.dir("$rootDir/artifacts/mps-sl-all")
inputs.dir("$rootDir/artifacts/com.mbeddr.platform")
outputs.dir("$rootDir/artifacts/com.mbeddr.platform.distribution")
}

task package_mbeddrPlatform(type: Zip, dependsOn: test_mbeddr_platform) {
Expand Down
Loading

0 comments on commit 3bd158d

Please sign in to comment.