diff --git a/CHANGELOG.md b/CHANGELOG.md index bd4ffceb..74e37072 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,8 @@ All notable changes to this project will be documented in this file. - Add `protect` macro. - Add `root-env` to get the root environment table. - Change marshalling protocol with regard to abstract types. +- Add `show-paths` to `jpm`. +- Add several default patterns, like `:d` and `:s+`, to PEGs. - Update `jpm` path settings to make using `jpm` easier on non-global module trees. - Numerous small bug fixes and usability improvements. diff --git a/auxbin/jpm b/auxbin/jpm index f5437bd4..5d6e5c67 100755 --- a/auxbin/jpm +++ b/auxbin/jpm @@ -871,6 +871,7 @@ Subcommands are: and install the current project. uninstall (module) : uninstall a module. If no module is given, uninstall the module defined by the current directory. + show-paths : prints the paths that will be used to install things. clean : remove any generated files or artifacts test : run tests. Tests should be .janet files in the test/ directory relative to project.janet. deps : install dependencies for the current project. @@ -901,6 +902,14 @@ Flags are: [] (print help)) +(defn- show-paths + [] + (print "binpath: " (dyn :binpath JANET_BINPATH)) + (print "modpath: " (dyn :modpath JANET_MODPATH)) + (print "libpath: " (dyn :libpath JANET_LIBPATH)) + (print "headerpath: " (dyn :headerpath JANET_HEADERPATH)) + (print "syspath: " (dyn :syspath))) + (defn- build [] (local-rule "build")) @@ -952,6 +961,7 @@ Flags are: "test" test "help" help "deps" deps + "show-paths" show-paths "clear-cache" clear-cache "run" local-rule "rules" list-rules diff --git a/jpm.1 b/jpm.1 index e300dcff..2e749d77 100644 --- a/jpm.1 +++ b/jpm.1 @@ -139,6 +139,10 @@ like make. run will run a single rule or build a single file. .BR rules List all rules that can be run via run. This is useful for exploring rules in the project. +.TP +.BR show-paths +Show all of the paths used when installing and building artifacts. + .TP .BR update-pkgs Update the package listing by installing the 'pkgs' package. Same as jpm install pkgs