change hamr option names

sireum · Sep 10, 2024 · aec99c6 · aec99c6
1 parent f0fa5c7
commit aec99c6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 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
@@ -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
@@ -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
@@ -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