Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build GTK 4 binaries #1422

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def runOnNativeBuildAgent(String platform, Closure body) {
def final nativeBuildStageName = 'Build SWT-native binaries'
if (platform == 'gtk.linux.x86_64') {
podTemplate(inheritFrom: 'centos-latest' /* inhert general configuration */, containers: [
containerTemplate(name: 'swtbuild', image: 'eclipse/platformreleng-centos-swt-build:8',
containerTemplate(name: 'swtbuild', image: 'eclipse/platformreleng-debian-swtnativebuild:12',
resourceRequestCpu:'1000m', resourceRequestMemory:'512Mi',
resourceLimitCpu:'2000m', resourceLimitMemory:'4096Mi',
alwaysPullImage: true, command: 'cat', ttyEnabled: true)
Expand Down Expand Up @@ -228,7 +228,15 @@ pipeline {
if (isUnix()){
sh '''
mkdir libs
sh build.sh install
if [[ ${PLATFORM} == gtk.linux.aarch64 ]]; then
sh build.sh -gtk3 install
elif [[ ${PLATFORM} == gtk.linux.ppc64le ]]; then
sh build.sh -gtk3 install
elif [[ ${PLATFORM} == gtk.linux.riscv64 ]]; then
sh build.sh -gtk3 install
else
sh build.sh install
fi
ls -1R libs
'''
} else {
Expand Down
2 changes: 0 additions & 2 deletions binaries/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,10 @@
</exec>
</then>
<else>
<property name="gtk_version" value="3.0" />
<exec dir="${build_dir}" executable="sh" failonerror="true">
<arg line="build.sh"/>
<env key="SWT_JAVA_HOME" value="${SWT_JAVA_HOME}"/>
<env key="OUTPUT_DIR" value="${project.basedir}"/>
<env key="GTK_VERSION" value="${gtk_version}"/>
<env key="MODEL" value="${arch}"/>
<arg line="install clean"/>
</exec>
Expand Down
23 changes: 13 additions & 10 deletions bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -280,22 +280,25 @@ func_build_gtk3 () {
fi
}

if [ "$1" = "-gtk-all" ]; then
shift
func_echo_plus "Note: When building multiple GTK versions, a cleanup is required (and automatically performed) between them."
func_clean_up
func_build_gtk4 "$@"
func_clean_up
func_build_gtk3 "$@"
elif [ "$1" = "-gtk4" ]; then
if [ "$1" = "-gtk4" ]; then
shift
func_build_gtk4 "$@"
elif [ "$1" = "-gtk3" ]; then
shift
func_build_gtk3 "$@"
elif [ "${GTK_VERSION}" = "4.0" ]; then
func_build_gtk4 "$@"
elif [ "${GTK_VERSION}" = "3.0" -o "${GTK_VERSION}" = "" ]; then
export GTK_VERSION="3.0"
elif [ "${GTK_VERSION}" = "3.0" ]; then
func_build_gtk3 "$@"
else
if [ "$1" = "-gtk-all" ]; then
shift
fi
func_echo_plus "==== Building GTK3 + GTK 4 ===="
func_echo_plus "Note: When building multiple GTK versions, a cleanup is required (and automatically performed) between them."
func_clean_up
func_build_gtk4 "$@"
func_echo_plus "Note: When building multiple GTK versions, a cleanup is required (and automatically performed) between them."
func_clean_up
func_build_gtk3 "$@"
fi
Loading