You are viewing a plain text version of this content. The canonical link for it is here.
Posted to nmaven-commits@incubator.apache.org by si...@apache.org on 2007/02/25 04:08:40 UTC

svn commit: r511440 - in /incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src: main/csharp/Core/ main/csharp/Core/Impl/ test/csharp/Core/Impl/

Author: sisbell
Date: Sat Feb 24 20:08:39 2007
New Revision: 511440

URL: http://svn.apache.org/viewvc?view=rev&rev=511440
Log:
Deleting uneeded classes.

Removed:
    incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectRepository.cs
    incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectRepositoryImpl.cs
Modified:
    incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs
    incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs
    incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/test/csharp/Core/Impl/NMavenContextImplTest.cs

Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs?view=diff&rev=511440&r1=511439&r2=511440
==============================================================================
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs (original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/IProjectGenerator.cs Sat Feb 24 20:08:39 2007
@@ -16,7 +16,7 @@
 		                            string projectFileName,
 		                            List<IProjectReference> projectReferences);
 		
-		void generateSolutionFor(List<IProjectReference> projectReferences);
+		void generateSolutionFor(FileInfo fileInfo, List<IProjectReference> projectReferences);
 		
 		NMaven.Model.Model createPomModelFor(string fileName);
 		

Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs?view=diff&rev=511440&r1=511439&r2=511440
==============================================================================
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs (original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs Sat Feb 24 20:08:39 2007
@@ -28,8 +28,13 @@
 			Guid projectGuid = Guid.NewGuid();
 			
 			if(projectReferences == null) projectReferences = new List<IProjectReference>();
-			Project project = getProjectFromPomModel(model, sourceFileDirectory, projectFileName, projectGuid, 
-			                                         @"..\..\..\target\bin\Debug\", projectReferences);
+			Project project = getProjectFromPomModel(model, 
+			                                         sourceFileDirectory,
+			                                         projectFileName, 
+			                                         projectGuid,
+			                                         @"..\..\..\target\bin\Debug\", 
+			                                         @"..\..\..\target\obj\",
+			                                         projectReferences);
 			FileInfo fileInfo = new FileInfo(sourceFileDirectory.FullName + @"\" + projectFileName + ".csproj");
 		    project.Save(fileInfo.FullName);	
 		    
@@ -40,10 +45,10 @@
 			return projectReference;	    	
 	    }
 		
-		public void generateSolutionFor(List<IProjectReference> projectReferences)
+		public void generateSolutionFor(FileInfo fileInfo, List<IProjectReference> projectReferences)
 		{
 			TextWriter writer = 
-				new StreamWriter(@"C:\Documents and Settings\shane\nmaven-apache\SI_IDE\assemblies\test.sln", false, System.Text.Encoding.UTF8);
+				new StreamWriter(fileInfo.FullName, false, System.Text.Encoding.UTF8);
 			writer.WriteLine("");
 			writer.WriteLine("Microsoft Visual Studio Solution File, Format Version 9.00");
 			writer.WriteLine("# Visual Studio 2005");
@@ -89,6 +94,7 @@
 		                                       string assemblyName,
 		                                       Guid projectGuid,
 		                                       string assemblyOutputPath,
+		                                       string baseIntermediateOutputPath,
 		                                       List<IProjectReference> projectReferences)
 		{
             Engine engine = new Engine(@"C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727");
@@ -102,6 +108,7 @@
             buildProperty.Condition = " '$(Configuration)' == '' ";
             groupProject.AddNewProperty("RootNameSpace", model.groupId);
             groupProject.AddNewProperty("AssemblyName", assemblyName);
+            groupProject.AddNewProperty("BaseIntermediateOutputPath", baseIntermediateOutputPath);
             groupProject.AddNewProperty("OutputType", getOutputType(model.packaging));
             
             //Debug Properties
@@ -163,7 +170,6 @@
 	            		BuildItem buildItem = 
 	            			compileGroup.AddNewItem("Compile", 
 	            			                        fileInfo.FullName.Substring(sourceFileDirectory.FullName.Length));
-	            		//buildItem.SetMetadata("Link", fileInfo.FullName.Substring(sourcedir.FullName.Length + 1));
 	            	}            		
                 	addClassFilesToProject(project, compileGroup, di, sourceFileDirectory);
             	}           	

Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/test/csharp/Core/Impl/NMavenContextImplTest.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/test/csharp/Core/Impl/NMavenContextImplTest.cs?view=diff&rev=511440&r1=511439&r2=511440
==============================================================================
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/test/csharp/Core/Impl/NMavenContextImplTest.cs (original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/test/csharp/Core/Impl/NMavenContextImplTest.cs Sat Feb 24 20:08:39 2007
@@ -33,7 +33,7 @@
 	 	projectReferences.Add(testReference);
 	 	
 	 	
-	 	projectGenerator.generateSolutionFor(projectReferences);
+	 	projectGenerator.generateSolutionFor(new FileInfo(@"..\..\..\..\test.sln"), projectReferences);
 	
 	}