Okay, checked in. I merged the changes with your Framework changes and everything went smoothly.

Ian MacLean wrote:

Matthew Mastracci wrote:

I've manually applied Aaron's changes to my tree, cleaned up the style to match the NAnt coding style and attached it to this message.

If noone objects, I'll check this in.


Looks ok to me.


------------------------------------------------------------------------

? patch.txt
Index: ResGenTask.cs
===================================================================
RCS file: /cvsroot/nant/nant/src/NAnt.DotNetTasks/ResGenTask.cs,v
retrieving revision 1.4
diff -u -r1.4 ResGenTask.cs
--- ResGenTask.cs 25 Feb 2003 23:15:34 -0000 1.4
+++ ResGenTask.cs 3 Mar 2003 23:33:52 -0000
@@ -58,7 +58,7 @@
/// <summary>Name of the resource file to output.</summary>
[TaskAttribute("output", Required=false)]
- public string Output { get { return _output; } set {_output = value;} }
+ public string Output { get { return (_output == null) ? String.Empty : _output; } set {_output = value;} }
/// <summary>The target type ( usually resources).</summary>
[TaskAttribute("target", Required=false)]
@@ -66,7 +66,7 @@
/// <summary>The directory to which outputs will be stored.</summary>
[TaskAttribute("todir", Required=false)]
- public string ToDirectory { get { return _toDir; } set {_toDir = value;} }
+ public string ToDirectory { get { return (_toDir == null) ? BaseDirectory : _toDir; } set {_toDir = value;} }
/// <summary>Takes a list of .resX or .txt files to convert to .resources files.</summary>
[FileSet("resources")]
@@ -104,35 +104,27 @@
_arguments += s;
}
+ // Process a single file or file group
protected override void ExecuteTask() {
_arguments = "";
if (Resources.FileNames.Count > 0) {
foreach ( string filename in Resources.FileNames ) {
- string outputFile = Path.ChangeExtension( filename, TargetExt );
+ string outputFile = getOutputFile(filename);
+
if (NeedsCompiling (filename, outputFile)) {
if (_arguments.Length == 0) {
AppendArgument ("/compile");
}
- AppendArgument (String.Format(CultureInfo.InvariantCulture, " \"{0},{1}\"", filename, outputFile));
+ AppendArgument (String.Format(" \"{0},{1}\"", filename, outputFile));
}
}
- } else {
// Single file situation
if (Input == null)
throw new BuildException("Resource generator needs either an input attribute, or a non-empty fileset.", Location);
- +
string inputFile = Path.GetFullPath(Path.Combine (BaseDirectory, Input));
- string outputFile;
- - if (Output != null) {
- if (ToDirectory == null)
- ToDirectory = BaseDirectory;
- - outputFile = Path.GetFullPath(
- Path.Combine (ToDirectory, Output));
- } else
- outputFile = Path.ChangeExtension (inputFile, TargetExt );
+ string outputFile = getOutputFile(inputFile);
if (NeedsCompiling (inputFile, outputFile)) {
AppendArgument (String.Format ("\"{0}\" \"{1}\"", inputFile, outputFile));
@@ -143,6 +135,14 @@
// call base class to do the work
base.ExecuteTask();
}
+ }
+ + // Determine the full path and extension for the output file
+ private string getOutputFile(string filename) {
+ FileInfo fileInfo = new FileInfo(filename);
+ string outputFile = Path.Combine (ToDirectory, Output) + fileInfo.Name;
+ outputFile = Path.ChangeExtension( outputFile, TargetExt );
+ return outputFile;
}
/// <summary>





-------------------------------------------------------
This SF.net email is sponsored by: Etnus, makers of TotalView, The debugger for complex code. Debugging C/C++ programs can leave you feeling lost and disoriented. TotalView can help you find your way. Available on major UNIX and Linux platforms. Try it free. www.etnus.com
_______________________________________________
Nant-developers mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/nant-developers







-------------------------------------------------------
This SF.net email is sponsored by: Etnus, makers of TotalView, The debugger for complex code. Debugging C/C++ programs can leave you feeling lost and disoriented. TotalView can help you find your way. Available on major UNIX and Linux platforms. Try it free. www.etnus.com
_______________________________________________
Nant-developers mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/nant-developers

Reply via email to