Compare commits

...

3 Commits

4 changed files with 25 additions and 4 deletions

View File

@ -11,8 +11,6 @@ import io.ktor.server.netty.*
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
fun main(args: Array<String>) { fun main(args: Array<String>) {
println("Arguments (${args.size}): [${args.joinToString(", ")}]")
if(args.size >= 3 && args[0] == "-reload") { if(args.size >= 3 && args[0] == "-reload") {
val xmlFile = args[1] val xmlFile = args[1]
val jsonFile = args[2] val jsonFile = args[2]
@ -39,8 +37,9 @@ fun dbSetup(xmlFile: String, jsonFile: String, force: Boolean = false) {
if(force || (xml.version.version isNewerThan current.version)) { if(force || (xml.version.version isNewerThan current.version)) {
Database.reset() Database.reset()
Loader.importToDb(xml, perf) Loader.importToDb(xml, perf)
println("Database reset/reloaded!")
} }
if(!(xml.version.version isNewerThan current.version)) { else if(!(xml.version.version isNewerThan current.version)) {
System.err.println("The XML file (${xml.version}) is not more up-to-date than the database ($current). Use -force to force importing.") System.err.println("The XML file (${xml.version}) is not more up-to-date than the database ($current). Use -force to force importing.")
} }
} }

2
frontend/.gitignore vendored
View File

@ -17,3 +17,5 @@ captures
!*.xcworkspace/contents.xcworkspacedata !*.xcworkspace/contents.xcworkspacedata
**/xcshareddata/WorkspaceSettings.xcsettings **/xcshareddata/WorkspaceSettings.xcsettings
**/.env **/.env
*.tar.gz

View File

@ -72,7 +72,7 @@ compose.desktop {
mainClass = "com.jaytux.simd.frontend.MainKt" mainClass = "com.jaytux.simd.frontend.MainKt"
nativeDistributions { nativeDistributions {
targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb, TargetFormat.AppImage)
packageName = "com.jaytux.simd.frontend" packageName = "com.jaytux.simd.frontend"
packageVersion = "1.0.0" packageVersion = "1.0.0"
} }
@ -81,4 +81,11 @@ compose.desktop {
compose.resources { compose.resources {
// //
}
tasks.withType<Jar> {
duplicatesStrategy = DuplicatesStrategy.INCLUDE
manifest {
attributes["Main-Class"] = "com.jaytux.simd.frontend.MainKt"
}
} }

13
frontend/package.sh Executable file
View File

@ -0,0 +1,13 @@
#!/usr/bin/env sh
echo "./gradlew clean"
./gradlew clean
echo "./gradlew packageAppImage"
./gradlew packageAppImage
echo "./gradlew wasmJsBrowserDistribution"
./gradlew wasmJsBrowserDistribution
echo "tar -czf simd-frontend@linux.tar.gz -C composeApp/build/compose/binaries/main/app/ com.jaytux.simd.frontend"
tar -czf simd-frontend@linux.tar.gz -C composeApp/build/compose/binaries/main/app/ com.jaytux.simd.frontend
echo "tar -czf simd-frontend@web.tar.gz -C composeApp/build/dist/wasmJs productionExecutable"
tar -czf simd-frontend@web.tar.gz -C composeApp/build/dist/wasmJs productionExecutable