From: Matthew M. <mma...@us...> - 2002-12-10 19:41:13
|
Update of /cvsroot/nant/nant/src/NAnt.DotNetTasks In directory sc8-pr-cvs1:/tmp/cvs-serv11230 Modified Files: LicenseTask.cs Log Message: * Updated documentation * Ensure that assemblies and input/output files are now relative to project base directory Index: LicenseTask.cs =================================================================== RCS file: /cvsroot/nant/nant/src/NAnt.DotNetTasks/LicenseTask.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LicenseTask.cs 23 Nov 2002 00:32:18 -0000 1.2 --- LicenseTask.cs 10 Dec 2002 19:41:10 -0000 1.3 *************** *** 31,34 **** --- 31,46 ---- /// Task to generate a .licence file from a .licx file. /// </summary> + /// <remarks> + /// If no output file is specified, the default filename is the name of the target file with the extension + /// ".licenses" appended. + /// </remarks> + /// <example> + /// <para>Generate the file <c>component.exe.licenses</c> file from <c>component.licx</c>.</para> + /// <code> + /// <![CDATA[ + /// <resx input="component.licx" target="component.exe" /> + /// ]]> + /// </code> + /// </example> [TaskName("license")] public class LicenseTask : Task *************** *** 41,50 **** protected override void ExecuteTask() { ! string strResourceFilename = _output; ! if ( strResourceFilename == null ) ! strResourceFilename = _strTarget + ".licenses"; ! if ( Verbose ) ! Log.WriteLine( "Compiling {0} to {1}...", _input, strResourceFilename ); ArrayList alAssemblies = new ArrayList(); --- 53,78 ---- protected override void ExecuteTask() { ! // Get the input .licx file ! string strLicxFilename = null; ! try { ! strLicxFilename = Project.GetFullPath( _input ); ! } catch ( Exception e ) { ! string msg = String.Format( "Could not determine path from {0}", _input ); ! throw new BuildException( msg, Location, e ); ! } ! // Get the output .licenses file ! string strResourceFilename = null; ! try { ! if ( _output == null ) ! strResourceFilename = Project.GetFullPath( _strTarget + ".licenses" ); ! else ! strResourceFilename = Project.GetFullPath( _output ); ! } catch ( Exception e ) { ! string msg = String.Format( "Could not determine path from output file {0} and target {1}", _output, _strTarget ); ! throw new BuildException( msg, Location, e ); ! } ! ! Log.WriteLine( "Compiling license file {0} to {1} using target {2}", _input, strResourceFilename, _strTarget ); ArrayList alAssemblies = new ArrayList(); *************** *** 57,68 **** try { // See if we've got an absolute path to the assembly ! if ( File.Exists( strAssembly ) ) { ! asm = Assembly.LoadFrom( strAssembly ); } else { ! // No absolute path, ask .NET to load it for us FileInfo fiAssembly = new FileInfo( strAssembly ); asm = Assembly.LoadWithPartialName( Path.GetFileNameWithoutExtension( fiAssembly.Name ) ); --- 85,98 ---- try { + string strRealAssemblyName = Project.GetFullPath( strAssembly ); + // See if we've got an absolute path to the assembly ! if ( File.Exists( strRealAssemblyName ) ) { ! asm = Assembly.LoadFrom( strRealAssemblyName ); } else { ! // No absolute path, ask .NET to load it for us (use the original assembly name) FileInfo fiAssembly = new FileInfo( strAssembly ); asm = Assembly.LoadWithPartialName( Path.GetFileNameWithoutExtension( fiAssembly.Name ) ); *************** *** 82,86 **** // Read in the input file ! using ( StreamReader sr = new StreamReader( _input ) ) { Hashtable htLicenses = new Hashtable(); --- 112,116 ---- // Read in the input file ! using ( StreamReader sr = new StreamReader( strLicxFilename ) ) { Hashtable htLicenses = new Hashtable(); |