Menu
▾
▴
[nant-commits] CVS: nant/src/NAnt.VSNet ManagedProjectBase.cs,1.27,1.28
|
From: Gert D. <dri...@us...> - 2005-11-30 09:46:45
|
Update of /cvsroot/nant/nant/src/NAnt.VSNet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3757/src/NAnt.VSNet Modified Files: ManagedProjectBase.cs Log Message: Unregister previous project output for COM interop before checking if project output needs to be rebuilt Register project output for COM interop even if project output was not updated (rebuilt) Register type library in project output directory instead of type library in object directory. Fixes bug #1369505. Index: ManagedProjectBase.cs =================================================================== RCS file: /cvsroot/nant/nant/src/NAnt.VSNet/ManagedProjectBase.cs,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** ManagedProjectBase.cs 5 Nov 2005 08:48:48 -0000 1.27 --- ManagedProjectBase.cs 30 Nov 2005 09:46:37 -0000 1.28 *************** *** 298,304 **** // add type library if (projectConfig.RegisterForComInterop) { ! string typelib = Path.ChangeExtension(projectConfig.BuildPath, ".tlb"); ! if (!outputFiles.ContainsKey(typelib)) { ! outputFiles.Add(typelib, Path.GetFileName(typelib)); } } --- 298,304 ---- // add type library if (projectConfig.RegisterForComInterop) { ! string typeLib = GetTypeLibraryPath(projectConfig); ! if (!outputFiles.ContainsKey(typeLib)) { ! outputFiles.Add(typeLib, Path.GetFileName(typeLib)); } } *************** *** 336,339 **** --- 336,351 ---- } + // check if we need to unregister previous project output + if (cs.RegisterForComInterop) { + // if the previous project output exists, then unregister it + if (File.Exists(cs.OutputPath)) { + // get path of type library + string typeLibPath = GetTypeLibraryPath(cs); + // unregister types exposed to COM, and unregister type + // library (if it exists) + UnregisterForComInterop(cs.OutputPath, typeLibPath); + } + } + // ensure temp directory exists if (!Directory.Exists(TemporaryFiles.BasePath)) { *************** *** 426,437 **** } - // check if we need to build typelib - if (cs.RegisterForComInterop) { - string typelibPath = Path.ChangeExtension(cs.BuildPath, ".tlb"); - if (outputUpdated || !File.Exists(typelibPath)) { - RegisterFromComInterop(cs.BuildPath, typelibPath); - } - } - #region Process culture-specific resource files --- 438,441 ---- *************** *** 494,497 **** --- 498,519 ---- #endregion Process culture-specific resource files + #region Register project output for COM Interop + + // check if we need to build type library + if (cs.RegisterForComInterop) { + // create type library in output dir, and register it using + // that path to match VS.NET + string typeLibPath = GetTypeLibraryPath(cs); + RegisterForComInterop(cs.BuildPath, typeLibPath); + + // copy generated type library to object directory to match + // VS.NET + string objTypeLibPath = Path.ChangeExtension(cs.BuildPath, ".tlb"); + CopyFile(new FileInfo(typeLibPath), new FileInfo (objTypeLibPath), + SolutionTask); + } + + #endregion Register project output for COM Interop + #region Deploy project and configuration level output files *************** *** 643,654 **** /// <summary> ! /// Generates a type library for the specified assembly, and register it. /// </summary> ! /// <param name="buildPath">The path to the assembly for which a type library must be generated.</param> /// <param name="typelibPath">The path of the type library to generate.</param> /// <remarks> /// The <c>regasm</c> tool is used to generate the type library. /// </remarks> ! private void RegisterFromComInterop(string buildPath, string typelibPath) { ExecTask exec = new ExecTask(); exec.Parent = exec.Project = SolutionTask.Project; --- 665,693 ---- /// <summary> ! /// Gets the absolute path of the type library for the project ! /// output. /// </summary> ! /// <param name="config">The configuration to build.</param> ! /// <returns> ! /// The absolute path of the type library for the project output. ! /// </returns> ! private string GetTypeLibraryPath(ConfigurationSettings config) { ! if (config == null) { ! throw new ArgumentNullException("config"); ! } ! return Path.ChangeExtension(config.OutputPath, ".tlb"); ! } ! ! /// <summary> ! /// Generates a type library for the specified assembly, registers it. ! /// </summary> ! /// <param name="outputPath">The path to the assembly for which a type library must be generated.</param> /// <param name="typelibPath">The path of the type library to generate.</param> /// <remarks> /// The <c>regasm</c> tool is used to generate the type library. /// </remarks> ! private void RegisterForComInterop(string outputPath, string typelibPath) { ! Log(Level.Verbose, "Registering project output for COM Interop..."); ! ExecTask exec = new ExecTask(); exec.Parent = exec.Project = SolutionTask.Project; *************** *** 658,662 **** exec.Arguments.Add(new Argument(string.Format(CultureInfo.InvariantCulture, ! "\"{0}\"", buildPath))); exec.Arguments.Add(new Argument(string.Format(CultureInfo.InvariantCulture, "/tlb:\"{0}\"", typelibPath))); --- 697,701 ---- exec.Arguments.Add(new Argument(string.Format(CultureInfo.InvariantCulture, ! "\"{0}\"", outputPath))); exec.Arguments.Add(new Argument(string.Format(CultureInfo.InvariantCulture, "/tlb:\"{0}\"", typelibPath))); *************** *** 678,681 **** --- 717,766 ---- } + /// <summary> + /// Unregister a type library for the specified assembly, and the types + /// in that assembly. + /// </summary> + /// <param name="outputPath">The path to the assembly for which to remove the COM registration.</param> + /// <param name="typeLibPath">The path of the type library to unregister.</param> + /// <remarks> + /// The <c>regasm</c> tool is used to unregister the type library, and + /// remove the COM registration for types in the specified assembly. + /// </remarks> + private void UnregisterForComInterop(string outputPath, string typeLibPath) { + Log(Level.Verbose, "Unregistering project output for COM Interop..."); + + ExecTask exec = new ExecTask(); + exec.Parent = exec.Project = SolutionTask.Project; + exec.InitializeTaskConfiguration(); + exec.FileName = FileUtils.CombinePaths(SolutionTask. + Project.TargetFramework.FrameworkDirectory.FullName, "regasm.exe"); + + exec.Arguments.Add(new Argument(string.Format(CultureInfo.InvariantCulture, + "\"{0}\"", outputPath))); + exec.Arguments.Add(new Argument("/unregister")); + + // if the type library exists, unregister it + if (File.Exists(typeLibPath)) { + exec.Arguments.Add(new Argument(string.Format(CultureInfo.InvariantCulture, + "/tlb:\"{0}\"", typeLibPath))); + } + + exec.Arguments.Add(new Argument("/nologo")); + if (SolutionTask.Verbose) { + exec.Arguments.Add(new Argument("/verbose")); + } else { + exec.Arguments.Add(new Argument("/silent")); + } + + // increment indentation level + SolutionTask.Project.Indent(); + try { + exec.Execute(); + } finally { + // restore indentation level + SolutionTask.Project.Unindent(); + } + } + private void RegisterEmbeddedResource(string resourceFile, XmlElement elemFile) { FileInfo fi = new FileInfo(resourceFile); |