Skip to content

Commit

Permalink
Enable building installers for linux riscv64
Browse files Browse the repository at this point in the history
  • Loading branch information
merks committed Oct 1, 2024
1 parent fbe6bb3 commit 66b75cb
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 30 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@ private static List<OS> createAll()
result.add(new Mac(Platform.WS_COCOA, Platform.ARCH_AARCH64));
result.add(new Linux(Platform.WS_GTK, Platform.ARCH_X86_64));
result.add(new Linux(Platform.WS_GTK, Platform.ARCH_AARCH64));
result.add(new Linux(Platform.WS_GTK, "riscv64"));

return Collections.unmodifiableList(result);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@ for i in $(ls); do
else
cp $i ../repackaged-products/eclipse-inst$restricted-mac64.tar.gz
fi
elif [[ $i == *linux*riscv64* ]]; then
if [[ $i == *with-jre* ]]; then
cp $i ../repackaged-products/eclipse-inst-jre$restricted-linux-riscv64.tar.gz
else
cp $i ../repackaged-products/eclipse-inst$restricted-linux-riscv64.tar.gz
fi
elif [[ $i == *linux*aarch64* ]]; then
if [[ $i == *with-jre* ]]; then
cp $i ../repackaged-products/eclipse-inst-jre$restricted-linux-aarch64.tar.gz
Expand Down
5 changes: 5 additions & 0 deletions releng/org.eclipse.oomph.parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,11 @@ Eike Stepper - initial API and implementation
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>riscv64</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="Generated from Oomph" sequenceNumber="148">
<target name="Generated from Oomph" sequenceNumber="149">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.apache.commons.collections" version="3.2.2"/>
Expand All @@ -27,7 +27,7 @@
<repository location="https://download.eclipse.org/technology/m2e/snapshots/latest"/>
<repository location="https://download.eclipse.org/technology/swtbot/releases/4.1.0"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/nightly/latest"/>
<repository location="https://download.eclipse.org/justj/jres/17/updates/milestone/latest"/>
<repository location="https://download.eclipse.org/justj/jres/17/updates/nightly/latest"/>
<repository location="https://download.eclipse.org/usssdk/updates/latest"/>
<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.35.0/R-3.35.0-20240825085431/repository"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.34-I-builds"/>
Expand Down
2 changes: 1 addition & 1 deletion releng/org.eclipse.oomph.releng/hudson/product-index.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ for i in $named_releases $numbered_releases; do
cd $root/$i/$j
#echo $i/$j
#ls eclipse-inst*
for b in 32 64 aarch64; do
for b in 32 64 aarch64 riscv64; do
for os in win mac linux; do
for jre in "true" "false"; do
if [ "$jre" == "false" ]; then
Expand Down
2 changes: 1 addition & 1 deletion setups/org.eclipse.all.product.setup
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
label="Eclipse Eierlegende Wollmilchsau (Staging)">
<requirement
name="org.eclipse.platform.ide"
versionRange="[4.33.0,5.0.0)"
versionRange="[4.34.0,5.0.0)"
filter="(|(&amp;(osgi.arch=aarch64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=aarch64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=win32)(osgi.ws=win32)))"/>
<requirement
name="Application Development Frameworks"/>
Expand Down
4 changes: 2 additions & 2 deletions setups/org.eclipse.platform.sdk.product.setup
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<requirement
name="org.eclipse.sdk.ide"
versionRange="[4.34.0,5.0.0)"
filter="(|(&amp;(osgi.arch=aarch64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=aarch64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=aarch64)(osgi.os=win32)(osgi.ws=win32))(&amp;(osgi.arch=ppc64le)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=x86_64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=win32)(osgi.ws=win32)))"/>
filter="(|(&amp;(osgi.arch=aarch64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=aarch64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=aarch64)(osgi.os=win32)(osgi.ws=win32))(&amp;(osgi.arch=ppc64le)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=riscv64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=x86_64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=win32)(osgi.ws=win32)))"/>
<repository
url="https://download.eclipse.org/eclipse/updates/4.34-I-builds"/>
<repository
Expand Down Expand Up @@ -123,7 +123,7 @@
<requirement
name="org.eclipse.sdk.ide"
versionRange="[4.34.0,5.0.0)"
filter="(|(&amp;(osgi.arch=aarch64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=aarch64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=aarch64)(osgi.os=win32)(osgi.ws=win32))(&amp;(osgi.arch=ppc64le)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=x86_64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=win32)(osgi.ws=win32)))"/>
filter="(|(&amp;(osgi.arch=aarch64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=aarch64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=aarch64)(osgi.os=win32)(osgi.ws=win32))(&amp;(osgi.arch=ppc64le)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=riscv64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=x86_64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=win32)(osgi.ws=win32)))"/>
<repository
url="https://download.eclipse.org/eclipse/updates/4.34-I-builds"/>
<repository
Expand Down
48 changes: 24 additions & 24 deletions setups/org.eclipse.products.setup
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@
filter="(|(&amp;(osgi.arch=aarch64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=aarch64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=win32)(osgi.ws=win32)))"/>
<requirement
name="org.eclipse.platform.feature.group"
versionRange="[4.33.0,5.0.0)"/>
versionRange="[4.34.0,5.0.0)"/>
<requirement
name="org.eclipse.rcp.feature.group"
versionRange="[4.33.0,5.0.0)"/>
versionRange="[4.34.0,5.0.0)"/>
<requirement
name="org.eclipse.buildship.feature.group"/>
<requirement
Expand Down Expand Up @@ -2801,10 +2801,10 @@
filter="(|(&amp;(osgi.arch=aarch64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=aarch64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=win32)(osgi.ws=win32)))"/>
<requirement
name="org.eclipse.platform.feature.group"
versionRange="[4.33.0,5.0.0)"/>
versionRange="[4.34.0,5.0.0)"/>
<requirement
name="org.eclipse.rcp.feature.group"
versionRange="[4.33.0,5.0.0)"/>
versionRange="[4.34.0,5.0.0)"/>
<requirement
name="org.eclipse.buildship.feature.group"/>
<requirement
Expand Down Expand Up @@ -9700,10 +9700,10 @@
filter="(|(&amp;(osgi.arch=aarch64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=aarch64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=win32)(osgi.ws=win32)))"/>
<requirement
name="org.eclipse.platform.feature.group"
versionRange="[4.33.0,5.0.0)"/>
versionRange="[4.34.0,5.0.0)"/>
<requirement
name="org.eclipse.rcp.feature.group"
versionRange="[4.33.0,5.0.0)"/>
versionRange="[4.34.0,5.0.0)"/>
<requirement
name="org.eclipse.cdt.autotools.feature.group"/>
<requirement
Expand Down Expand Up @@ -13486,10 +13486,10 @@
filter="(|(&amp;(osgi.arch=aarch64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=aarch64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=win32)(osgi.ws=win32)))"/>
<requirement
name="org.eclipse.platform.feature.group"
versionRange="[4.33.0,5.0.0)"/>
versionRange="[4.34.0,5.0.0)"/>
<requirement
name="org.eclipse.rcp.feature.group"
versionRange="[4.33.0,5.0.0)"/>
versionRange="[4.34.0,5.0.0)"/>
<requirement
name="org.eclipse.cdt.autotools.feature.group"/>
<requirement
Expand Down Expand Up @@ -16407,10 +16407,10 @@
filter="(|(&amp;(osgi.arch=aarch64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=aarch64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=win32)(osgi.ws=win32)))"/>
<requirement
name="org.eclipse.platform.feature.group"
versionRange="[4.33.0,5.0.0)"/>
versionRange="[4.34.0,5.0.0)"/>
<requirement
name="org.eclipse.rcp.feature.group"
versionRange="[4.33.0,5.0.0)"/>
versionRange="[4.34.0,5.0.0)"/>
<requirement
name="org.eclipse.egit.feature.group"/>
<requirement
Expand Down Expand Up @@ -19095,10 +19095,10 @@
filter="(|(&amp;(osgi.arch=aarch64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=aarch64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=win32)(osgi.ws=win32)))"/>
<requirement
name="org.eclipse.platform.feature.group"
versionRange="[4.33.0,5.0.0)"/>
versionRange="[4.34.0,5.0.0)"/>
<requirement
name="org.eclipse.rcp.feature.group"
versionRange="[4.33.0,5.0.0)"/>
versionRange="[4.34.0,5.0.0)"/>
<requirement
name="org.eclipse.buildship.feature.group"/>
<requirement
Expand Down Expand Up @@ -22730,10 +22730,10 @@
filter="(|(&amp;(osgi.arch=aarch64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=aarch64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=win32)(osgi.ws=win32)))"/>
<requirement
name="org.eclipse.platform.feature.group"
versionRange="[4.33.0,5.0.0)"/>
versionRange="[4.34.0,5.0.0)"/>
<requirement
name="org.eclipse.rcp.feature.group"
versionRange="[4.33.0,5.0.0)"/>
versionRange="[4.34.0,5.0.0)"/>
<requirement
name="org.eclipse.buildship.feature.group"/>
<requirement
Expand Down Expand Up @@ -25005,13 +25005,13 @@
filter="(|(&amp;(osgi.arch=aarch64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=aarch64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=win32)(osgi.ws=win32)))"/>
<requirement
name="org.eclipse.platform.feature.group"
versionRange="[4.33.0,5.0.0)"/>
versionRange="[4.34.0,5.0.0)"/>
<requirement
name="org.eclipse.rcp.feature.group"
versionRange="[4.33.0,5.0.0)"/>
versionRange="[4.34.0,5.0.0)"/>
<requirement
name="org.eclipse.jdt.feature.group"
versionRange="[3.19.0,4.0.0)"/>
versionRange="[3.20.0,4.0.0)"/>
<requirement
name="org.eclipse.pde.feature.group"
versionRange="[3.16.0,4.0.0)"/>
Expand Down Expand Up @@ -28313,10 +28313,10 @@
filter="(|(&amp;(osgi.arch=aarch64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=aarch64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=win32)(osgi.ws=win32)))"/>
<requirement
name="org.eclipse.platform.feature.group"
versionRange="[4.33.0,5.0.0)"/>
versionRange="[4.34.0,5.0.0)"/>
<requirement
name="org.eclipse.rcp.feature.group"
versionRange="[4.33.0,5.0.0)"/>
versionRange="[4.34.0,5.0.0)"/>
<requirement
name="org.eclipse.e4.core.tools.feature.feature.group"/>
<requirement
Expand Down Expand Up @@ -31956,10 +31956,10 @@
filter="(|(&amp;(osgi.arch=aarch64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=aarch64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=win32)(osgi.ws=win32)))"/>
<requirement
name="org.eclipse.platform.feature.group"
versionRange="[4.33.0,5.0.0)"/>
versionRange="[4.34.0,5.0.0)"/>
<requirement
name="org.eclipse.rcp.feature.group"
versionRange="[4.33.0,5.0.0)"/>
versionRange="[4.34.0,5.0.0)"/>
<requirement
name="org.eclipse.egit.feature.group"/>
<requirement
Expand Down Expand Up @@ -34671,14 +34671,14 @@
label="Eclipse Platform (Staging)">
<requirement
name="org.eclipse.platform.ide"
versionRange="[4.33.0,5.0.0)"
versionRange="[4.34.0,5.0.0)"
filter="(|(&amp;(osgi.arch=aarch64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=aarch64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=win32)(osgi.ws=win32)))"/>
<requirement
name="org.eclipse.platform.feature.group"
versionRange="[4.33.0,5.0.0)"/>
versionRange="[4.34.0,5.0.0)"/>
<requirement
name="org.eclipse.rcp.feature.group"
versionRange="[4.33.0,5.0.0)"/>
versionRange="[4.34.0,5.0.0)"/>
<repository
url="https://download.eclipse.org/staging/2024-12">
<annotation
Expand Down

0 comments on commit 66b75cb

Please sign in to comment.