fix: исключаем javafx из shade, исправляем antrun

This commit is contained in:
SashegDev
2026-05-05 11:35:33 +00:00
parent 70c4815032
commit 012d1635dc
2 changed files with 33 additions and 14 deletions
+25 -1
View File
@@ -122,6 +122,9 @@
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
<configuration>
<skip>${skip.launch4j}</skip>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
@@ -139,7 +142,9 @@
<fileset /> <fileset />
</copy> </copy>
<copy> <copy>
<fileset /> <fileset>
<include>*${javafx.classifier}.jar</include>
</fileset>
</copy> </copy>
<zip /> <zip />
</target> </target>
@@ -166,6 +171,22 @@
<server.url>http://87.120.187.36:1582</server.url> <server.url>http://87.120.187.36:1582</server.url>
</properties> </properties>
</profile> </profile>
<profile>
<id>win</id>
<properties>
<os.suffix>win</os.suffix>
<javafx.classifier>win</javafx.classifier>
<skip.launch4j>false</skip.launch4j>
</properties>
</profile>
<profile>
<id>linux</id>
<properties>
<os.suffix>linux</os.suffix>
<javafx.classifier>linux</javafx.classifier>
<skip.launch4j>true</skip.launch4j>
</properties>
</profile>
</profiles> </profiles>
<dependencies> <dependencies>
<dependency> <dependency>
@@ -194,7 +215,10 @@
<mainClass>me.sashegdev.zernmc.launcher.Main</mainClass> <mainClass>me.sashegdev.zernmc.launcher.Main</mainClass>
<maven.compiler.source>21</maven.compiler.source> <maven.compiler.source>21</maven.compiler.source>
<project.organization.name>ZernMC</project.organization.name> <project.organization.name>ZernMC</project.organization.name>
<javafx.classifier>win</javafx.classifier>
<skip.launch4j>false</skip.launch4j>
<maven.compiler.target>21</maven.compiler.target> <maven.compiler.target>21</maven.compiler.target>
<os.suffix>win</os.suffix>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.inceptionYear>2026</project.inceptionYear> <project.inceptionYear>2026</project.inceptionYear>
</properties> </properties>
+8 -13
View File
@@ -149,17 +149,11 @@
<exclude>META-INF/*.RSA</exclude> <exclude>META-INF/*.RSA</exclude>
</excludes> </excludes>
</filter> </filter>
<!-- Исключаем Linux версии JavaFX и сам JavaFX из shade (он будет в lib-javafx) --> <!-- Исключаем JavaFX из shade полностью (он будет в lib-javafx) -->
<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>
@@ -168,6 +162,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>
@@ -258,11 +255,9 @@
<fileset dir="${user.home}/launcher/jre/jre21"/> <fileset dir="${user.home}/launcher/jre/jre21"/>
</copy> </copy>
<!-- Копируем JavaFX JAR в builds (только для текущей OS) --> <!-- Копируем JavaFX JAR в builds -->
<copy todir="../server/builds/lib-javafx" overwrite="true"> <copy todir="../server/builds/lib-javafx" overwrite="true">
<fileset dir="${project.build.directory}/lib-javafx"> <fileset dir="${project.build.directory}/lib-javafx"/>
<include>*${javafx.classifier}.jar</include>
</fileset>
</copy> </copy>
<!-- Создаём zip с .exe, jre21 и lib-javafx (без .jar и build.version) --> <!-- Создаём zip с .exe, jre21 и lib-javafx (без .jar и build.version) -->