Skip to content

Commit 1f8fcff

Browse files
committed
releng: Bundle java runtime in Trace Compass RCP product packages
Update target files to include JustJ JREs https://eclipse.dev/justj/ with respective version for that release. Use latest available JRE version for respective major version. This will make it easier for end-users to use Trace Compass because Java doesn't need to be installed separately and it will include the correct, required version. Notes: - The stripped version of the JRE is used with debug information stripped and excluding the src.jar with sources used only for debugging. This minimizes the size of the JRE package because it's less than 1/2 the size of the corresponding full version. If you'd like to debug the RCP (e.g. using remote debugging), use a separated JVM as described below. - To run the RCP with a different JVM (e.g. installed on user's laptop), open the tracecompass.ini file and modify the path settings for -vm. Or remove it completely then the default JRE of the computer is used. Signed-off-by: Bernd Hufmann <[email protected]>
1 parent 1063217 commit 1f8fcff

19 files changed

+89
-20
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@
395395
<groupId>org.eclipse.tycho</groupId>
396396
<artifactId>target-platform-configuration</artifactId>
397397
<configuration>
398-
<executionEnvironment>JavaSE-${jdk.version}</executionEnvironment>
398+
<executionEnvironment>org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped-${jdk.version}</executionEnvironment>
399399
<environments>
400400
<environment>
401401
<os>win32</os>

rcp/org.eclipse.tracecompass.rcp.product/tracing.product

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?pde version="3.5"?>
33

4-
<product name="Trace Compass" uid="org.eclipse.tracecompass.rcp" id="org.eclipse.tracecompass.rcp.branding.product" application="org.eclipse.tracecompass.rcp.ui.application" version="10.2.0.qualifier" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true">
4+
<product name="Trace Compass" uid="org.eclipse.tracecompass.rcp" id="org.eclipse.tracecompass.rcp.branding.product" application="org.eclipse.tracecompass.rcp.ui.application" version="10.2.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
55

66
<aboutInfo>
77
<image path="/org.eclipse.tracecompass.rcp.branding/icons/tc_about.png"/>
@@ -145,6 +145,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
145145
<feature id="org.eclipse.ecf.filetransfer.httpclientjava.feature"/>
146146
<feature id="org.eclipse.tracecompass.tmf.cli"/>
147147
<feature id="org.eclipse.equinox.executable"/>
148+
<feature id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped" installMode="root"/>
148149
</features>
149150

150151
<configurations>
@@ -159,7 +160,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
159160
</configurations>
160161

161162
<repositories>
162-
<repository location="https://download.eclipse.org/tracecompass/master/rcp-repository" enabled="true" />
163+
<repository location="https://download.eclipse.org/tracecompass/master/rcp-repository" name="" enabled="true" />
163164
</repositories>
164165

165166
<preferencesInfo>

releng/org.eclipse.tracecompass.target/tracecompass-e4.20.target

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.20" sequenceNumber="17">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.20" sequenceNumber="18">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
4+
<repository location="https://download.eclipse.org/justj/jres/11/updates/release/11.0.26/"/>
5+
<unit id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped.feature.group" version="0.0.0"/>
6+
</location>
7+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
48
<unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
59
<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
610
<repository location="https://archive.eclipse.org/tools/cdt/releases/10.3/cdt-10.3.0/"/>

releng/org.eclipse.tracecompass.target/tracecompass-e4.21.target

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.21" sequenceNumber="19">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.21" sequenceNumber="20">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
4+
<repository location="https://download.eclipse.org/justj/jres/11/updates/release/11.0.26/"/>
5+
<unit id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped.feature.group" version="0.0.0"/>
6+
</location>
7+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
48
<unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
59
<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
610
<repository location="https://archive.eclipse.org/tools/cdt/releases/10.4/cdt-10.4.1/"/>

releng/org.eclipse.tracecompass.target/tracecompass-e4.22.target

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.22" sequenceNumber="19">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.22" sequenceNumber="20">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
4+
<repository location="https://download.eclipse.org/justj/jres/11/updates/release/11.0.26/"/>
5+
<unit id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped.feature.group" version="0.0.0"/>
6+
</location>
7+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
48
<unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
59
<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
610
<repository location="https://archive.eclipse.org/tools/cdt/releases/10.5/cdt-10.5.0/"/>

releng/org.eclipse.tracecompass.target/tracecompass-e4.23.target

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.23" sequenceNumber="17">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.23" sequenceNumber="18">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
4+
<repository location="https://download.eclipse.org/justj/jres/11/updates/release/11.0.26/"/>
5+
<unit id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped.feature.group" version="0.0.0"/>
6+
</location>
7+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
48
<unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
59
<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
610
<repository location="https://archive.eclipse.org/tools/cdt/releases/10.6/cdt-10.6.0/"/>

releng/org.eclipse.tracecompass.target/tracecompass-e4.24.target

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.24" sequenceNumber="17">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.24" sequenceNumber="18">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
4+
<repository location="https://download.eclipse.org/justj/jres/11/updates/release/11.0.26/"/>
5+
<unit id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped.feature.group" version="0.0.0"/>
6+
</location>
7+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
48
<unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
59
<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
610
<unit id="org.eclipse.remote.core" version="0.0.0"/>

releng/org.eclipse.tracecompass.target/tracecompass-e4.25.target

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.25" sequenceNumber="16">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.25" sequenceNumber="17">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
4+
<repository location="https://download.eclipse.org/justj/jres/11/updates/release/11.0.26/"/>
5+
<unit id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped.feature.group" version="0.0.0"/>
6+
</location>
7+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
48
<unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
59
<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
610
<unit id="org.eclipse.remote.core" version="0.0.0"/>

releng/org.eclipse.tracecompass.target/tracecompass-e4.26.target

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.26" sequenceNumber="11">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.26" sequenceNumber="12">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
4+
<repository location="https://download.eclipse.org/justj/jres/17/updates/release/17.0.14/"/>
5+
<unit id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped.feature.group" version="0.0.0"/>
6+
</location>
7+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
48
<unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
59
<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
610
<unit id="org.eclipse.remote.core" version="0.0.0"/>

releng/org.eclipse.tracecompass.target/tracecompass-e4.27.target

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.27" sequenceNumber="9">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.27" sequenceNumber="10">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
4+
<repository location="https://download.eclipse.org/justj/jres/17/updates/release/17.0.14/"/>
5+
<unit id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped.feature.group" version="0.0.0"/>
6+
</location>
7+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
48
<unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
59
<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
610
<unit id="org.eclipse.remote.core" version="0.0.0"/>

0 commit comments

Comments
 (0)