Help restructure

Makefile

@@ -29,7 +29,7 @@ $(OUT_DIR):
 $(OUT_DIR)/Cmd:
 	mkdir -p $@
 
-$(PROJ_NAME): $(OUT_DIR)/Cmd/Build.o $(OUT_DIR)/Cmd/Test.o $(OUT_DIR)/BuildConfig.o $(OUT_DIR)/Logger.o $(OUT_DIR)/TermColor.o $(OUT_DIR)/main.o
+$(PROJ_NAME): $(OUT_DIR)/Cmd/Build.o $(OUT_DIR)/Cmd/Test.o $(OUT_DIR)/Cmd/Run.o $(OUT_DIR)/BuildConfig.o $(OUT_DIR)/Logger.o $(OUT_DIR)/TermColor.o $(OUT_DIR)/main.o
 	$(CC) $(CFLAGS) $^ -o $@
 
 $(OUT_DIR)/TermColor.o: src/TermColor.cc src/TermColor.hpp
@@ -44,6 +44,9 @@ $(OUT_DIR)/Cmd/Build.o: src/Cmd/Build.cc src/Cmd/Build.hpp src/Rustify.hpp src/A
 $(OUT_DIR)/Cmd/Test.o: src/Cmd/Test.cc src/Cmd/Test.hpp src/Rustify.hpp src/Algos.hpp src/Logger.hpp src/TermColor.hpp
 	$(CC) $(CFLAGS) -c $< -o $@
 
+$(OUT_DIR)/Cmd/Run.o: src/Cmd/Run.cc src/Cmd/Run.hpp src/Rustify.hpp src/Algos.hpp src/Logger.hpp src/TermColor.hpp
+	$(CC) $(CFLAGS) -c $< -o $@
+
 $(OUT_DIR)/BuildConfig.o: src/BuildConfig.cc src/BuildConfig.hpp
 	$(CC) $(CFLAGS) -c $< -o $@
 

src/Cmd/Build.cc

@@ -2,7 +2,6 @@
 
 #include "../BuildConfig.hpp"
 
-#include <cstdlib>
 #include <iostream>
 
 int build(Vec<String> args) {
@@ -11,12 +10,11 @@ int build(Vec<String> args) {
 }
 
 void buildHelp() {
-  std::cout << "poac-build" << '\n';
+  std::cout << buildDesc << '\n';
   std::cout << '\n';
-  std::cout << "USAGE:" << '\n';
-  std::cout << "    poac build [OPTIONS]" << '\n';
+  std::cout << "Usage: poac build [OPTIONS]" << '\n';
   std::cout << '\n';
-  std::cout << "OPTIONS:" << '\n';
+  std::cout << "Options:" << '\n';
   std::cout << "    -d, --debug\t\tBuild with debug information (default)"
             << '\n';
   std::cout << "    -r, --release\tBuild with optimizations" << '\n';

src/Cmd/Build.hpp

@@ -2,5 +2,8 @@
 
 #include "../Rustify.hpp"
 
+static inline constexpr StringRef buildDesc =
+    "Compile a local package and all of its dependencies";
+
 int build(Vec<String> args);
 void buildHelp();

src/Cmd/Run.cc

@@ -0,0 +1,33 @@
+#include "Run.hpp"
+
+#include "../BuildConfig.hpp"
+#include "../Logger.hpp"
+
+#include <cstdlib>
+#include <iostream>
+
+int run(Vec<String> args) {
+  const String outDir = emitMakefile(args);
+  const int exitCode = std::system(("make -C " + outDir).c_str());
+  if (exitCode != EXIT_SUCCESS) {
+    Logger::error("Build failed with exit code ", exitCode);
+    return exitCode;
+  }
+
+  const String projectName = "poac"; // TODO: get from poac.toml
+  return std::system((outDir + "/" + projectName).c_str());
+}
+
+void runHelp() {
+  std::cout << runDesc << '\n';
+  std::cout << '\n';
+  std::cout << "Usage: poac run [OPTIONS] [args]..." << '\n';
+  std::cout << '\n';
+  std::cout << "Arguments:" << '\n';
+  std::cout << "    [args]...\t\tArguments passed to the program" << '\n';
+  std::cout << '\n';
+  std::cout << "Options:" << '\n';
+  std::cout << "    -d, --debug\t\tBuild with debug information (default)"
+            << '\n';
+  std::cout << "    -r, --release\tBuild with optimizations" << '\n';
+}

src/Cmd/Run.hpp

@@ -0,0 +1,8 @@
+#pragma once
+
+#include "../Rustify.hpp"
+
+static inline constexpr StringRef runDesc = "Build and execute src/main.cc";
+
+int run(Vec<String> args);
+void runHelp();

src/Cmd/Test.cc

@@ -10,12 +10,11 @@ int test(Vec<String> args) {
 }
 
 void testHelp() {
-  std::cout << "poac-test" << '\n';
+  std::cout << testDesc << '\n';
   std::cout << '\n';
-  std::cout << "USAGE:" << '\n';
-  std::cout << "    poac test [OPTIONS]" << '\n';
+  std::cout << "Usage: poac test [OPTIONS]" << '\n';
   std::cout << '\n';
-  std::cout << "OPTIONS:" << '\n';
+  std::cout << "Options:" << '\n';
   std::cout << "    -d, --debug\t\tTest with debug information (default)"
             << '\n';
   std::cout << "    -r, --release\tTest with optimizations" << '\n';

src/Cmd/Test.hpp

@@ -2,5 +2,7 @@
 
 #include "../Rustify.hpp"
 
+static inline constexpr StringRef testDesc = "Run the tests of a local package";
+
 int test(Vec<String> args);
 void testHelp();

src/main.cc

@@ -1,4 +1,5 @@
 #include "Cmd/Build.hpp"
+#include "Cmd/Run.hpp"
 #include "Cmd/Test.hpp"
 #include "Logger.hpp"
 #include "Rustify.hpp"
@@ -13,28 +14,27 @@ int help(Vec<String> args) {
     std::cout << "poac " << POAC_VERSION << '\n';
     std::cout << "A package manager and build system for C++" << '\n';
     std::cout << '\n';
-    std::cout << "USAGE:" << '\n';
-    std::cout << "    poac <SUBCOMMAND> [OPTIONS]" << '\n';
+    std::cout << "Usage: poac [OPTIONS] [COMMAND]" << '\n';
     std::cout << '\n';
-    std::cout << "OPTIONS:" << '\n';
+    std::cout << "Options:" << '\n';
     std::cout << "    -v, --version\tPrint version info and exit" << '\n';
     std::cout << "    --verbose\t\tUse verbose output" << '\n';
     std::cout << "    -q, --quiet\t\tNo output printed to stdout" << '\n';
     std::cout << '\n';
-    std::cout << "SUBCOMMANDS:" << '\n';
+    std::cout << "Commands:" << '\n';
     std::cout
         << "    help\tPrints this message or the help of the given subcommand(s)"
         << '\n';
-    std::cout
-        << "    build\tCompile a local package and all of its dependencies"
-        << '\n';
-    std::cout << "    test\tRun the tests of a local package" << '\n';
+    std::cout << "    build\t" << buildDesc << '\n';
+    std::cout << "    test\t" << testDesc << '\n';
+    std::cout << "    run\t" << runDesc << '\n';
     return EXIT_SUCCESS;
   }
 
   HashMap<StringRef, Fn<void()>> helps;
   helps["build"] = buildHelp;
   helps["test"] = testHelp;
+  helps["run"] = runHelp;
 
   StringRef subcommand = args[0];
   if (helps.count(subcommand) == 0) {
@@ -79,6 +79,7 @@ int main(int argc, char* argv[]) {
   cmds["help"] = help;
   cmds["build"] = build;
   cmds["test"] = test;
+  cmds["run"] = run;
 
   StringRef subcommand = args[0];
   if (cmds.count(subcommand) == 0) {