fix: добавляем shell скрипт launcher.sh для запуска с javafx module-path
This commit is contained in:
@@ -43,15 +43,9 @@
|
|||||||
</excludes>
|
</excludes>
|
||||||
</filter>
|
</filter>
|
||||||
<filter>
|
<filter>
|
||||||
<artifact>org.openjfx:javafx-*</artifact>
|
<artifact>org.openjfx:*</artifact>
|
||||||
<excludes>
|
<excludes>
|
||||||
<exclude>**/*-linux.jar</exclude>
|
<exclude>**/*</exclude>
|
||||||
</excludes>
|
|
||||||
</filter>
|
|
||||||
<filter>
|
|
||||||
<artifact>*:javafx-*</artifact>
|
|
||||||
<excludes>
|
|
||||||
<exclude>*</exclude>
|
|
||||||
</excludes>
|
</excludes>
|
||||||
</filter>
|
</filter>
|
||||||
</filters>
|
</filters>
|
||||||
@@ -60,6 +54,9 @@
|
|||||||
<useProjectArtifact>false</useProjectArtifact>
|
<useProjectArtifact>false</useProjectArtifact>
|
||||||
<unpack>true</unpack>
|
<unpack>true</unpack>
|
||||||
<scope>runtime</scope>
|
<scope>runtime</scope>
|
||||||
|
<excludes>
|
||||||
|
<exclude>org.openjfx:*</exclude>
|
||||||
|
</excludes>
|
||||||
</dependencySet>
|
</dependencySet>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
@@ -142,9 +139,7 @@
|
|||||||
<fileset />
|
<fileset />
|
||||||
</copy>
|
</copy>
|
||||||
<copy>
|
<copy>
|
||||||
<fileset>
|
<fileset />
|
||||||
<include>*${javafx.classifier}.jar</include>
|
|
||||||
</fileset>
|
|
||||||
</copy>
|
</copy>
|
||||||
<zip />
|
<zip />
|
||||||
</target>
|
</target>
|
||||||
|
|||||||
+9
-3
@@ -260,11 +260,17 @@
|
|||||||
<fileset dir="${project.build.directory}/lib-javafx"/>
|
<fileset dir="${project.build.directory}/lib-javafx"/>
|
||||||
</copy>
|
</copy>
|
||||||
|
|
||||||
<!-- Создаём zip с .exe, jre21 и lib-javafx (без .jar и build.version) -->
|
<!-- Копируем shell script для Linux -->
|
||||||
|
<copy file="${project.basedir}/src/main/resources/launcher.sh"
|
||||||
|
todir="../server/builds"
|
||||||
|
overwrite="true"/>
|
||||||
|
<chmod file="../server/builds/launcher.sh" perm="+x"/>
|
||||||
|
|
||||||
|
<!-- Создаём zip с .exe, jre21, lib-javafx и launcher.sh (без .jar и build.version) -->
|
||||||
<zip destfile="../server/builds/ZernMCLauncher-${project.version}-${os.suffix}.zip"
|
<zip destfile="../server/builds/ZernMCLauncher-${project.version}-${os.suffix}.zip"
|
||||||
basedir="../server/builds"
|
basedir="../server/builds"
|
||||||
includes="ZernMCLauncher.exe,jre21/**,lib-javafx/**"
|
includes="ZernMCLauncher.exe,ZernMCLauncher.jar,jre21/**,lib-javafx/**,launcher.sh"
|
||||||
excludes="*.jar,build.version"/>
|
excludes="build.version"/>
|
||||||
</target>
|
</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
JAVA_HOME="$SCRIPT_DIR/jre21"
|
||||||
|
JAVA="$JAVA_HOME/bin/java"
|
||||||
|
|
||||||
|
JAVAFX_PATH="$SCRIPT_DIR/lib-javafx"
|
||||||
|
|
||||||
|
exec "$JAVA" \
|
||||||
|
--module-path="$JAVAFX_PATH" \
|
||||||
|
--add-modules=javafx.controls,javafx.web \
|
||||||
|
--add-reads=javafx.graphics=ALL-UNNAMED \
|
||||||
|
-jar "$SCRIPT_DIR/ZernMCLauncher.jar" "$@"
|
||||||
Reference in New Issue
Block a user