aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFuwn <[email protected]>2021-05-05 17:46:31 +0000
committerFuwn <[email protected]>2021-05-05 17:46:31 +0000
commitc74f058799c43c4596ce62f53c04453d24868085 (patch)
treeb3cb1cb237b4a947ca21cf653448b6b92ecec0ff
parentfeat(prompt): null handling and help command (diff)
downloadwhirl-c74f058799c43c4596ce62f53c04453d24868085.tar.xz
whirl-c74f058799c43c4596ce62f53c04453d24868085.zip
feat(make): use cargo-make instead of gnu make
-rw-r--r--Makefile43
-rw-r--r--Makefile.toml55
2 files changed, 55 insertions, 43 deletions
diff --git a/Makefile b/Makefile
deleted file mode 100644
index e45e8a8..0000000
--- a/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# -------------
-# | Variables |
-# -------------
-FLAGS = -d -t # These are just generally useful for development.
-
-# BOTH of these variables will vary depending on your system's configuration, ideally, you should
-# know the correct values for your own system.
-#
-# If you DON'T know the correct values, DO NOT file an issue on GitHub, ask someone within the
-# Whirlsplash Discord server, https://discord.com/invite/8hn6padWF6.
-WORLDS_PATH = "C:\Program Files (x86)\Worlds Inc\WorldsPlayer - Win7\WorldsPlayer.exe"
-WORLDS_RUN = gsudo $(WORLDS_PATH)
-
-# ------------
-# | Wrappers |
-# ------------
-fmt:
- cargo fmt
-
-check:
- cargo check
-
-clippy:
- cargo clippy
-
-# -------------
-# | Executors |
-# -------------
-checkf: fmt check
-
-checkfc: fmt check clippy
-
-help: checkf
- cargo run -- $(FLAGS) help $(ARGS)
-
-run: checkf
- cargo run -- $(FLAGS) run $(ARGS)
-
-# Subject to change depending on different PCs, this is just mine. ~Fuwn
-start_client:
- $(WORLDS_RUN)
-
-runc: start_client run
diff --git a/Makefile.toml b/Makefile.toml
new file mode 100644
index 0000000..1949319
--- /dev/null
+++ b/Makefile.toml
@@ -0,0 +1,55 @@
+# -------------
+# | Variables |
+# -------------
+[env]
+# This variable will vary depending on where you installed Worlds, ideally, you
+# should know the correct value for your own system.
+#
+# If you DON'T know the correct value, DO NOT file an issue on GitHub, ask
+# someone within the Whirlsplash Discord server;
+# https://discord.com/invite/8hn6padWF6.
+#
+# See line 49!
+WORLDS_PATH = "C:\\Program Files (x86)\\Worlds Inc\\WorldsPlayer - Win7\\WorldsPlayer.exe"
+
+# ------------
+# | Wrappers |
+# ------------
+[tasks.fmt]
+command = "cargo"
+args = ["fmt"]
+
+[tasks.check]
+command = "cargo"
+args = ["check"]
+
+[tasks.clippy]
+command = "cargo"
+args = ["clippy"]
+
+# -------------
+# | Executors |
+# -------------
+[tasks.checkf]
+dependencies = ["fmt", "check"]
+
+[tasks.checkfc]
+dependencies = ["fmt", "check", "clippy"]
+
+[tasks.help]
+dependencies = ["checkf"]
+command = "cargo"
+args = ["run", "--", "help"]
+
+[tasks.run]
+dependencies = ["checkf"]
+command = "cargo"
+args = ["run", "--", "run"]
+
+# This task also depends on your system configuration, same goes as read above.
+[tasks.start_client]
+command = "gsudo"
+args = ["${WORLDS_PATH}"]
+
+[tasks.runc]
+dependencies = ["start_client", "run"]