X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FPackerRun.vala;h=f14999727d6b7f26d7bb136d8ba2a19b7b1a7caf;hb=55f8d00207a54cf3c1939cae097c2691cb8cf93c;hp=5e963050aad47ff57a02305a8ba3c9972a62b156;hpb=7a8f3c6c246570a43e38169bb45f79c65392dc19;p=gnome.introspection-doc-generator

diff --git a/JSDOC/PackerRun.vala b/JSDOC/PackerRun.vala
index 5e96305..f149997 100644
--- a/JSDOC/PackerRun.vala
+++ b/JSDOC/PackerRun.vala
@@ -7,38 +7,66 @@
 namespace JSDOC
 {
 	// --------------- <<<<<<< <MAIN HERE....
-	public static int main(string[] args) 
-	{
-		new PackerRun(args);
-		return 0;
-	}
-
+	
 
 	class PackerRun : Application  
 	{
+		public static string opt_target = "";
+		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;
+		public static bool opt_keep_whitespace = false;	
+
+		
 		const OptionEntry[] options = {
 		
-			
-			{ "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 },
-			{ "file", 0, 0, OptionArg.STRING_ARRAY, ref opt_files ,"add a file to compile", null },
-			{ "index-files", 0, 0, OptionArg.STRING_ARRAY, ref opt_files_from ,"files that contain listing of files to compile", 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", '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 string opt_target = "";
-		public static string opt_debug_target = "";
-		public static string opt_tmpdir = "";
-		
-		
-		public static string[] opt_files;
-		public static string opt_files_from = "";
-		public static bool opt_debug = false;
+		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;
+		}
 
 
 	
@@ -47,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, 
@@ -77,9 +91,15 @@ namespace JSDOC
 			
 			// now run the Packer...
 			var p = new Packer(opt_target, opt_debug_target);
-			if (opt_files.length > 0) {
-				GLib.debug("Adding Files");
-				p.loadFiles(opt_files);
+			p.whitespace = !opt_keep_whitespace;
+			
+			
+			if (opt_files != null) {
+			 
+				foreach (string f in opt_files) {
+					GLib.debug("Adding File %s", f);
+					p.loadFile(f);
+				}
 			} else {
 				GLib.debug("No files added");
 			}