Skip to content

Commit

Permalink
JBR-8347 Download gtk-shell.xml if absent
Browse files Browse the repository at this point in the history
Added downloading code
  • Loading branch information
avu committed Feb 28, 2025
1 parent 22b0648 commit d2c10f5
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 2 deletions.
14 changes: 13 additions & 1 deletion jb/project/tools/linux/scripts/mkimages_aarch64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,18 @@ source jb/project/tools/common/scripts/common.sh
JCEF_PATH=${JCEF_PATH:=./jcef_linux_aarch64}

function do_configure {

GTK_SHELL_PATH=/gtk-shell.xml

if [ ! -e $GTK_SHELL_PATH ]; then
echo $GTK_SHELL_PATH" does not exist"
GTK_SHELL_PATH=`pwd`/gtk-shell.xml
if [ ! -e $GTK_SHELL_PATH ]; then
echo $GTK_SHELL_PATH" does not exist"
curl -O https://raw.githubusercontent.com/GNOME/gtk/refs/heads/main/gdk/wayland/protocol/gtk-shell.xml
fi
fi

sh configure \
$WITH_DEBUG_LEVEL \
--with-vendor-name="$VENDOR_NAME" \
Expand All @@ -35,7 +47,7 @@ function do_configure {
--with-version-opt=b"$build_number" \
--with-boot-jdk="$BOOT_JDK" \
--enable-cds=yes \
--with-gtk-shell1-protocol=/gtk-shell.xml \
--with-gtk-shell1-protocol=$GTK_SHELL_PATH \
--with-vulkan \
$DISABLE_WARNINGS_AS_ERRORS \
$STATIC_CONF_ARGS \
Expand Down
15 changes: 14 additions & 1 deletion jb/project/tools/linux/scripts/mkimages_x64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,19 @@ function do_configure {
--build=x86_64-unknown-linux-gnu \
--openjdk-target=x86_64-unknown-linux-gnu"
fi

GTK_SHELL_PATH=/gtk-shell.xml

if [ ! -e $GTK_SHELL_PATH ]; then
echo $GTK_SHELL_PATH" does not exist"
GTK_SHELL_PATH=`pwd`/gtk-shell.xml
if [ ! -e $GTK_SHELL_PATH ]; then
echo $GTK_SHELL_PATH" does not exist"
curl -O https://raw.githubusercontent.com/GNOME/gtk/refs/heads/main/gdk/wayland/protocol/gtk-shell.xml
fi
fi


sh configure \
$WITH_DEBUG_LEVEL \
--with-vendor-name="$VENDOR_NAME" \
Expand All @@ -42,7 +55,7 @@ function do_configure {
--with-version-opt=b"$build_number" \
--with-boot-jdk="$BOOT_JDK" \
--enable-cds=yes \
--with-gtk-shell1-protocol=/gtk-shell.xml \
--with-gtk-shell1-protocol=$GTK_SHELL_PATH \
--with-vulkan \
$LINUX_TARGET \
$DISABLE_WARNINGS_AS_ERRORS \
Expand Down

0 comments on commit d2c10f5

Please sign in to comment.