Compare commits

..

No commits in common. "4793e270120fdbc4fcbe9f93ab1c265728e311fb" and "4ae608f40587a0315595b7bf0859110ee0b2fca3" have entirely different histories.

4 changed files with 4 additions and 25 deletions

View File

@ -11,6 +11,8 @@ import io.ktor.server.netty.*
import kotlinx.coroutines.runBlocking
fun main(args: Array<String>) {
println("Arguments (${args.size}): [${args.joinToString(", ")}]")
if(args.size >= 3 && args[0] == "-reload") {
val xmlFile = args[1]
val jsonFile = args[2]
@ -37,9 +39,8 @@ fun dbSetup(xmlFile: String, jsonFile: String, force: Boolean = false) {
if(force || (xml.version.version isNewerThan current.version)) {
Database.reset()
Loader.importToDb(xml, perf)
println("Database reset/reloaded!")
}
else if(!(xml.version.version isNewerThan current.version)) {
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.")
}
}

2
frontend/.gitignore vendored
View File

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

View File

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

View File

@ -1,13 +0,0 @@
#!/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