Wed Mar 5 11:35:54 CET 2003 Paolo Molaro <lupus@ximian.com>

	* monoresgen.cs: patch from Ian MacLean <ianm@ActiveState.com>
	to add the /compile option.

svn path=/trunk/mcs/; revision=12211

diff --git a/mcs/monoresgen/ChangeLog b/mcs/monoresgen/ChangeLog
index 22700003f77899f2ec27f8f72fab2391e8b0f287..6441a0f51cceecd252efe85e39d2ca0f34dbfbea 100755 (executable)
--- a/mcs/monoresgen/ChangeLog
+++ b/mcs/monoresgen/ChangeLog
@@ -1,3 +1,9 @@
+
+Wed Mar 5 11:35:54 CET 2003 Paolo Molaro <lupus@ximian.com>
+
+       * monoresgen.cs: patch from Ian MacLean <ianm@ActiveState.com>
+       to add the /compile option.
+
 2003/01/22  Nick Drochak <ndrochak@gol.com>
 
        * makefile: assume csc for makefile, and mcs for makfile.gnu.

diff --git a/mcs/monoresgen/monoresgen.cs b/mcs/monoresgen/monoresgen.cs
index e6dfbfcf914d0d6c866446e422fcd822fb6c9503..7caf846aa66464b6265b1481b9a92fdcf5ddb3d6 100755 (executable)
--- a/mcs/monoresgen/monoresgen.cs
+++ b/mcs/monoresgen/monoresgen.cs
@@ -42,13 +42,19 @@ class ResGen {
        }
 
        static void Usage () {
-               Console.WriteLine ("Mono Resource Generator version 0.1");
-               Console.WriteLine ("Usage:");
-               Console.WriteLine ("\tmonoresgen source.ext [dest.ext]");
-               Console.WriteLine ();
-               Console.WriteLine ("Convert a resource file from one format to another.");
-               Console.WriteLine ("The currently supported formats are: '.txt' '.resources' '.resx'.");
-               Console.WriteLine ("If the destination file is not specified, source.resources will be used.");
+               string Usage = @"Mono Resource Generator version 0.1
+Usage:
+               monoresgen source.ext [dest.ext]
+               monoresgen /compile source.ext[,dest.resources] [...]
+
+Convert a resource file from one format to another.
+The currently supported formats are: '.txt' '.resources' '.resx'.
+If the destination file is not specified, source.resources will be used.
+The /compile option takes a list of .resX or .txt files to convert to
+.resources files in one bulk operation, replacing .ext with .resources for
+the output file name.
+";
+               Console.WriteLine( Usage );
        }
        
        static IResourceReader GetReader (Stream stream, string name) {
@@ -83,46 +89,81 @@ class ResGen {
                }
        }
        
-       static int Main (string[] args) {
+       static int CompileResourceFile(string sname, string dname ) {
+               try {
                FileStream source, dest;
-               string sname, dname;
                IResourceReader reader;
                IResourceWriter writer;
 
-               if (args.Length == 1) {
-                       sname = args [0];
-                       dname = Path.ChangeExtension (sname, "resources");
-               } else if (args.Length != 2) {
-                       Usage ();
-                       return 1;
-               } else {
-                       sname = args [0];
-                       dname = args [1];
-               }
-
-               try {
                        source = new FileStream (sname, FileMode.Open, FileAccess.Read);
                        dest = new FileStream (dname, FileMode.OpenOrCreate, FileAccess.Write);
 
                        reader = GetReader (source, sname);
                        writer = GetWriter (dest, dname);
 
+                       int rescount = 0;
                        foreach (DictionaryEntry e in reader) {
+                               rescount++;
                                object val = e.Value;
                                if (val is string)
                                        writer.AddResource ((string)e.Key, (string)e.Value);
                                else
                                        writer.AddResource ((string)e.Key, e.Value);
                        }
+                       Console.WriteLine( "Read in {0} resources from '{1}'", rescount, sname );
 
                        reader.Close ();
                        writer.Close ();
+                       Console.WriteLine("Writing resource file...  Done.");
                } catch (Exception e) {
                        Console.WriteLine ("Error: {0}", e.Message);
                        return 1;
                }
                return 0;
        }
+       
+       static int Main (string[] args) {
+               string sname = "", dname = ""; 
+               if ((int) args.Length < 1 || args[0] == "-h" || args[0] == "-?" || args[0] == "/h" || args[0] == "/?") {
+                         Usage();
+                         return 1;
+               }               
+               if (args[0] == "/compile" || args[0] == "-compile") {
+                       for ( int i=1; i< args.Length; i++ ) {                          
+                               if ( args[i].IndexOf(",") != -1 ){
+                                       string[] pair =  args[i].Split(',');
+                                       sname = pair[0]; 
+                                       dname = pair[1];
+                                       if (dname == ""){
+                                               Console.WriteLine(@"error: You must specify an input & outfile file name like this:");
+                                               Console.WriteLine("inFile.txt,outFile.resources." );
+                                               Console.WriteLine("You passed in '{0}'.", args[i] );
+                                               return 1;
+                                       }
+                               } else {
+                                       sname = args[i]; 
+                                       dname = Path.ChangeExtension (sname, "resources");
+                               }
+                               int ret = CompileResourceFile( sname, dname );
+                               if (ret != 0 ) {
+                                       return ret;
+                               }
+                       }
+                       return 0;
+               
+               }
+               else if (args.Length == 1) {
+                       sname = args [0];
+                       dname = Path.ChangeExtension (sname, "resources");
+               } else if (args.Length != 2) {
+                       Usage ();
+                       return 1;
+               } else {
+                       sname = args [0];
+                       dname = args [1];                       
+               }               
+               return CompileResourceFile( sname, dname );
+       }
 }
 
 class TxtResourceWriter : IResourceWriter {