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 1/5] 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>

From aeea503d7eafd5cdf30e7c0ac88d5eb7b701011e Mon Sep 17 00:00:00 2001
From: Branislav Stojkovic <bancika@gmail.com>
Date: Fri, 21 Mar 2025 11:56:03 +0100
Subject: [PATCH 2/5] build linux

---
 .../diylc-swing/deploy/linux/test-appimage.sh | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100755 diylc/diylc-swing/deploy/linux/test-appimage.sh

diff --git a/diylc/diylc-swing/deploy/linux/test-appimage.sh b/diylc/diylc-swing/deploy/linux/test-appimage.sh
new file mode 100755
index 00000000..b8de95c5
--- /dev/null
+++ b/diylc/diylc-swing/deploy/linux/test-appimage.sh
@@ -0,0 +1,72 @@
+#!/bin/bash
+
+# Build the AppImage
+echo "Building AppImage..."
+cd ../..
+#mvn clean package -P linux-appimage
+
+# Check if build was successful
+if [ $? -ne 0 ]; then
+    echo "Build failed!"
+    exit 1
+fi
+
+# Get the AppImage path
+APPIMAGE="target/DIYLayoutCreator-5.1.0-x86_64.AppImage"
+ZIP_FILE="target/diylc-5.1.0-linux.zip"
+
+# Check if files exist
+if [ ! -f "$APPIMAGE" ]; then
+    echo "AppImage not found at $APPIMAGE"
+    exit 1
+fi
+
+if [ ! -f "$ZIP_FILE" ]; then
+    echo "Zip file not found at $ZIP_FILE"
+    exit 1
+fi
+
+# Create test directory
+TEST_DIR="target/appimage-test"
+rm -rf "$TEST_DIR"
+mkdir -p "$TEST_DIR"
+
+# Copy files to test directory
+echo "Copying files to test directory..."
+cp "$APPIMAGE" "$TEST_DIR/"
+cp "$ZIP_FILE" "$TEST_DIR/"
+
+# Extract zip file
+echo "Extracting zip file..."
+cd "$TEST_DIR"
+unzip "diylc-5.1.0-linux.zip"
+
+# Make AppImage executable
+chmod +x "DIYLayoutCreator-5.1.0-x86_64.AppImage"
+
+# Test AppImage structure
+echo "Testing AppImage structure..."
+if [ -f "DIYLayoutCreator-5.1.0-x86_64.AppImage" ]; then
+    echo "AppImage file exists and is executable"
+    echo "AppImage size: $(ls -lh DIYLayoutCreator-5.1.0-x86_64.AppImage | awk '{print $5}')"
+    echo "AppImage permissions: $(ls -l DIYLayoutCreator-5.1.0-x86_64.AppImage | awk '{print $1}')"
+    
+    # Check if AppImage has the correct magic number
+    if file "DIYLayoutCreator-5.1.0-x86_64.AppImage" | grep -q "ELF 64-bit LSB executable"; then
+        echo "AppImage has correct ELF format"
+    else
+        echo "Warning: AppImage might not have correct ELF format"
+    fi
+    
+    # Check if AppImage has the correct AppImage magic bytes
+    if dd if="DIYLayoutCreator-5.1.0-x86_64.AppImage" bs=8 count=1 2>/dev/null | grep -q "AI"; then
+        echo "AppImage has correct AppImage magic bytes"
+    else
+        echo "Warning: AppImage might not have correct AppImage magic bytes"
+    fi
+    
+    echo "AppImage structure test completed successfully!"
+else
+    echo "AppImage file not found in test directory!"
+    exit 1
+fi 
\ No newline at end of file

From a011a080f4e4b1d00210cd8e893939291c398db3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Mar 2025 11:58:46 +0100
Subject: [PATCH 3/5] Bump junit:junit from 4.7 to 4.13.1 in /diylc (#896)

Bumps [junit:junit](https://github.com/junit-team/junit4) from 4.7 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.7...r4.13.1)

---
updated-dependencies:
- dependency-name: junit:junit
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 diylc/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diylc/pom.xml b/diylc/pom.xml
index 0a778581..c292cf9f 100644
--- a/diylc/pom.xml
+++ b/diylc/pom.xml
@@ -61,7 +61,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.7</version>
+                <version>4.13.1</version>
                 <scope>test</scope>
             </dependency>
             <dependency>

From c4fb3ad30588e7f9b9d16a602aad5b4e90a580eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Mar 2025 11:59:08 +0100
Subject: [PATCH 4/5] Bump com.thoughtworks.xstream:xstream from 1.4.19 to
 1.4.21 in /diylc (#895)

Bumps [com.thoughtworks.xstream:xstream](https://github.com/x-stream/xstream) from 1.4.19 to 1.4.21.
- [Release notes](https://github.com/x-stream/xstream/releases)
- [Commits](https://github.com/x-stream/xstream/commits)

---
updated-dependencies:
- dependency-name: com.thoughtworks.xstream:xstream
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 diylc/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diylc/pom.xml b/diylc/pom.xml
index c292cf9f..8f852003 100644
--- a/diylc/pom.xml
+++ b/diylc/pom.xml
@@ -23,7 +23,7 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <log4j.version>1.2.15</log4j.version>
-        <xstream.version>1.4.19</xstream.version>
+        <xstream.version>1.4.21</xstream.version>
     </properties>
     
     <!-- Build configuration will be defined below -->

From f1af933f6d93a4439c75741866affd7aca55ccce Mon Sep 17 00:00:00 2001
From: Branislav Stojkovic <bancika@gmail.com>
Date: Fri, 21 Mar 2025 12:18:17 +0100
Subject: [PATCH 5/5] up to 1gb

---
 diylc/diylc-swing/deploy/linux/run.sh         | 17 ++++++++++++++++-
 diylc/diylc-swing/deploy/win/launch4j-x64.xml |  2 +-
 diylc/diylc-swing/pom.xml                     |  4 ++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/diylc/diylc-swing/deploy/linux/run.sh b/diylc/diylc-swing/deploy/linux/run.sh
index 7f78069a..943efe7f 100755
--- a/diylc/diylc-swing/deploy/linux/run.sh
+++ b/diylc/diylc-swing/deploy/linux/run.sh
@@ -2,4 +2,19 @@
 JAVA_BIN="$(which java)"
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 CLASS_PATH="${DIR}/diylc.jar"
-exec java -Xms512m -Xmx4096m -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 -cp "$CLASS_PATH" --add-exports java.desktop/com.apple.eawt.event=ALL-UNNAMED --add-exports java.desktop/com.apple.eio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens java.desktop/java.awt.geom=ALL-UNNAMED  org.diylc.DIYLCStarter "$@"
\ No newline at end of file
+
+exec java \
+    -Xms1024m \
+    -Xmx4096m \
+    -Dorg.diylc.scriptRun=true \
+    -Dfile.encoding=UTF-8 \
+    -cp "$CLASS_PATH" \
+    --add-exports java.desktop/com.apple.eawt.event=ALL-UNNAMED \
+    --add-exports java.desktop/com.apple.eio=ALL-UNNAMED \
+    --add-opens java.base/java.util=ALL-UNNAMED \
+    --add-opens java.base/java.lang=ALL-UNNAMED \
+    --add-opens java.base/java.text=ALL-UNNAMED \
+    --add-opens java.desktop/java.awt=ALL-UNNAMED \
+    --add-opens java.desktop/java.awt.font=ALL-UNNAMED \
+    --add-opens java.desktop/java.awt.geom=ALL-UNNAMED \
+    org.diylc.DIYLCStarter "$@"
\ No newline at end of file
diff --git a/diylc/diylc-swing/deploy/win/launch4j-x64.xml b/diylc/diylc-swing/deploy/win/launch4j-x64.xml
index aa8e8e3a..d2740d62 100644
--- a/diylc/diylc-swing/deploy/win/launch4j-x64.xml
+++ b/diylc/diylc-swing/deploy/win/launch4j-x64.xml
@@ -24,7 +24,7 @@
     <requires64Bit>true</requires64Bit>
     <minVersion>17</minVersion>
     <maxVersion></maxVersion>
-    <initialHeapSize>512</initialHeapSize>
+    <initialHeapSize>1024</initialHeapSize>
     <maxHeapSize>4096</maxHeapSize>
     <opt>-Dorg.diylc.scriptRun=true</opt>
     <opt>-Dfile.encoding=UTF-8</opt>
diff --git a/diylc/diylc-swing/pom.xml b/diylc/diylc-swing/pom.xml
index e88370e3..c79eaded 100644
--- a/diylc/diylc-swing/pom.xml
+++ b/diylc/diylc-swing/pom.xml
@@ -750,7 +750,7 @@
                                             <runtime dir="${jre.dest.osx}/Contents/Home" />
                                             <arch name="x86_64"/>
                                             <classpath file="${project.build.directory}/diylc.jar" />
-                                            <option value="-Xms512m" />
+                                            <option value="-Xms1024m" />
                                             <option value="-Xmx4096m" />
                                             <option value="--add-exports=java.desktop/com.apple.eawt.event=ALL-UNNAMED" />
                                             <option value="--add-exports=java.desktop/com.apple.eio=ALL-UNNAMED" />
@@ -1064,7 +1064,7 @@
                                             <arch name="arm64"/>
                                             <arch name="arm64e"/>
                                             <classpath file="${project.build.directory}/diylc.jar" />
-                                            <option value="-Xms512m" />
+                                            <option value="-Xms1024m" />
                                             <option value="-Xmx4096m" />
                                             <option value="--add-exports=java.desktop/com.apple.eawt.event=ALL-UNNAMED" />
                                             <option value="--add-exports=java.desktop/com.apple.eio=ALL-UNNAMED" />