Skip to content

Commit 8edb63d

Browse files
committed
ok, now it makes sense
1 parent 147acb3 commit 8edb63d

1 file changed

Lines changed: 8 additions & 10 deletions

File tree

rebuild.sc

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ object Debug:
88
var enabled = false
99

1010
enum Command:
11-
case Clean, Generate, GenerateStrict, Upstream, Strict, Exit
11+
case Clean, Generate, GenerateStrict, GenerateOldGen, Strict, Exit
1212

1313
enum Target:
1414
case Specific(name: String)
@@ -137,7 +137,7 @@ def runGeneratorJsoniter(project: Project, projectRootPath: Path, strict: Boolea
137137
if Debug.enabled then println(s"Running command: ${command.mkString(" ")}")
138138
os.proc(command).call(stdout = os.Inherit, stderr = os.Inherit)
139139

140-
def runGeneratorUpstream(project: Project, projectRootPath: Path)(using pwd: Path) =
140+
def runGeneratorOld(project: Project, projectRootPath: Path)(using pwd: Path) =
141141
val additionalProps = {
142142
val base = s"mainPackage=${project.projectMainPackage},groupId=${project.projectGroupId},artifactId=${project.projectArtifactId},artifactVersion=${project.projectVersion},jsonLibrary=circe"
143143
val extended = if project.additionalProps.nonEmpty then s"$base,${project.additionalProps}" else base
@@ -170,15 +170,13 @@ def processProject(project: Project, cmd: Command)(using pwd: Path) =
170170
case Command.Clean =>
171171
cleanMaven
172172
cleanupGeneratedFiles(project, projectRootPath)
173-
installMaven
174-
runGeneratorJsoniter(project, projectRootPath)
175173
case Command.Generate =>
176174
runGeneratorJsoniter(project, projectRootPath)
177175
case Command.GenerateStrict =>
178176
runGeneratorJsoniter(project, projectRootPath, strict = true)
179-
case Command.Upstream =>
177+
case Command.GenerateOldGen =>
180178
cleanupGeneratedFiles(project, projectRootPath)
181-
runGeneratorUpstream(project, projectRootPath)
179+
runGeneratorOld(project, projectRootPath)
182180
case Command.Strict =>
183181
cleanMaven
184182
cleanupGeneratedFiles(project, projectRootPath)
@@ -211,7 +209,7 @@ def main(): Unit =
211209
case "clean" => Command.Clean
212210
case "generate" => Command.Generate
213211
case "generate-strict" => Command.GenerateStrict
214-
case "upstream" => Command.Upstream
212+
case "generate-old-gen" => Command.GenerateOldGen
215213
case "strict" => Command.Strict
216214
case "exit" => Command.Exit
217215
case _ => Command.Exit
@@ -222,18 +220,18 @@ def main(): Unit =
222220
println("Available commands: clean, generate, generate-strict, upstream, strict")
223221
case (Target.All, _) =>
224222
projects.values.foreach(project => processProject(project, cmd))
225-
say("All done, mortal")
223+
say("It is done")
226224
case (Target.Specific(projectName), _) =>
227225
projects.get(projectName) match
228226
case Some(project) =>
229227
processProject(project, cmd)
230-
say("All done, mortal")
228+
say("It is done")
231229
case None =>
232230
System.err.println(s"Project '$projectName' not found. Available projects: ${projects.keys.mkString(", ")}")
233231
sys.exit(1)
234232
catch
235233
case e: Exception =>
236-
say("You dun goofed, Mortal")
234+
say("You dun goofed")
237235
throw e
238236

239237
main()

0 commit comments

Comments
 (0)