From 878e501c537a0205b5fcacb1416571589a89dcfa Mon Sep 17 00:00:00 2001 From: Dave Smith Date: Wed, 24 Apr 2024 23:06:35 +0100 Subject: [PATCH] Only return the code file for the font as a source --- .../src/indigoplugin/generators/FontGen.scala | 5 +---- .../generators/GeneratorAcceptanceTests.scala | 10 ++++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/indigo-plugin/indigo-plugin/src/indigoplugin/generators/FontGen.scala b/indigo-plugin/indigo-plugin/src/indigoplugin/generators/FontGen.scala index 080b8ef2a..d3f6b573c 100644 --- a/indigo-plugin/indigo-plugin/src/indigoplugin/generators/FontGen.scala +++ b/indigo-plugin/indigo-plugin/src/indigoplugin/generators/FontGen.scala @@ -73,10 +73,7 @@ object FontGen { helper.drawFontSheet((imageOut / outImageFileName).toIO, charDetails, sheetWidth, sheetHeight, fontOptions) - Seq( - file, - imageOut / outImageFileName - ) + Seq(file) } def sanitiseName(name: String, ext: String): String = { diff --git a/indigo-plugin/indigo-plugin/test/src/indigoplugin/generators/GeneratorAcceptanceTests.scala b/indigo-plugin/indigo-plugin/test/src/indigoplugin/generators/GeneratorAcceptanceTests.scala index 9569d4a09..024e99f05 100644 --- a/indigo-plugin/indigo-plugin/test/src/indigoplugin/generators/GeneratorAcceptanceTests.scala +++ b/indigo-plugin/indigo-plugin/test/src/indigoplugin/generators/GeneratorAcceptanceTests.scala @@ -24,7 +24,9 @@ class GeneratorAcceptanceTests extends munit.FunSuite { test("Can generate font bitmap and FontInfo from TTF file") { - os.makeDir.all(targetDir / Generators.OutputDirName / "images") + val imageOutDir = targetDir / Generators.OutputDirName / "images" + + os.makeDir.all(imageOutDir) val options: FontOptions = FontOptions("my font", 16, CharSet.Alphanumeric) @@ -34,13 +36,13 @@ class GeneratorAcceptanceTests extends munit.FunSuite { val files = IndigoGenerators("com.example.test") - .embedFont("MyFont", sourceFontTTF, options, targetDir / Generators.OutputDirName / "images") + .embedFont("MyFont", sourceFontTTF, options, imageOutDir) .toSourcePaths(targetDir) files.toList match { - case fontInfo :: png :: Nil => + case fontInfo :: Nil => assert(os.exists(fontInfo)) - assert(os.exists(png)) + assert(os.exists(imageOutDir / "MyFont.png")) case _ => fail(