From 76b3805c0035ecee577044ab99a259b626a92092 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Wed, 10 Apr 2024 20:13:36 +0200
Subject: [PATCH] [Build] Set file-permissions for launcher libraries before
 SCM check-in

Instead of setting the file permissions of the launcher library files
when assembling the jars in each Maven build, check-in the libraries
into SCM with the desired permissions already set.
---
 Jenkinsfile                                   |  3 +++
 .../build.properties                          |  2 +-
 launcher-binary-parent/pom.xml                | 26 +------------------
 3 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b8f3e049e3b..db8a60cc296 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -261,6 +261,9 @@ pipeline {
 											echo 'Copy new binaries'
 											mv eclipse${exeFileExt} ${binPath}
 											mv eclipse_*.${libFileExt} ${libPath}
+											
+											echo 'Set file permissions for launcher library'
+											chmod 755 ${libPath}/eclipse_*.${libFileExt}
 										'''
 									}
 								}
diff --git a/features/org.eclipse.equinox.executable.feature/build.properties b/features/org.eclipse.equinox.executable.feature/build.properties
index 2ab3c26d5fd..1351213e45a 100644
--- a/features/org.eclipse.equinox.executable.feature/build.properties
+++ b/features/org.eclipse.equinox.executable.feature/build.properties
@@ -37,4 +37,4 @@ root.macosx.cocoa.aarch64=bin/cocoa/macosx/aarch64
 root.macosx.cocoa.aarch64.permissions.755=Eclipse.app/Contents/MacOS/launcher
 
 root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
-root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
+root.linux.gtk.x86_64.permissions.755=launcher
diff --git a/launcher-binary-parent/pom.xml b/launcher-binary-parent/pom.xml
index 3a619187bc3..d60fb11d290 100644
--- a/launcher-binary-parent/pom.xml
+++ b/launcher-binary-parent/pom.xml
@@ -36,37 +36,13 @@
           </environments>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-launcher-natives</id>
-            <phase>process-resources</phase>
-            <configuration>
-              <property name="feature.base" value="."/>
-              <target>
-                <copy todir="${project.build.directory}" overwrite="true">
-                  <fileset dir="${rt.equinox.binaries.loc}/${project.artifactId}">
-                    <include name="*.so"/>
-                    <include name="*.dll"/>
-                  </fileset>
-                </copy>
-                <chmod file="${project.build.directory}/*.so" perm="755" verbose="true"/>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-packaging-plugin</artifactId>
         <configuration>
           <additionalFileSets>
             <fileSet>
-              <directory>${project.build.directory}</directory>
+              <directory>${rt.equinox.binaries.loc}/${project.artifactId}</directory>
               <includes>
                 <include>*.so</include>
                 <include>*.dll</include>