tools: generate logs in a selected directory

Signed-off-by: Jean-Sebastien Gelinas <calestar@gmail.com>
Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/src/abstracttool.nit b/src/abstracttool.nit
index 35ba6fe..350d231 100644 (file)
--- a/src/abstracttool.nit
+++ b/src/abstracttool.nit
@@ -79,27 +79,26 @@ special ToolContext
        fun dump_context_info
        do
                for mod in module_hierarchy do
-                       mod.dump_module_info
+                       mod.dump_module_info(log_directory)
                end     
                var tab = new Array[MMModule]
                tab.add_all(module_hierarchy)
                var name = module_hierarchy.select_smallests(tab).join("-")
 
-               var f = new OFStream.open("{name}.full_class_hierarchy.new.dot")
+               var f = new OFStream.open("{log_directory}/{name}.full_class_hierarchy.new.dot")
                        f.write(class_hierarchy.to_dot)
                f.close
 
-               f = new OFStream.open("{name}.module_hierarchy.new.dot")
+               f = new OFStream.open("{log_directory}/{name}.module_hierarchy.new.dot")
                        f.write(module_hierarchy.to_dot)
                f.close
        end
 end
 
 redef class MMModule
-       fun dump_module_info
+       fun dump_module_info(directory: String)
        do
-               var p = location.file.file_path
-               var fname = "{p}/{name}"
+               var fname = "{directory}/{name}"
                var f = new OFStream.open("{fname}.class_hierarchy.new.dot")
                f.write(class_specialization_hierarchy.to_dot)
                f.close

diff --git a/src/mmloader.nit b/src/mmloader.nit
index 60e84f1..04c3a98 100644 (file)
--- a/src/mmloader.nit
+++ b/src/mmloader.nit
@@ -55,6 +55,9 @@ special MMContext
        # Number of warnings
        readable var _warning_count: Int = 0
 
+       # Directory where to generate log files
+       readable var _log_directory: String = "logs"
+
        # Messages
        var _messages: Array[Message] = new Array[Message]
        var _message_sorter: ComparableSorter[Message] = new ComparableSorter[Message]
@@ -123,9 +126,12 @@ special MMContext
        # Option --path
        readable var _opt_path: OptionArray = new OptionArray("Set include path for loaders (may be used more than once)", "-I", "--path")
 
-       # Option --lop
+       # Option --log
        readable var _opt_log: OptionBool = new OptionBool("Generate various log files", "--log")
-       
+
+       # Option --log-dir
+       readable var _opt_log_dir: OptionString = new OptionString("Directory where to generate log files", "--log-dir")
+
        # Option --only-metamodel
        readable var _opt_only_metamodel: OptionBool = new OptionBool("Stop after meta-model processing", "--only-metamodel")
 
@@ -147,7 +153,7 @@ special MMContext
        init
        do
                super
-               option_context.add_option(opt_warn, opt_path, opt_log, opt_only_parse, opt_only_metamodel, opt_help, opt_version, opt_verbose)
+               option_context.add_option(opt_warn, opt_path, opt_log, opt_log_dir, opt_only_parse, opt_only_metamodel, opt_help, opt_version, opt_verbose)
        end
 
        # Parse and process the options given on the command line
@@ -175,6 +181,12 @@ special MMContext
 
                var libname = "{sys.program_name.dirname}/../lib"
                if libname.file_exists then paths.add(libname)
+
+               if opt_log_dir.value != null then _log_directory = opt_log_dir.value.as(not null)
+               if _opt_log.value then
+                       # Make sure the output directory exists
+                       log_directory.mkdir
+               end
        end
 
        # Load and process a module in a directory (or a parent directory).

diff --git a/tests/sav/nitdoc.sav b/tests/sav/nitdoc.sav
index 0eae99b..96a3837 100644 (file)
--- a/tests/sav/nitdoc.sav
+++ b/tests/sav/nitdoc.sav
@@ -2,6 +2,7 @@ usage: nitdoc [options] file...
   -W, --warn         Show warnings
   -I, --path         Set include path for loaders (may be used more than once)
   --log              Generate various log files
+  --log-dir          Directory where to generate log files
   --only-parse       Only proceed to parse step of loaders
   --only-metamodel   Stop after meta-model processing
   -h, -?, --help     Show Help (This screen)