mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-20 20:58:03 +00:00
Merge pull request #6743 from Card-Forge/runScriptFix
remove add-opens from mandatory.java.args, use MANIFEST.mf
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -12,6 +12,7 @@
|
|||||||
.settings
|
.settings
|
||||||
.classpath
|
.classpath
|
||||||
.project
|
.project
|
||||||
|
.checkstyle
|
||||||
|
|
||||||
# Ignore VS Code config files
|
# Ignore VS Code config files
|
||||||
|
|
||||||
@@ -24,6 +25,8 @@
|
|||||||
|
|
||||||
nbactions.xml
|
nbactions.xml
|
||||||
|
|
||||||
|
# Ignore flattened pom
|
||||||
|
.flattened-pom.xml
|
||||||
|
|
||||||
# Ignore binaries, temp files and test output, everywhere
|
# Ignore binaries, temp files and test output, everywhere
|
||||||
|
|
||||||
|
|||||||
@@ -18,28 +18,7 @@
|
|||||||
<parsedVersion.incrementalVersion>0</parsedVersion.incrementalVersion>
|
<parsedVersion.incrementalVersion>0</parsedVersion.incrementalVersion>
|
||||||
<timestamp>${maven.build.timestamp}</timestamp>
|
<timestamp>${maven.build.timestamp}</timestamp>
|
||||||
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
|
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
|
||||||
<mandatory.java.args>--add-opens java.desktop/java.beans=ALL-UNNAMED
|
<mandatory.java.args>-Xmx4096m -Dio.netty.tryReflectionSetAccessible=true -Dfile.encoding=UTF-8</mandatory.java.args>
|
||||||
--add-opens java.desktop/javax.swing.border=ALL-UNNAMED
|
|
||||||
--add-opens java.desktop/javax.swing.event=ALL-UNNAMED
|
|
||||||
--add-opens java.desktop/sun.swing=ALL-UNNAMED
|
|
||||||
--add-opens java.desktop/java.awt.image=ALL-UNNAMED
|
|
||||||
--add-opens java.desktop/java.awt.color=ALL-UNNAMED
|
|
||||||
--add-opens java.desktop/sun.awt.image=ALL-UNNAMED
|
|
||||||
--add-opens java.desktop/javax.swing=ALL-UNNAMED
|
|
||||||
--add-opens java.desktop/java.awt=ALL-UNNAMED
|
|
||||||
--add-opens java.base/java.util=ALL-UNNAMED
|
|
||||||
--add-opens java.base/java.lang=ALL-UNNAMED
|
|
||||||
--add-opens java.base/java.lang.reflect=ALL-UNNAMED
|
|
||||||
--add-opens java.base/java.text=ALL-UNNAMED
|
|
||||||
--add-opens java.desktop/java.awt.font=ALL-UNNAMED
|
|
||||||
--add-opens java.base/jdk.internal.misc=ALL-UNNAMED
|
|
||||||
--add-opens java.base/sun.nio.ch=ALL-UNNAMED
|
|
||||||
--add-opens java.base/java.nio=ALL-UNNAMED
|
|
||||||
--add-opens java.base/java.math=ALL-UNNAMED
|
|
||||||
--add-opens java.base/java.util.concurrent=ALL-UNNAMED
|
|
||||||
--add-opens java.base/java.net=ALL-UNNAMED
|
|
||||||
-Dio.netty.tryReflectionSetAccessible=true -Dfile.encoding=UTF-8
|
|
||||||
</mandatory.java.args>
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ if %jver% LEQ 16 (
|
|||||||
)
|
)
|
||||||
|
|
||||||
if %jver% GEQ 17 (
|
if %jver% GEQ 17 (
|
||||||
java -Xmx4096m $mandatory.java.args$ -jar $project.build.finalName$
|
java $mandatory.java.args$ -jar $project.build.finalName$
|
||||||
popd
|
popd
|
||||||
exit /b 0
|
exit /b 0
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
cd $(dirname "${0}")
|
cd $(dirname "${0}")
|
||||||
java -Xmx4096m $mandatory.java.args$ -jar $project.build.finalName$
|
java $mandatory.java.args$ -jar $project.build.finalName$
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
cd $(dirname "${0}")
|
cd $(dirname "${0}")
|
||||||
java -Xmx4096m $mandatory.java.args$ -jar $project.build.finalName$
|
java $mandatory.java.args$ -jar $project.build.finalName$
|
||||||
|
|||||||
Reference in New Issue
Block a user