Skip to content

Commit

Permalink
Improve target platform and update site management (#293)
Browse files Browse the repository at this point in the history
* improve targetplatform and update site management

- use https in updatesite when possible
- add tpd new version

* reintroduce the use of tpd dsl file as source for targetplatform

* use tpd as source for the gemoc_studio_dev.target
  • Loading branch information
dvojtise authored Jun 9, 2023
1 parent 7e6c2e3 commit f062a38
Show file tree
Hide file tree
Showing 9 changed files with 367 additions and 2,044 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,27 @@
Please install `m2e PDE integration` feature in order to correctly edit the target file (in order to open the dependecies coming from maven central)

# Editing the target platform


we both need m2e PDE integration and targetplatform-dsl to correctly edit these files


## m2e PDE

Please install `m2e PDE integration` feature in order to correctly edit the target file (in order to open the dependencies coming from maven central)
(this feature is available in the http://download.eclipse.org/releases/2022-06 update site )


## targetplatform-dsl
2/ Please install TP DSL to edit the `gemoc_studio.tpd` file

Source/User guide:
https://github.com/eclipse-cbi/targetplatform-dsl

Update-site:
https://download.eclipse.org/cbi/updates/tpd/nightly/

Never edit the `gemoc_studio.target` directly, generate it from the `gemoc_studio.tpd` (right-click on the file -> Create Target Definition File)

Optional: you should be able to use the `update_target.sh` script to achieve the same headless


Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
This target platform uses GEMOC nightly update site.

This allows to build some GEMOC components without opening all the plugins in your workspace
This allows to build some GEMOC components without opening all the plugins in your workspace

Edit the `.tpd` file then generate the `.target` file from it.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/*******************************************************************************
* Copyright (c) 2022 Inria
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
* SPDX-License-Identifier: EPL-2.0
* Contributors: see AUTHORS file
*******************************************************************************/
target "GEMOCStudio Target platform"

with source requirements
environment JavaSE-11

location eclipse "https://download.eclipse.org/releases/2022-06" {
// features

// individual plugins

}


location gemoc "https://download.eclipse.org/gemoc/updates/nightly/" {
org.eclipse.gemoc.gemoc_studio.additions.feature.feature.group
org.eclipse.gemoc.gemoc_studio.branding.feature.feature.group
org.eclipse.gemoc.gemoc_studio.headless.feature.feature.group
}

maven MavenDependencies scope=compile,test dependencyDepth=infinite missingManifest=generate includeSources {
dependency {
groupId="org.eclipse.jetty.osgi"
artifactId="jetty-osgi-boot"
version="10.0.6"
}
dependency {
groupId="org.apache.aries.spifly"
artifactId="org.apache.aries.spifly.dynamic.bundle"
version="1.3.4"
}
dependency {
groupId="com.ibm.icu"
artifactId="icu4j"
version="70.1"
}
dependency {
groupId="javax.servlet"
artifactId="javax.servlet-api"
version="3.1.0"
}
dependency {
groupId="org.eclipse.jetty.websocket"
artifactId="websocket-javax-server"
version="10.0.6"
}
dependency {
groupId="org.eclipse.jetty.toolchain"
artifactId="jetty-javax-websocket-api"
version="1.1.2"
}
dependency {
groupId="org.mapstruct"
artifactId="mapstruct"
version="1.4.2.Final"
}
}



Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ location eclipse "https://download.eclipse.org/releases/2022-06" {
org.eclipse.acceleo.feature.group
org.eclipse.e4.rcp.feature.group
org.eclipse.ecf.filetransfer.feature.feature.group
org.eclipse.ecf.filetransfer.httpclient45.feature.feature.group
org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group
org.eclipse.ecf.filetransfer.ssl.feature.feature.group
org.eclipse.egit.feature.group
org.eclipse.emf.feature.group
Expand All @@ -36,6 +36,7 @@ location eclipse "https://download.eclipse.org/releases/2022-06" {
org.eclipse.lsp4j.sdk.feature.group
org.eclipse.m2e.feature.feature.group
org.eclipse.m2e.logback.feature.feature.group
org.eclipse.m2e.pde.feature.feature.group
org.eclipse.m2m.qvt.oml.feature.group
org.eclipse.m2m.qvt.oml.editor.feature.group
org.eclipse.m2m.qvt.oml.runtime.feature.group
Expand All @@ -56,11 +57,14 @@ location eclipse "https://download.eclipse.org/releases/2022-06" {
ch.qos.logback.classic
org.apache.commons.lang3
org.apache.xalan
org.eclipse.lsp4e
org.eclipse.lsp4e.debug
org.eclipse.lsp4e.jdt


}

location sirius "https://download.eclipse.org/sirius/updates/releases/6.5.1/2020-09/" {
location sirius "https://download.eclipse.org/sirius/updates/releases/7.0.1/2021-06/" {
org.eclipse.sirius.specifier.feature.group
org.eclipse.sirius.aql.feature.group
org.eclipse.sirius.runtime.feature.group
Expand All @@ -75,6 +79,10 @@ location sirius "https://download.eclipse.org/sirius/updates/releases/6.5.1/2020
org.eclipse.sirius.diagram.elk.feature.feature.group
}

location xtext "https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0/" {
org.eclipse.xtext.generator
}

/* required due to amalgam discovery */
location photon "http://download.eclipse.org/releases/photon" {
org.eclipse.amalgam.discovery.feature.group
Expand Down Expand Up @@ -126,7 +134,7 @@ location openjfx "https://downloads.efxclipse.bestsolution.at/p2-repos/openjfx-1
openjfx.web.feature.feature.group
}

location fxclipse "https://download.eclipse.org/efxclipse/updates-released/3.7.0/site" {
location fxclipse "https://download.eclipse.org/efxclipse/updates-released/3.8.0/site" {
org.eclipse.fx.ide.basic.feature.feature.group
org.eclipse.fx.ide.pde.feature.feature.group
org.eclipse.fx.runtime.min.feature.feature.group
Expand All @@ -136,4 +144,43 @@ location jetty "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4
org.eclipse.jetty.bundles.f.feature.group
}

maven MavenDependencies scope=compile,test dependencyDepth=infinite missingManifest=generate includeSources {
dependency {
groupId="org.eclipse.jetty.osgi"
artifactId="jetty-osgi-boot"
version="10.0.6"
}
dependency {
groupId="org.apache.aries.spifly"
artifactId="org.apache.aries.spifly.dynamic.bundle"
version="1.3.4"
}
dependency {
groupId="com.ibm.icu"
artifactId="icu4j"
version="70.1"
}
dependency {
groupId="javax.servlet"
artifactId="javax.servlet-api"
version="3.1.0"
}
dependency {
groupId="org.eclipse.jetty.websocket"
artifactId="websocket-javax-server"
version="10.0.6"
}
dependency {
groupId="org.eclipse.jetty.toolchain"
artifactId="jetty-javax-websocket-api"
version="1.1.2"
}
dependency {
groupId="org.mapstruct"
artifactId="mapstruct"
version="1.4.2.Final"
}
}



Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

#set -o xtrace

export ECLIPSE_PLATFORM_ARCHIVE=eclipse-platform-4.22-linux-gtk-x86_64.tar.gz
export ECLIPSE_PLATFORM_URL="https://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops4/R-4.22-202111241800/eclipse-platform-4.22-linux-gtk-x86_64.tar.gz&r=1"

export ECLIPSE_PLATFORM_ARCHIVE=eclipse-platform-4.24-linux-gtk-x86_64.tar.gz
export ECLIPSE_PLATFORM_URL="https://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops4/R-4.24-202206070700/eclipse-platform-4.24-linux-gtk-x86_64.tar.gz&r=1"

if [[ ! -d eclipse ]]
then
Expand All @@ -17,9 +16,10 @@ then

echo "Installing TPD tool in eclipse platform..."
./eclipse/eclipse -nosplash -application org.eclipse.equinox.p2.director \
-repository http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/,http://download.eclipse.org/releases/2022-06/ \
-repository https://download.eclipse.org/cbi/updates/tpd/nightly/,http://download.eclipse.org/releases/2022-06/ \
-destination ./eclipse/ \
-installIU org.eclipse.cbi.targetplatform-feature.feature.group
-installIU org.eclipse.cbi.targetplatform.feature.feature.group

else
echo "Eclipse platform already installed, skipping platform download"
fi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,10 @@
Individual components that are part of GEMOC and coming from https://github.com/eclipse/gemoc-studio-moccml/
</description>
</category-def>
<repository-reference location="http://www.kermeta.org/k3/update" enabled="true" />
<repository-reference location="http://www.kermeta.org/ale-lang/updates/latest" enabled="true" />
<repository-reference location="http://melange.inria.fr/updatesite/nightly/update" enabled="true" />
<repository-reference location="http://www.kermeta.org/diverse-commons/updates/latest" enabled="true" />
<repository-reference location="http://download.eclipse.org/elk/updates/releases/0.7.1/" enabled="true" />
<repository-reference location="http://download.eclipse.org/tools/ajdt/410/dev/update" enabled="true" />
<repository-reference location="https://www.kermeta.org/k3/update" enabled="true" />
<repository-reference location="https://www.kermeta.org/ale-lang/updates/latest" enabled="true" />
<repository-reference location="https://melange.inria.fr/updatesite/nightly/update" enabled="true" />
<repository-reference location="https://www.kermeta.org/diverse-commons/updates/latest" enabled="true" />
<repository-reference location="https://download.eclipse.org/elk/updates/releases/0.7.1/" enabled="true" />
<repository-reference location="https://download.eclipse.org/tools/ajdt/410/dev/update" enabled="true" />
</site>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="Gemoc Studio" uid="gemoc_studio" id="org.eclipse.gemoc.gemoc_studio.branding.gemoc_studio" application="org.eclipse.ui.ide.workbench" version="3.6.1.qualifier" useFeatures="true" includeLaunchers="true">
<product name="Gemoc Studio" uid="gemoc_studio" id="org.eclipse.gemoc.gemoc_studio.branding.gemoc_studio" application="org.eclipse.ui.ide.workbench" version="3.6.1.qualifier" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true">

<aboutInfo>
<image path="/org.eclipse.gemoc.gemoc_studio.branding/images/GemocStudioAboutImage.png"/>
Expand Down Expand Up @@ -78,16 +78,17 @@ openFile
</configurations>

<repositories>
<repository location="http://melange-lang.org/updatesite/" enabled="true" />
<repository location="http://download.eclipse.org/releases/2022-06" enabled="true" />
<repository location="http://download.eclipse.org/eclipse/updates/4.22/" enabled="true" />
<repository location="http://www.kermeta.org/k3/update/" enabled="true" />
<repository location="http://www.kermeta.org/ale-lang/updates/latest/" enabled="true" />
<repository location="https://melange-lang.org/updatesite/" enabled="true" />
<repository location="https://download.eclipse.org/releases/2022-06" enabled="true" />
<repository location="https://download.eclipse.org/eclipse/updates/4.22/" enabled="true" />
<repository location="https://www.kermeta.org/k3/update/" enabled="true" />
<repository location="https://www.kermeta.org/ale-lang/updates/latest/" enabled="true" />
<repository location="http://timesquare.inria.fr/update_site/2020" enabled="true" />
<repository location="http://download.eclipse.org/gemoc/updates/nightly/" enabled="true" />
<repository location="http://download.eclipse.org/elk/updates/releases/0.7.1" enabled="false" />
<repository location="http://download.eclipse.org/tools/ajdt/410/dev/update" enabled="true" />
<repository location="http://downloads.efxclipse.bestsolution.at/p2-repos/openjfx-11/repository/" enabled="true" />
<repository location="https://download.eclipse.org/gemoc/updates/nightly/" enabled="true" />
<repository location="https://download.eclipse.org/elk/updates/releases/0.7.1" enabled="false" />
<repository location="https://download.eclipse.org/tools/ajdt/410/dev/update" enabled="true" />
<repository location="https://downloads.efxclipse.bestsolution.at/p2-repos/openjfx-11/repository/" enabled="true" />
<repository location="https://download.eclipse.org/cbi/updates/tpd/" enabled="true" />
</repositories>

<preferencesInfo>
Expand Down

0 comments on commit f062a38

Please sign in to comment.