From 2fa0f68acd4dd582638d7ab98421923037d1f5ec Mon Sep 17 00:00:00 2001 From: Justin Rajewski <justin@alchitry.com> Date: Fri, 13 Oct 2023 14:05:38 -0600 Subject: [PATCH] Updated version, fixed issue with detecting ACF errors. --- build.gradle.kts | 2 +- src/main/kotlin/com/alchitry/labs/Log.kt | 2 +- src/main/kotlin/com/alchitry/labs/project/Project.kt | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 347f7905..168922f8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,7 +21,7 @@ plugins { id("at.stnwtr.gradle-secrets-plugin") version "1.0.1" } -val fullVersion = "2.0.0-PREVIEW" +val fullVersion = "2.0.1-PREVIEW" val numOnlyVersion = fullVersion.split('-').first() group = "com.alchitry" diff --git a/src/main/kotlin/com/alchitry/labs/Log.kt b/src/main/kotlin/com/alchitry/labs/Log.kt index 54a8fbcd..3bfabe19 100644 --- a/src/main/kotlin/com/alchitry/labs/Log.kt +++ b/src/main/kotlin/com/alchitry/labs/Log.kt @@ -87,7 +87,7 @@ object Log { println(message, AlchitryColors.current.Error) if (throwable != null) { throwable.message?.let { println(it, AlchitryColors.current.Error) } - throwable.printStackTrace() + println(throwable.stackTraceToString(), AlchitryColors.current.Error) } } diff --git a/src/main/kotlin/com/alchitry/labs/project/Project.kt b/src/main/kotlin/com/alchitry/labs/project/Project.kt index 7c47df13..b7a32765 100644 --- a/src/main/kotlin/com/alchitry/labs/project/Project.kt +++ b/src/main/kotlin/com/alchitry/labs/project/Project.kt @@ -15,6 +15,7 @@ import com.alchitry.labs.project.files.ConstraintFile import com.alchitry.labs.project.files.IPCore import com.alchitry.labs.project.files.SourceFile import com.alchitry.labs.ui.misc.openFileDialog +import com.alchitry.labs.ui.theme.AlchitryColors import com.alchitry.labs.windows.mainWindow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow @@ -69,11 +70,11 @@ data class Project( val topModule = context?.top if (context == null || topModule == null) { Log.printlnError("Failed to build project context!") - Log.printlnError(errorManger.getReport()) + Log.print(errorManger.getReport(), AlchitryColors.current.Error) return false } - Log.println(errorManger.getReport()) + Log.print(errorManger.getReport()) val sourceFiles = try { context.convertToVerilog() @@ -123,9 +124,8 @@ data class Project( return false } - if (constraints.values.contains(null)) { - Log.printlnError("Failed to convert all constraint files!") - Log.printlnError(constraintErrorManager.getReport()) + if (!constraintErrorManager.hasNoMessages) { + Log.print(constraintErrorManager.getReport(), AlchitryColors.current.Error) return false }