From aec99c6686215165dd91e6ae1679038ef298af6f Mon Sep 17 00:00:00 2001 From: Jason Belt Date: Tue, 10 Sep 2024 12:10:55 -0500 Subject: [PATCH] change hamr option names --- .../org/sireum/hamr/codegen/common/util/CodeGenConfig.scala | 2 +- .../org/sireum/hamr/codegen/common/util/CommonCli.scala | 6 +++--- jvm/src/main/scala/org/sireum/hamr/codegen/CodeGen.scala | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common/shared/src/main/scala/org/sireum/hamr/codegen/common/util/CodeGenConfig.scala b/common/shared/src/main/scala/org/sireum/hamr/codegen/common/util/CodeGenConfig.scala index 7385c22..496a8a3 100644 --- a/common/shared/src/main/scala/org/sireum/hamr/codegen/common/util/CodeGenConfig.scala +++ b/common/shared/src/main/scala/org/sireum/hamr/codegen/common/util/CodeGenConfig.scala @@ -50,7 +50,7 @@ import org.sireum.hamr.codegen.common.containers.{FileResource, Resource, Sireum // act options camkesOutputDir: Option[String], camkesAuxCodeDirs: ISZ[String], - aadlRootDir: Option[String], + workspaceRootDir: Option[String], experimentalOptions: ISZ[String]) diff --git a/common/shared/src/main/scala/org/sireum/hamr/codegen/common/util/CommonCli.scala b/common/shared/src/main/scala/org/sireum/hamr/codegen/common/util/CommonCli.scala index 3b4bcc9..772ae11 100644 --- a/common/shared/src/main/scala/org/sireum/hamr/codegen/common/util/CommonCli.scala +++ b/common/shared/src/main/scala/org/sireum/hamr/codegen/common/util/CommonCli.scala @@ -49,7 +49,7 @@ object CommonCli { val commonGroups: ISZ[OptGroup] = ISZ( OptGroup(name = "Slang", opts = ISZ( - Opt(name = "outputDir", longKey = "output-dir", shortKey = Some('o'), + Opt(name = "slangOutputDir", longKey = "slang-output-dir", shortKey = Some('o'), tpe = Type.Path(multiple = F, default = Some(".")), description = "Output directory for the generated project files"), Opt(name = "packageName", longKey = "package-name", shortKey = Some('n'), @@ -100,9 +100,9 @@ object CommonCli { tpe = Type.Path(multiple = T, default = None()), description = "Directories containing C files to be included in CAmkES build" ), - Opt(name = "aadlRootDir", longKey = "aadl-root-dir", shortKey = Some('r'), + Opt(name = "workspaceRootDir", longKey = "workspace-root-dir", shortKey = Some('r'), tpe = Type.Path(multiple = F, default = None()), - description = "Root directory containing the AADL project" + description = "Root directory containing the architectural model project" ) )), OptGroup(name = "Experimental", opts = ISZ( diff --git a/jvm/src/main/scala/org/sireum/hamr/codegen/CodeGen.scala b/jvm/src/main/scala/org/sireum/hamr/codegen/CodeGen.scala index e429904..4f4545c 100644 --- a/jvm/src/main/scala/org/sireum/hamr/codegen/CodeGen.scala +++ b/jvm/src/main/scala/org/sireum/hamr/codegen/CodeGen.scala @@ -107,7 +107,7 @@ object CodeGen { val fileSep = StringOps(org.sireum.Os.fileSep).first val opt = arsit.util.ArsitOptions( - outputDir = slangOutputDir, + slangOutputDir = slangOutputDir, packageName = packageName, noEmbedArt = options.noEmbedArt, bless = genBlessEntryPoints, @@ -259,9 +259,9 @@ object CodeGen { reporter.info(None(), toolName, "Generating CAmkES artifacts...") val actOptions = org.sireum.hamr.act.util.ActOptions( - outputDir = camkesOutputDir.value, + camkesOutputDir = camkesOutputDir.value, auxFiles = getAuxFiles(options.camkesAuxCodeDirs, F, reporter), - aadlRootDirectory = options.aadlRootDir, + workspaceRootDir = options.workspaceRootDir, platform = platform, hamrBasePackageName = Some(packageName), experimentalOptions = options.experimentalOptions