JSDOC/PackerRun.vala

[gnome.introspection-doc-generator] / JSDOC / PackerRun.vala

diff --git a/JSDOC/PackerRun.vala b/JSDOC/PackerRun.vala
index fdb972c..a5106b5 100644 (file)
--- a/JSDOC/PackerRun.vala
+++ b/JSDOC/PackerRun.vala
@@ -18,12 +18,12 @@ namespace JSDOC
        {
                const OptionEntry[] options = {
                
-                       { "jsfile", 0, 0, OptionArg.FILENAME_ARRAY, ref opt_files ,"add a file to compile", null },
-                       { "target", 0, 0, OptionArg.STRING, ref opt_target, "Target File to write (eg. roojs.js)", null },
-                       { "debug-target", 0, 0, OptionArg.STRING, ref opt_debug_target, "Target File to write debug code (eg. roojs-debug.js)", null },
-                       { "tmpdir", 0, 0, OptionArg.STRING, ref opt_tmpdir, "Temporary Directory to use", null },
+                       { "jsfile", 'f', 0, OptionArg.FILENAME_ARRAY, ref opt_files ,"add a file to compile", null },
+                       { "target", 't', 0, OptionArg.STRING, ref opt_target, "Target File to write (eg. roojs.js)", null },
+                       { "debug-target", 'T', 0, OptionArg.STRING, ref opt_debug_target, "Target File to write debug code (eg. roojs-debug.js)", null },
+                       { "tmpdir", 'm', 0, OptionArg.STRING, ref opt_tmpdir, "Temporary Directory to use", null },
 
-                       { "index-files", 0, 0, OptionArg.FILENAME_ARRAY, ref opt_files_from ,"files that contain listing of files to compile", null },           
+                       { "index-files", 'i', 0, OptionArg.FILENAME_ARRAY, ref opt_files_from ,"files that contain listing of files to compile", null },                 
  
                        { "debug", 0, 0, OptionArg.NONE, ref opt_debug, "Show debug messages", null },
                        // fixme -- keepwhite.. cleanup 
@@ -35,8 +35,8 @@ namespace JSDOC
                public static string opt_tmpdir = "";
                
                
-               public static string[]? opt_files = null;
-               public static string[]? opt_files_from = null;
+               private static string[]? opt_files = null;
+               private static string[]? opt_files_from = null;
                public static bool opt_debug = false;
                
 
@@ -78,8 +78,11 @@ namespace JSDOC
                        // now run the Packer...
                        var p = new Packer(opt_target, opt_debug_target);
                        if (opt_files != null) {
-                               GLib.debug("Adding Files %d", opt_files.length);
-                               p.loadFiles(opt_files);
+                               GLib.debug("Adding File %s", string.join(", ",opt_files));
+                               foreach (string f in opt_files) {
+                                       GLib.debug("Adding File %s", f);
+                                       p.loadFile(f);
+                               }
                        } else {
                                GLib.debug("No files added");
                        }