Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

goalc: remove deprecated CLI args from goalc and remove empty repo folders #2301

Merged
merged 3 commits into from Mar 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions .gitignore
@@ -1,3 +1,6 @@
# logs
/log

# for CMake
/Testing

Expand All @@ -6,8 +9,7 @@ cmake-build-debug/*
cmake-build-debug--o0/*
.idea/*
build/*
decompiler_out/*
decompiler_out2/*
/decompiler_out*
logs/*

# for vscode/clangd
Expand Down
2 changes: 0 additions & 2 deletions decompiler_out/.gitignore

This file was deleted.

25 changes: 0 additions & 25 deletions goalc/main.cpp
Expand Up @@ -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";
Expand All @@ -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'");
Expand All @@ -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()) {
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 0 additions & 2 deletions log/.gitignore

This file was deleted.