You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by br...@apache.org on 2012/01/23 22:40:55 UTC
svn commit: r1235045 - in
/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp:
Digest/ Digest/Algorithms/ Digest/Model/ Parser/VisualStudioProjectTypes/
Author: brett
Date: Mon Jan 23 22:40:54 2012
New Revision: 1235045
URL: http://svn.apache.org/viewvc?rev=1235045&view=rev
Log:
fallback to project filename if the project name is not set from the AssemblyName or the ProjectName element
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/ProjectDigest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/ProjectDigester.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Parser/VisualStudioProjectTypes/VisualStudioProjectType.cs
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/NormalProjectDigestAlgorithm.cs?rev=1235045&r1=1235044&r2=1235045&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/NormalProjectDigestAlgorithm.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/NormalProjectDigestAlgorithm.cs Mon Jan 23 22:40:54 2012
@@ -41,6 +41,7 @@ namespace NPanday.ProjectImporter.Digest
{
Project project = (Project)projectMap["Project"];
+ log.DebugFormat("Digesting project {0}", project.FullFileName);
if (!projectMap.ContainsKey("ProjectType"))
{
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/ProjectDigest.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/ProjectDigest.cs?rev=1235045&r1=1235044&r2=1235045&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/ProjectDigest.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/ProjectDigest.cs Mon Jan 23 22:40:54 2012
@@ -18,9 +18,8 @@
// under the License.
//
#endregion
-using System;
using System.Collections.Generic;
-using System.Text;
+using System.IO;
using NPanday.ProjectImporter.Parser.VisualStudioProjectTypes;
/// Author: Leopoldo Lee Agdeppa III
@@ -49,7 +48,15 @@ namespace NPanday.ProjectImporter.Digest
{
get
{
- return name != null ? name : assemblyName;
+ if (name != null)
+ return name;
+ else if (assemblyName != null)
+ return assemblyName;
+ else
+ {
+ FileInfo f = new FileInfo(FullFileName);
+ return f.Name.Substring(0, f.Name.Length - f.Extension.Length);
+ }
}
}
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/ProjectDigester.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/ProjectDigester.cs?rev=1235045&r1=1235044&r2=1235045&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/ProjectDigester.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/ProjectDigester.cs Mon Jan 23 22:40:54 2012
@@ -18,16 +18,15 @@
// under the License.
//
#endregion
+using System;
using System.Collections.Generic;
using System.IO;
using System.Windows.Forms;
-
+using log4net;
using Microsoft.Build.BuildEngine;
-using NPanday.ProjectImporter.Digest.Model;
using NPanday.ProjectImporter.Digest.Algorithms;
-
+using NPanday.ProjectImporter.Digest.Model;
using NPanday.ProjectImporter.Parser.VisualStudioProjectTypes;
-using System;
/// Author: Leopoldo Lee Agdeppa III
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Parser/VisualStudioProjectTypes/VisualStudioProjectType.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Parser/VisualStudioProjectTypes/VisualStudioProjectType.cs?rev=1235045&r1=1235044&r2=1235045&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Parser/VisualStudioProjectTypes/VisualStudioProjectType.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Parser/VisualStudioProjectTypes/VisualStudioProjectType.cs Mon Jan 23 22:40:54 2012
@@ -238,14 +238,10 @@ namespace NPanday.ProjectImporter.Parser
foreach (string guidItem in strGuid.Split(';'))
{
string upperGuid = guidItem.ToUpper();
- Console.WriteLine("UG: " + upperGuid);
if (!__visualStudioProjectTypes.ContainsKey(upperGuid))
{
- Console.WriteLine("UG WTF: " + upperGuid);
-
throw new NotSupportedException("Unknown project type GUID: " + guidItem);
}
- Console.WriteLine("UG UG: " + upperGuid);
projectType |= __visualStudioProjectTypes[upperGuid];
if (!__visualStudioProjectTypeSupported[upperGuid])
{