curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-07 12:21:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

buildapp update

Browse Source
This commit is contained in:
minjaesong
2026-02-17 04:37:14 +09:00
parent 9efb800d47
commit 661d516800
13 changed files with 70 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
buildapp/build_app_linux_arm.sh
View File

@@ -9,8 +9,8 @@ RUNTIME="runtime-linux-arm"
DESKTOPFILE="../out/build_autogen_linux.desktop" DESKTOPFILE="../out/build_autogen_linux.desktop"
JARNAME="TerrarumBuild.jar" JARNAME="TerrarumBuild.jar"
if [ ! -d "../assets_release" ]; then if [ ! -f "out/assets.tar.zst" ] || [ ! -f "out/assets.manifest" ]; then
echo "'assets_release' does not exist; prepare the assets for the release and put them into the assets_release directory, exiting now." >&2 echo "'assets.tar.zst' or 'assets.manifest' not found in out/; run 'make assets' first." >&2
exit 1 exit 1
fi fi
@@ -27,11 +27,11 @@ chmod +x $DESTDIR/AppRun
# Copy over a Java runtime # Copy over a Java runtime
mkdir $DESTDIR/out mkdir $DESTDIR/out
cp -r "../out/$RUNTIME" $DESTDIR/out/ cp -r "../out/$RUNTIME" $DESTDIR/out/
mv $DESTDIR/out/$RUNTIME/bin/java $DESTDIR/out/$RUNTIME/bin/Terrarum mv $DESTDIR/out/$RUNTIME/bin/java $DESTDIR/out/$RUNTIME/bin/java
# Copy over all the assets and a jarfile # Copy over the asset archive, manifest, and jarfile
cp -r "../assets_release" $DESTDIR/ cp "out/assets.tar.zst" $DESTDIR/
mv $DESTDIR/assets_release $DESTDIR/assets cp "out/assets.manifest" $DESTDIR/
cp "../out/$JARNAME" $DESTDIR/out/ cp "../out/$JARNAME" $DESTDIR/out/
# Pack everything to AppImage # Pack everything to AppImage

12
buildapp/build_app_linux_x86.sh
View File

@@ -9,8 +9,8 @@ RUNTIME="runtime-linux-x86"
DESKTOPFILE="../out/build_autogen_linux.desktop" DESKTOPFILE="../out/build_autogen_linux.desktop"
JARNAME="TerrarumBuild.jar" JARNAME="TerrarumBuild.jar"
if [ ! -d "../assets_release" ]; then if [ ! -f "out/assets.tar.zst" ] || [ ! -f "out/assets.manifest" ]; then
echo "'assets_release' does not exist; prepare the assets for the release and put them into the assets_release directory, exiting now." >&2 echo "'assets.tar.zst' or 'assets.manifest' not found in out/; run 'make assets' first." >&2
exit 1 exit 1
fi fi
@@ -27,11 +27,11 @@ chmod +x $DESTDIR/AppRun
# Copy over a Java runtime # Copy over a Java runtime
mkdir $DESTDIR/out mkdir $DESTDIR/out
cp -r "../out/$RUNTIME" $DESTDIR/out/ cp -r "../out/$RUNTIME" $DESTDIR/out/
mv $DESTDIR/out/$RUNTIME/bin/java $DESTDIR/out/$RUNTIME/bin/Terrarum mv $DESTDIR/out/$RUNTIME/bin/java $DESTDIR/out/$RUNTIME/bin/java
# Copy over all the assets and a jarfile # Copy over the asset archive, manifest, and jarfile
cp -r "../assets_release" $DESTDIR/ cp "out/assets.tar.zst" $DESTDIR/
mv $DESTDIR/assets_release $DESTDIR/assets cp "out/assets.manifest" $DESTDIR/
cp "../out/$JARNAME" $DESTDIR/out/ cp "../out/$JARNAME" $DESTDIR/out/
# Pack everything to AppImage # Pack everything to AppImage

12
buildapp/build_app_mac_arm.sh
View File

@@ -9,8 +9,8 @@ RUNTIME="runtime-osx-arm"
PLISTFILE="../out/build_autogen_macos_Info.plist" PLISTFILE="../out/build_autogen_macos_Info.plist"
JARNAME="TerrarumBuild.jar" JARNAME="TerrarumBuild.jar"
if [ ! -d "../assets_release" ]; then if [ ! -f "out/assets.tar.zst" ] || [ ! -f "out/assets.manifest" ]; then
echo "'assets_release' does not exist; prepare the assets for the release and put them into the assets_release directory, exiting now." >&2 echo "'assets.tar.zst' or 'assets.manifest' not found in out/; run 'make assets' first." >&2
exit 1 exit 1
fi fi
@@ -30,11 +30,11 @@ cp $PLISTFILE $DESTDIR/Contents/Info.plist
# Copy over a Java runtime # Copy over a Java runtime
mkdir $DESTDIR/Contents/MacOS/out mkdir $DESTDIR/Contents/MacOS/out
cp -r "../out/$RUNTIME" $DESTDIR/Contents/MacOS/out/ cp -r "../out/$RUNTIME" $DESTDIR/Contents/MacOS/out/
mv $DESTDIR/Contents/MacOS/out/$RUNTIME/bin/java $DESTDIR/Contents/MacOS/out/$RUNTIME/bin/Terrarum mv $DESTDIR/Contents/MacOS/out/$RUNTIME/bin/java $DESTDIR/Contents/MacOS/out/$RUNTIME/bin/java
# Copy over all the assets and a jarfile # Copy over the asset archive, manifest, and jarfile
cp -r "../assets_release" $DESTDIR/Contents/MacOS/ cp "out/assets.tar.zst" $DESTDIR/Contents/MacOS/
mv $DESTDIR/Contents/MacOS/assets_release $DESTDIR/Contents/MacOS/assets cp "out/assets.manifest" $DESTDIR/Contents/MacOS/
cp "../out/$JARNAME" $DESTDIR/Contents/MacOS/out/ cp "../out/$JARNAME" $DESTDIR/Contents/MacOS/out/
# zip everything # zip everything

12
buildapp/build_app_mac_x86.sh
View File

@@ -9,8 +9,8 @@ RUNTIME="runtime-osx-x86"
PLISTFILE="../out/build_autogen_macos_Info.plist" PLISTFILE="../out/build_autogen_macos_Info.plist"
JARNAME="TerrarumBuild.jar" JARNAME="TerrarumBuild.jar"
if [ ! -d "../assets_release" ]; then if [ ! -f "out/assets.tar.zst" ] || [ ! -f "out/assets.manifest" ]; then
echo "'assets_release' does not exist; prepare the assets for the release and put them into the assets_release directory, exiting now." >&2 echo "'assets.tar.zst' or 'assets.manifest' not found in out/; run 'make assets' first." >&2
exit 1 exit 1
fi fi
@@ -30,11 +30,11 @@ cp $PLISTFILE $DESTDIR/Contents/Info.plist
# Copy over a Java runtime # Copy over a Java runtime
mkdir $DESTDIR/Contents/MacOS/out mkdir $DESTDIR/Contents/MacOS/out
cp -r "../out/$RUNTIME" $DESTDIR/Contents/MacOS/out/ cp -r "../out/$RUNTIME" $DESTDIR/Contents/MacOS/out/
mv $DESTDIR/Contents/MacOS/out/$RUNTIME/bin/java $DESTDIR/Contents/MacOS/out/$RUNTIME/bin/Terrarum mv $DESTDIR/Contents/MacOS/out/$RUNTIME/bin/java $DESTDIR/Contents/MacOS/out/$RUNTIME/bin/java
# Copy over all the assets and a jarfile # Copy over the asset archive, manifest, and jarfile
cp -r "../assets_release" $DESTDIR/Contents/MacOS/ cp "out/assets.tar.zst" $DESTDIR/Contents/MacOS/
mv $DESTDIR/Contents/MacOS/assets_release $DESTDIR/Contents/MacOS/assets cp "out/assets.manifest" $DESTDIR/Contents/MacOS/
cp "../out/$JARNAME" $DESTDIR/Contents/MacOS/out/ cp "../out/$JARNAME" $DESTDIR/Contents/MacOS/out/
# zip everything # zip everything

14
buildapp/build_app_windows_x86.sh
View File

@@ -8,8 +8,8 @@ RUNTIME="runtime-windows-x86"
RCFILE="../out/build_autogen_windows.rc" RCFILE="../out/build_autogen_windows.rc"
JARNAME="TerrarumBuild.jar" JARNAME="TerrarumBuild.jar"
if [ ! -d "../assets_release" ]; then if [ ! -f "out/assets.tar.zst" ] || [ ! -f "out/assets.manifest" ]; then
echo "'assets_release' does not exist; prepare the assets for the release and put them into the assets_release directory, exiting now." >&2 echo "'assets.tar.zst' or 'assets.manifest' not found in out/; run 'make assets' first." >&2
exit 1 exit 1
fi fi
@@ -32,12 +32,12 @@ x86_64-w64-mingw32-gcc -Os -s -o $DESTDIR/Terrarum.exe $SRCFILES/Terrarum.c $RCF
# Copy over a Java runtime # Copy over a Java runtime
mkdir $DESTDIR/out mkdir $DESTDIR/out
cp -r "../out/$RUNTIME" $DESTDIR/out/ cp -r "../out/$RUNTIME" $DESTDIR/out/
mv $DESTDIR/out/$RUNTIME/bin/java.exe $DESTDIR/out/$RUNTIME/bin/Terrarum.exe mv $DESTDIR/out/$RUNTIME/bin/java.exe $DESTDIR/out/$RUNTIME/bin/java.exe
# Copy over all the assets and a jarfile # Copy over the asset archive, manifest, and jarfile
cp -r "../assets_release" $DESTDIR/ cp "out/assets.tar.zst" $DESTDIR/
mv $DESTDIR/assets_release $DESTDIR/assets cp "out/assets.manifest" $DESTDIR/
cp "../out/$JARNAME" $DESTDIR/out/ cp "../out/$JARNAME" $DESTDIR/out/
# zip everything # zip everything
rm "out/$DESTDIR.zip" rm "out/$DESTDIR.zip"

10
buildapp/terrarum.manifest Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
</requestedPrivileges>
</security>
</trustInfo>
</assembly>

2
buildapp/terrarumlinux_arm/AppRun
View File

@@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
cd "${0%/*}" cd "${0%/*}"
./out/runtime-linux-arm/bin/Terrarum -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd -jar ./out/TerrarumBuild.jar ./out/runtime-linux-arm/bin/java -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd -jar ./out/TerrarumBuild.jar

2
buildapp/terrarumlinux_x86/AppRun
View File

@@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
cd "${0%/*}" cd "${0%/*}"
./out/runtime-linux-x86/bin/Terrarum -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd -jar ./out/TerrarumBuild.jar ./out/runtime-linux-x86/bin/java -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd -jar ./out/TerrarumBuild.jar

2
buildapp/terrarummac_arm/Terrarum.sh
View File

@@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
cd "${0%/*}" cd "${0%/*}"
./out/runtime-osx-arm/bin/Terrarum -jar ./out/TerrarumBuild.jar ./out/runtime-osx-arm/bin/java -jar ./out/TerrarumBuild.jar

2
buildapp/terrarummac_x86/Terrarum.sh
View File

@@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
cd "${0%/*}" cd "${0%/*}"
./out/runtime-osx-x86/bin/Terrarum -jar ./out/TerrarumBuild.jar ./out/runtime-osx-x86/bin/java -jar ./out/TerrarumBuild.jar

29
buildapp/terrarumwindows_x86/Terrarum.c
View File

@@ -1,11 +1,28 @@
#include <windows.h> #include <windows.h>
#include <stdio.h>
#include <tchar.h>
int main() { int main() {
STARTUPINFOA si = {0};
PROCESS_INFORMATION pi = {0};
si.cb = sizeof(si);
si.dwFlags = STARTF_USESHOWWINDOW;
si.wShowWindow = SW_HIDE;
ShellExecute(NULL, "open", "\".\\out\\runtime-windows-x86\\bin\\Terrarum.exe\"", "-jar \".\\out\\TerrarumBuild.jar\"", NULL, SW_HIDE); char cmd[] = "\".\\out\\runtime-windows-x86\\bin\\java.exe\" -jar \".\\out\\TerrarumBuild.jar\"";
CreateProcessA(
NULL,
cmd,
NULL,
NULL,
FALSE,
0,
NULL,
".\\out\\runtime-windows-x86\\bin",
&si,
&pi
);
CloseHandle(pi.hProcess);
CloseHandle(pi.hThread);
return 0; return 0;
}
//return system(".\\out\\runtime-windows-x86\\bin\\Terrarum.exe -jar .\\out\\TerrarumBuild.jar");
}

1
src/net/torvald/terrarum/Prebuild.kt
View File

@@ -10,6 +10,7 @@ import java.time.ZonedDateTime
private fun writeWindowsRC(major: Int, minor: Int, patch: Int) { private fun writeWindowsRC(major: Int, minor: Int, patch: Int) {
val s = """1 ICON "icns.ico" val s = """1 ICON "icns.ico"
1 RT_MANITEST "terrarum.manifest"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION $major,$minor,$patch,0 FILEVERSION $major,$minor,$patch,0
PRODUCTVERSION $major,$minor,$patch,0 PRODUCTVERSION $major,$minor,$patch,0

2
src/net/torvald/terrarum/Principii.java
View File

@@ -96,7 +96,7 @@ public class Principii {
extracmd0 += " -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd"; extracmd0 += " -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd";
} }
String runtime = new File("out/"+runtimeRoot+"/bin/Terrarum").getAbsolutePath(); // /bin/Terrarum is just a renamed version of /bin/java String runtime = new File("out/"+runtimeRoot+"/bin/java").getAbsolutePath();
System.out.println("Runtime path: "+runtime); System.out.println("Runtime path: "+runtime);