From 00d70657904c55a6880dec9860fd37ec26ed9c0e Mon Sep 17 00:00:00 2001 From: Tyler Wilding Date: Wed, 8 Mar 2023 18:18:24 -0500 Subject: [PATCH] goalc: remove deprecated CLI args from goalc and remove empty repo folders (#2301) This gets rid of the `auto-lt` and `auto-dbg` CLI args to `goalc` that have been marked deprecated for a month or so at this point. The behaviour can be replicated via the `startup.gc` file. I also removed `decompiler_out/` and `log/` from the repo, as our C++ code is smart enough to create these directories if they are missing now so they are superfluous --- .gitignore | 6 ++++-- decompiler_out/.gitignore | 2 -- goalc/main.cpp | 25 ------------------------- log/.gitignore | 2 -- 4 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 decompiler_out/.gitignore delete mode 100644 log/.gitignore diff --git a/.gitignore b/.gitignore index f25afd3fa1..2c4f1b0ab4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# logs +/log + # for CMake /Testing @@ -6,8 +9,7 @@ cmake-build-debug/* cmake-build-debug--o0/* .idea/* build/* -decompiler_out/* -decompiler_out2/* +/decompiler_out* logs/* # for vscode/clangd diff --git a/decompiler_out/.gitignore b/decompiler_out/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/decompiler_out/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/goalc/main.cpp b/goalc/main.cpp index d422bf165e..a626dc17c7 100644 --- a/goalc/main.cpp +++ b/goalc/main.cpp @@ -24,8 +24,6 @@ void setup_logging() { } int main(int argc, char** argv) { - bool auto_listen = false; - bool auto_debug = false; bool auto_find_user = false; std::string cmd = ""; std::string username = "#f"; @@ -40,10 +38,6 @@ int main(int argc, char** argv) { app.add_option("-u,--user", username, "Specify the username to use for your user profile in 'goal_src/user/'"); app.add_option("-p,--port", nrepl_port, "Specify the nREPL port. Defaults to 8181"); - app.add_flag("--auto-lt", auto_listen, - "Attempt to automatically connect to the listener on startup"); - app.add_flag("--auto-dbg", auto_debug, - "Attempt to automatically connect to the debugger on startup"); app.add_flag("--user-auto", auto_find_user, "Attempt to automatically deduce the user, overrides '--user'"); app.add_option("-g,--game", game, "The game name: 'jak1' or 'jak2'"); @@ -52,18 +46,6 @@ int main(int argc, char** argv) { app.validate_positionals(); CLI11_PARSE(app, argc, argv); - // Yell about deprecations - if (auto_listen) { - lg::warn( - "--auto-lt will be deprecated, migrate to a 'startup.gc' file in your goal_src/user " - "folder"); - } - if (auto_debug) { - lg::warn( - "--auto-dbg will be deprecated, migrate to a 'startup.gc' file in your goal_src/user " - "folder"); - } - GameVersion game_version = game_name_to_version(game); if (!project_path_override.empty()) { @@ -94,13 +76,6 @@ int main(int argc, char** argv) { } // Load the user's startup file auto startup_file = REPL::load_user_startup_file(username, game_version); - // TODO - deprecate these two flags - if (startup_file.run_before_listen.empty() && (auto_debug || auto_listen)) { - startup_file.run_before_listen.push_back("(lt)"); - } - if (startup_file.run_after_listen.empty() && (auto_debug || auto_listen)) { - startup_file.run_before_listen.push_back("(dbgc)"); - } // Load the user's REPL config auto repl_config = REPL::load_repl_config(username, game_version); diff --git a/log/.gitignore b/log/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/log/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore