Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:frate-dev/frate into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
DeaSTL committed Dec 12, 2023
2 parents 8487470 + 0a429f1 commit 3c10b82
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion build
Submodule build updated from 5d6a21 to 48979c
5 changes: 1 addition & 4 deletions src/Command/Actions/Add.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,12 @@ namespace Frate::Command::Add {
},
Handler{
.aliases = {"lib","l"},
.positional_args = {"library-name"},
.positional_args = {"lib"},
.docs = "Add a library to link to your project",
.callback = [inter]() {
//TODO implement library
Library::options(inter);
// Libraries::add(inter);
return Library::add(inter);
},
.implemented = false,
.requires_project = true,
},
Handler{
Expand Down
2 changes: 1 addition & 1 deletion src/Command/Actions/List.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ namespace Frate::Command::List{
},
Handler{
.aliases =
{"libraries","l"},
{"libraries", "lib", "l"},
.docs = "List flags",
.callback = [inter]() {
return Library::list(inter);
Expand Down
4 changes: 2 additions & 2 deletions src/Command/Actions/Remove.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ namespace Frate::Command::Remove {
},
},
{
.aliases = {"libraries", "l"},
.positional_args = {"mode"},
.aliases = {"libraries", "l", "lib"},
.positional_args = {"lib"},
.docs = "Remove a mode from the project",
.callback = [inter]() {
Library::options(inter);
Expand Down
2 changes: 2 additions & 0 deletions src/Command/Helpers/Project.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ namespace Frate::Command {
project_description = j["project_description"];
default_mode = j["default_mode"];
keywords = j["keywords"];
libs = j["libs"];
for (auto &dep : j["dependencies"]) {
Package d;
d.name = dep["name"].is_null() ? "" : dep["name"].is_null() ? "" : dep["name"];
Expand Down Expand Up @@ -165,6 +166,7 @@ namespace Frate::Command {
new_json["project_description"] = project_description;
new_json["toolchains"] = toolchains;
new_json["prompts"] = json::object();
new_json["libs"] = libs;
for(auto [key, value] : prompts){
json prompt;
prompt["value"] = value.value;
Expand Down
1 change: 1 addition & 0 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ namespace Frate {
Utils::Info info = Utils::Info();
Utils::Warning warning = Utils::Warning();
}

int main(int argc, char **argv) {
// LUCAS MAKE SURE YOU INITIALIZE YOUR F@*KING STRUCT YOU TW@T
//std::shared_ptr<Command::Context> ctx = std::make_shared<Command::Context>();
Expand Down

0 comments on commit 3c10b82

Please sign in to comment.