From 6352dc2f0e5a5feecb6e3f486d58190d8c0c3f8b Mon Sep 17 00:00:00 2001
From: Branislav Stojkovic <bancika@gmail.com>
Date: Fri, 21 Mar 2025 11:55:51 +0100
Subject: [PATCH] build linux

---
 diylc/diylc-swing/pom.xml | 139 ++++++++++++++++++++++++++------------
 1 file changed, 96 insertions(+), 43 deletions(-)

diff --git a/diylc/diylc-swing/pom.xml b/diylc/diylc-swing/pom.xml
index 95c2456b..e88370e3 100644
--- a/diylc/diylc-swing/pom.xml
+++ b/diylc/diylc-swing/pom.xml
@@ -260,47 +260,6 @@
                             </target>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>sign-jar-launcher</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <!-- Extract JavaAppLauncher -->
-                                <unzip src="${project.build.directory}/diylc.jar" dest="${project.build.directory}/jar-contents">
-                                    <patternset>
-                                        <include name="com/oracle/appbundler/JavaAppLauncher"/>
-                                    </patternset>
-                                </unzip>
-                                
-                                <!-- Make it executable -->
-                                <chmod file="${project.build.directory}/jar-contents/com/oracle/appbundler/JavaAppLauncher" perm="755"/>
-                                
-                                <!-- Sign the launcher -->
-                                <exec executable="codesign" failonerror="true">
-                                    <arg value="--force"/>
-                                    <arg value="--sign"/>
-                                    <arg value="${env.APPLE_DEVELOPER_IDENTITY}"/>
-                                    <arg value="--timestamp"/>
-                                    <arg value="--options"/>
-                                    <arg value="runtime"/>
-                                    <arg value="--entitlements"/>
-                                    <arg value="${project.basedir}/deploy/mac/entitlements.plist"/>
-                                    <arg value="--all-architectures"/>
-                                    <arg value="--strict"/>
-                                    <arg value="--verbose"/>
-                                    <arg value="${project.build.directory}/jar-contents/com/oracle/appbundler/JavaAppLauncher"/>
-                                </exec>
-                                
-                                <!-- Update the jar with signed launcher -->
-                                <jar destfile="${project.build.directory}/diylc.jar" update="true">
-                                    <fileset dir="${project.build.directory}/jar-contents"/>
-                                </jar>
-                            </target>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
         </plugins>
@@ -539,9 +498,17 @@
                                             <fileset dir="${appdir.dir}" />
                                         </copy>
                                         
-                                        <!-- Run AppImageTool in Docker -->
+                                        <!-- Ensure proper permissions in Docker volume -->
+                                        <exec executable="chmod" failonerror="true" osfamily="mac">
+                                            <arg line="-R 755 ${project.build.directory}/docker-tmp/AppDir/AppRun" />
+                                        </exec>
+                                        <exec executable="chmod" failonerror="true" osfamily="mac">
+                                            <arg line="-R 755 ${project.build.directory}/docker-tmp/AppDir/usr/bin/diylc.sh" />
+                                        </exec>
+                                        
+                                        <!-- Run AppImageTool in Docker with proper volume mounting -->
                                         <exec executable="docker" failonerror="true" osfamily="mac">
-                                            <arg line="run --rm -v &quot;${project.build.directory}/docker-tmp:/workspace&quot; -w /workspace appimagecrafters/appimage-builder:latest /bin/bash -c &quot;ARCH=x86_64 appimagetool AppDir ${appimage.output.file}&quot;" />
+                                            <arg line="run --rm -v &quot;${project.build.directory}/docker-tmp:/workspace&quot; -w /workspace appimagecrafters/appimage-builder:latest /bin/bash -c &quot;chmod +x AppDir/AppRun AppDir/usr/bin/diylc.sh &amp;&amp; ARCH=x86_64 appimagetool AppDir ${appimage.output.file}&quot;" />
                                         </exec>
                                         
                                         <!-- Copy the AppImage to the build directory -->
@@ -703,6 +670,49 @@
                                 </configuration>
                             </execution>
                             
+                            <!-- Sign JAR launcher -->
+                            <execution>
+                                <id>sign-jar-launcher</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <target>
+                                        <!-- Extract JavaAppLauncher -->
+                                        <unzip src="${project.build.directory}/diylc.jar" dest="${project.build.directory}/jar-contents">
+                                            <patternset>
+                                                <include name="com/oracle/appbundler/JavaAppLauncher"/>
+                                            </patternset>
+                                        </unzip>
+                                        
+                                        <!-- Make it executable -->
+                                        <chmod file="${project.build.directory}/jar-contents/com/oracle/appbundler/JavaAppLauncher" perm="755"/>
+                                        
+                                        <!-- Sign the launcher -->
+                                        <exec executable="codesign" failonerror="true">
+                                            <arg value="--force"/>
+                                            <arg value="--sign"/>
+                                            <arg value="${env.APPLE_DEVELOPER_IDENTITY}"/>
+                                            <arg value="--timestamp"/>
+                                            <arg value="--options"/>
+                                            <arg value="runtime"/>
+                                            <arg value="--entitlements"/>
+                                            <arg value="${project.basedir}/deploy/mac/entitlements.plist"/>
+                                            <arg value="--all-architectures"/>
+                                            <arg value="--strict"/>
+                                            <arg value="--verbose"/>
+                                            <arg value="${project.build.directory}/jar-contents/com/oracle/appbundler/JavaAppLauncher"/>
+                                        </exec>
+                                        
+                                        <!-- Update the jar with signed launcher -->
+                                        <jar destfile="${project.build.directory}/diylc.jar" update="true">
+                                            <fileset dir="${project.build.directory}/jar-contents"/>
+                                        </jar>
+                                    </target>
+                                </configuration>
+                            </execution>
+                            
                             <!-- Create macOS app bundle -->
                             <execution>
                                 <id>create-mac-bundle</id>
@@ -973,6 +983,49 @@
                                 </configuration>
                             </execution>
                             
+                            <!-- Sign JAR launcher -->
+                            <execution>
+                                <id>sign-jar-launcher</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <target>
+                                        <!-- Extract JavaAppLauncher -->
+                                        <unzip src="${project.build.directory}/diylc.jar" dest="${project.build.directory}/jar-contents">
+                                            <patternset>
+                                                <include name="com/oracle/appbundler/JavaAppLauncher"/>
+                                            </patternset>
+                                        </unzip>
+                                        
+                                        <!-- Make it executable -->
+                                        <chmod file="${project.build.directory}/jar-contents/com/oracle/appbundler/JavaAppLauncher" perm="755"/>
+                                        
+                                        <!-- Sign the launcher -->
+                                        <exec executable="codesign" failonerror="true">
+                                            <arg value="--force"/>
+                                            <arg value="--sign"/>
+                                            <arg value="${env.APPLE_DEVELOPER_IDENTITY}"/>
+                                            <arg value="--timestamp"/>
+                                            <arg value="--options"/>
+                                            <arg value="runtime"/>
+                                            <arg value="--entitlements"/>
+                                            <arg value="${project.basedir}/deploy/mac/entitlements.plist"/>
+                                            <arg value="--all-architectures"/>
+                                            <arg value="--strict"/>
+                                            <arg value="--verbose"/>
+                                            <arg value="${project.build.directory}/jar-contents/com/oracle/appbundler/JavaAppLauncher"/>
+                                        </exec>
+                                        
+                                        <!-- Update the jar with signed launcher -->
+                                        <jar destfile="${project.build.directory}/diylc.jar" update="true">
+                                            <fileset dir="${project.build.directory}/jar-contents"/>
+                                        </jar>
+                                    </target>
+                                </configuration>
+                            </execution>
+                            
                             <!-- Create macOS app bundle -->
                             <execution>
                                 <id>create-mac-bundle</id>