X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FPackerRun.vala;h=99d379e6c4254774de0a1371525ae442d4b0f163;hb=2010a68dd785effd953b629d2546d077e77e6e00;hp=bbd4a425fa6d309bf87f7fe116f3f24b2e66e19c;hpb=9e26fe0d8f0e7a2d6339d26251423605ab22dca7;p=gnome.introspection-doc-generator

diff --git a/JSDOC/PackerRun.vala b/JSDOC/PackerRun.vala
index bbd4a42..99d379e 100644
--- a/JSDOC/PackerRun.vala
+++ b/JSDOC/PackerRun.vala
@@ -7,12 +7,7 @@
 namespace JSDOC
 {
 	// --------------- <<<<<<< <MAIN HERE....
-	public static int main(string[] args) 
-	{
-		new PackerRun(args);
-		return 0;
-	}
-
+	
 
 	class PackerRun : Application  
 	{
@@ -20,8 +15,9 @@ namespace JSDOC
 		public static string opt_debug_target = "";
 		public static string opt_tmpdir = "";
 		
-		
+		[CCode (array_length = false, array_null_terminated = true)]
 		private static string[]? opt_files = null;
+		[CCode (array_length = false, array_null_terminated = true)]
 		private static string[]? opt_files_from = null;
 		public static bool opt_debug = false;
 		
@@ -35,13 +31,43 @@ namespace JSDOC
 			{ "tmpdir", 'm', 0, OptionArg.STRING, ref opt_tmpdir, "Temporary Directory to use", null },
 
 			{ "index-files", 'i', 0, OptionArg.FILENAME_ARRAY, ref opt_files_from ,"files that contain listing of files to compile", null },		 
- 
+			{ "keep-whitespace", 'w', 0, OptionArg.NONE, ref opt_keep_whitespace, "Keep whitespace", null },
 			{ "debug", 0, 0, OptionArg.NONE, ref opt_debug, "Show debug messages", null },
 			// fixme -- keepwhite.. cleanup 
 			
 			{ null }
 		};
+		public static int main(string[] args) 
+		{
+			foreach(var a in args) {
+				print("ARG: %s\n", a);
+			}
+			
+			var opt_context = new OptionContext ("JSDOC Packer");
+			
+				try {
+					opt_context.set_help_enabled (true);
+					opt_context.add_main_entries (options, null);
+					if (!opt_context.parse ( ref args)) {
+						print("options parse error");
+						GLib.Process.exit(Posix.EXIT_FAILURE);
+					}
+
+				
+					 
+				
+				} catch (OptionError e) {
+					stdout.printf ("error: %s\n", e.message);
+					stdout.printf ("Run '%s --help' to see a full list of available command line options.\n %s", 
+								 args[0], opt_context.get_help(true,null));
+					GLib.Process.exit(Posix.EXIT_FAILURE);
+					 
+				}
 		
+			new PackerRun(args);
+			return 0;
+		}
+
 
 	
 		public PackerRun (string[] args)
@@ -49,25 +75,11 @@ namespace JSDOC
 		
 			Object(
 			    application_id: "org.roojs.jsdoc.packerrun",
-				flags: ApplicationFlags.FLAGS_NONE
+				flags: ApplicationFlags.HANDLES_COMMAND_LINE 
 			);
 					 
 			 
-			var opt_context = new OptionContext ("JSDOC Packer");
 			
-			try {
-				opt_context.set_help_enabled (true);
-				opt_context.add_main_entries (options, null);
-				opt_context.parse (ref args);
-				 
-				
-			} catch (OptionError e) {
-				stdout.printf ("error: %s\n", e.message);
-				stdout.printf ("Run '%s --help' to see a full list of available command line options.\n %s", 
-							 args[0], opt_context.get_help(true,null));
-				GLib.Process.exit(Posix.EXIT_FAILURE);
-				 
-			}
 			// what's required...
 			if (opt_debug) {
 				GLib.Log.set_handler(null, 
@@ -80,7 +92,7 @@ namespace JSDOC
 			// now run the Packer...
 			var p = new Packer(opt_target, opt_debug_target);
 			if (opt_files != null) {
-				GLib.debug("Adding File %s", string.join(", ",opt_files));
+			 
 				foreach (string f in opt_files) {
 					GLib.debug("Adding File %s", f);
 					p.loadFile(f);