From 70429d66be8cba9e022af566f46a9b59ba79890d Mon Sep 17 00:00:00 2001 From: Adam <897017+asemy@users.noreply.github.com> Date: Sat, 23 Oct 2021 22:46:17 +0200 Subject: [PATCH] rm old files, use sync to copy tstl'd files --- modules/mod/build.gradle.kts | 60 +++++++++++++++++++------------ modules/mod/data.ts | 1 - modules/mod/item.ts | 12 ------- modules/mod/pipe-logs-to-kafka.sh | 13 ------- 4 files changed, 38 insertions(+), 48 deletions(-) delete mode 100644 modules/mod/data.ts delete mode 100644 modules/mod/item.ts delete mode 100644 modules/mod/pipe-logs-to-kafka.sh diff --git a/modules/mod/build.gradle.kts b/modules/mod/build.gradle.kts index 46bf8fc..7a1002d 100644 --- a/modules/mod/build.gradle.kts +++ b/modules/mod/build.gradle.kts @@ -7,8 +7,8 @@ plugins { val projectId: String by project.extra -val tsSrcDir = layout.projectDirectory.dir("src/main/typescript") -val modBuildDir = layout.buildDirectory.dir(projectId).get() +val tsSrcDir: Directory = layout.projectDirectory.dir("src/main/typescript") +val modBuildDir: Directory = layout.buildDirectory.dir(projectId).get() node { nodeProjectDir.set(tsSrcDir) @@ -25,19 +25,27 @@ val tstlTask = tasks.register("typescriptToLua") { npmCommand.set(listOf("run", "build")) inputs.dir(node.nodeProjectDir) - .skipWhenEmpty() - .withPropertyName("sourceFiles") - .withPathSensitivity(PathSensitivity.RELATIVE) + .skipWhenEmpty() + .withPropertyName("sourceFiles") + .withPathSensitivity(PathSensitivity.RELATIVE) + val intermediateOutputDir = temporaryDir + args.set(parseSpaceSeparatedArgs("-- --outDir $intermediateOutputDir")) val outputDir = modBuildDir.dir("typescriptToLua") - args.set(parseSpaceSeparatedArgs("-- --outDir $outputDir")) outputs.dir(outputDir) - .withPropertyName("outputDir") + .withPropertyName("outputDir") ignoreExitValue.set(false) doFirst("clean") { - delete(outputDir) + delete(intermediateOutputDir) + } + + doLast("syncTstlOutput") { + sync { + from(intermediateOutputDir) + into(outputDir) + } } } @@ -57,16 +65,16 @@ val tstlTask = tasks.register("typescriptToLua") { // } // } -val modPackageTask = tasks.register("package") { +val modPackageTask = tasks.register("packageMod") { description = "Package mod files into ZIP" group = projectId dependsOn(tstlTask) from( - layout.projectDirectory.dir("src/main/resources/mod-data"), - rootProject.layout.projectDirectory.file("LICENSE"), - tstlTask, + layout.projectDirectory.dir("src/main/resources/mod-data"), + rootProject.layout.projectDirectory.file("LICENSE"), + tstlTask, ) into(rootProject.name) @@ -80,8 +88,8 @@ val modPackageTask = tasks.register("package") { //tasks.build { dependsOn(tstlTask, modPackageTask) } -val modInfraDir = layout.projectDirectory.dir("infra") -val factorioServerDataDir = modInfraDir.dir("factorio-server") +val modInfraDir: Directory = layout.projectDirectory.dir("infra") +val factorioServerDataDir: Directory = modInfraDir.dir("factorio-server") val copyModToServerTask = tasks.register("copyModToServer") { description = "Copy the mod to the Factorio Docker server" @@ -97,7 +105,7 @@ val copyModToServerTask = tasks.register("copyModToServer") { } } -val serverStopTask = tasks.register("dockerStop") { +val factorioServerStop = tasks.register("factorioServerStop") { group = "$projectId.factorioServer" mustRunAfter(copyModToServerTask) @@ -106,16 +114,22 @@ val serverStopTask = tasks.register("dockerStop") { commandLine = parseSpaceSeparatedArgs("docker-compose stop factorio-server") } -val serverUpTask = tasks.register("dockerUp") { +val factorioServerUp = tasks.register("factorioServerUp") { group = "$projectId.factorioServer" mustRunAfter(copyModToServerTask) - dependsOn(serverStopTask) + dependsOn(factorioServerStop) workingDir(modInfraDir) commandLine = parseSpaceSeparatedArgs("docker-compose up -d factorio-server") } +val factorioServerRestart: Task by tasks.creating { + group = "$projectId.factorioServer" + + dependsOn(factorioServerStop, factorioServerUp) +} + //val serverRestartTask = tasks.register("dockerRestart") { // group = "$projectId.factorioServer" // @@ -156,9 +170,9 @@ val launch = tasks.register("modLauncher") { description = "Build the mod, upload to Server and Client, and start both" group = projectId dependsOn( - copyModToServerTask, - copyModToClientTask, - serverUpTask, + copyModToServerTask, + copyModToClientTask, + factorioServerRestart, // factorioClientLaunch, ) } @@ -175,11 +189,13 @@ tasks.register("downloadFactorioApiDocs") { doLast { - ant.invokeMethod("get", mapOf( + ant.invokeMethod( + "get", mapOf( "src" to target, "dest" to downloadedFile, "verbose" to true, - )) + ) + ) val json = downloadedFile.readText() val prettyJson = groovy.json.JsonOutput.prettyPrint(json) diff --git a/modules/mod/data.ts b/modules/mod/data.ts deleted file mode 100644 index eef4c4c..0000000 --- a/modules/mod/data.ts +++ /dev/null @@ -1 +0,0 @@ -// require("item") \ No newline at end of file diff --git a/modules/mod/item.ts b/modules/mod/item.ts deleted file mode 100644 index d39f9dd..0000000 --- a/modules/mod/item.ts +++ /dev/null @@ -1,12 +0,0 @@ -import * as util from "util"; -import { Data, Mods } from "typed-factorio/data/types" - - -declare const data: Data -declare const mods: Mods - -let fireArmour = util.table.deepcopy(data.raw["armor"]["heavy-armor"]) - -fireArmour.name = "fire-armour" -fireArmour.icon - diff --git a/modules/mod/pipe-logs-to-kafka.sh b/modules/mod/pipe-logs-to-kafka.sh deleted file mode 100644 index 96fbe5a..0000000 --- a/modules/mod/pipe-logs-to-kafka.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -# stream logs from 'factorio' container -# follow the logs, and -# combine stdout and stderr -# only match lines that start with 'FactorioEvent: ', -# and only return the stuff *after* 'FactorioEvent: ' -docker logs --tail 0 -f factorio 2>&1 | - sed -n -e 's/^FactorioEvent: //p' | - kafkacat -P -b localhost -t factorio-server-log - -# listen to events -# kafkacat -C -b localhost -t factorio-server-log | jq