lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccurr...@apache.org
Subject svn commit: r1362583 - in /incubator/lucene.net/trunk: build/scripts/ build/scripts/All/ build/scripts/Analyzers/ build/scripts/Contrib-Core/ build/scripts/Contrib/ build/scripts/Core/ build/scripts/FastVectorHighlighter/ build/scripts/Highlighter/ bui...
Date Tue, 17 Jul 2012 17:39:41 GMT
Author: ccurrens
Date: Tue Jul 17 17:39:40 2012
New Revision: 1362583

URL: http://svn.apache.org/viewvc?rev=1362583&view=rev
Log:
[LUCENENET-480] Fixed the build after multi-framework support was added.  Had to create a build target for each project so that the (wildcard) ItemGroups could be populated *after* the build files were output.

Modified:
    incubator/lucene.net/trunk/build/scripts/All/project.targets
    incubator/lucene.net/trunk/build/scripts/Analyzers/project.targets
    incubator/lucene.net/trunk/build/scripts/Contrib-Core/project.targets
    incubator/lucene.net/trunk/build/scripts/Contrib/project.targets
    incubator/lucene.net/trunk/build/scripts/Core/project.targets
    incubator/lucene.net/trunk/build/scripts/FastVectorHighlighter/project.targets
    incubator/lucene.net/trunk/build/scripts/Highlighter/project.targets
    incubator/lucene.net/trunk/build/scripts/Memory/project.targets
    incubator/lucene.net/trunk/build/scripts/Queries/project.targets
    incubator/lucene.net/trunk/build/scripts/Regex/project.targets
    incubator/lucene.net/trunk/build/scripts/Similarity/project.targets
    incubator/lucene.net/trunk/build/scripts/SimpleFacetedSearch/project.targets
    incubator/lucene.net/trunk/build/scripts/Snowball/project.targets
    incubator/lucene.net/trunk/build/scripts/Spatial/project.targets
    incubator/lucene.net/trunk/build/scripts/SpellChecker/project.targets
    incubator/lucene.net/trunk/build/scripts/build.targets
    incubator/lucene.net/trunk/build/scripts/dot-net-tools.targets
    incubator/lucene.net/trunk/test/core/Index/TestDoc.cs

Modified: incubator/lucene.net/trunk/build/scripts/All/project.targets
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/scripts/All/project.targets?rev=1362583&r1=1362582&r2=1362583&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/scripts/All/project.targets (original)
+++ incubator/lucene.net/trunk/build/scripts/All/project.targets Tue Jul 17 17:39:40 2012
@@ -40,20 +40,15 @@
 	</Target>
 	
 	<Import Project="../Core/project.targets"  />
-	<Import Project="../Analyzers/project.targets"  />
-	<Import Project="../Contrib-Core/project.targets"  />
-	<Import Project="../FastVectorHighlighter/project.targets"  />
-	<Import Project="../Highlighter/project.targets"  />
-	<Import Project="../Memory/project.targets"  />
-	<Import Project="../Queries/project.targets"  />
-	<Import Project="../Regex/project.targets"  />
-	<Import Project="../SimpleFacetedSearch/project.targets"  />
-	<Import Project="../Snowball/project.targets"  />
-	<Import Project="../Spatial/project.targets"  />
-	<Import Project="../SpellChecker/project.targets"  />
+	<Import Project="../Contrib/project.targets"  />
 		
 	<ItemGroup>
 		<PackageTargets Include="package-contrib" />
 		<PackageTargets Include="package-all" />
 	</ItemGroup>
+
+	<Target Name="BuildAll">
+		<CallTarget Targets="BuildCore" />
+		<CallTarget Targets="BuildContrib" />
+	</Target>
 </Project>
\ No newline at end of file

Modified: incubator/lucene.net/trunk/build/scripts/Analyzers/project.targets
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/scripts/Analyzers/project.targets?rev=1362583&r1=1362582&r2=1362583&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/scripts/Analyzers/project.targets (original)
+++ incubator/lucene.net/trunk/build/scripts/Analyzers/project.targets Tue Jul 17 17:39:40 2012
@@ -29,26 +29,38 @@
 	<PropertyGroup  Condition="'$(Area)' == 'analyzers'">
 		<LocalBinFolder>$(BinFolder)\contrib\Analyzers\$(Configuration)</LocalBinFolder>
 		<ArtifactsFolder>$(BuildFolder)\artifacts\Analyzers</ArtifactsFolder>
+		<TestFiles>"$(AnalyzersFolder)\**\Lucene.Net.Contrib.Analyzers.Test.dll"</TestFiles>
 	</PropertyGroup>
-		
-	<ItemGroup>
-		<!-- Binaries To Copy in case we which to store all build items -->
-		<BuildItems Include="$(AnalyzersFolder)\**\*.*" /> 
-		
-		
-		<!-- Files To Build -->
-		<ProjectFiles Include="$(SourceFolder)\Contrib\Analyzers\*.csproj" />
-		<ProjectFiles Include="$(TestFolder)\Contrib\Analyzers\*.csproj" />
-		
-		
-		<!-- Assemblies To Test -->
-		<TestFiles Include="$(AnalyzersFolder)\**\Lucene.Net.Contrib.Analyzers.Test.dll" />
-		
-		<!-- Files To Release -->
-		<ReleaseFiles Include="$(AnalyzersFolder)\**\Lucene.Net.Contrib.Analyzers.dll" />
-		<ReleaseFiles Include="$(AnalyzersFolder)\**\Lucene.Net.Contrib.Analyzers.XML" />
 	
-		<!-- Files to Analysis -->
-		<AnalysisFiles Include="$(AnalyzersFolder)\**\Lucene.Net.Contrib.Analyzers.dll" />	
-	</ItemGroup>
+	<Target Name="_analyzers_build">
+		<ItemGroup>
+			<AnalyzersProjectFiles Include="$(SourceFolder)\Contrib\Analyzers\*.csproj" />
+			<AnalyzersProjectFiles Include="$(TestFolder)\Contrib\Analyzers\*.csproj" />
+		</ItemGroup>
+		<MSBuild Projects="@(AnalyzersProjectFiles)" Properties="Configuration=$(Configuration);ExternalConstants=$(ExternalConstants)" />
+		<!-- Add "35" to the end of configuration to build .NET35 projects -->
+		<MSBuild Projects="@(AnalyzersProjectFiles)" Properties="Configuration=$(Configuration)35;ExternalConstants=$(ExternalConstants)" />
+	</Target>
+
+	<Target Name="_analyzers_properties">
+		<ItemGroup>
+			<!-- Binaries To Copy in case we which to store all build items -->
+			<BuildItems Include="$(AnalyzersFolder)\**\*.*" /> 
+			
+			<!-- Assemblies To Test -->
+			<TestFiles Include="$(AnalyzersFolder)\**\Lucene.Net.Contrib.Analyzers.Test.dll" />
+					
+			<!-- Files To Release -->
+			<ReleaseFiles Include="$(AnalyzersFolder)\**\Lucene.Net.Contrib.Analyzers.dll" />
+			<ReleaseFiles Include="$(AnalyzersFolder)\**\Lucene.Net.Contrib.Analyzers.XML" />
+		
+			<!-- Files to Analysis -->
+			<AnalysisFiles Include="$(AnalyzersFolder)\**\Lucene.Net.Contrib.Analyzers.dll" />	
+		</ItemGroup>
+	</Target>
+
+	<Target Name="BuildAnalyzers">
+		<CallTarget Targets="_analyzers_build" />
+		<CallTarget Targets="_analyzers_properties" />
+	</Target>
 </Project>
\ No newline at end of file

Modified: incubator/lucene.net/trunk/build/scripts/Contrib-Core/project.targets
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/scripts/Contrib-Core/project.targets?rev=1362583&r1=1362582&r2=1362583&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/scripts/Contrib-Core/project.targets (original)
+++ incubator/lucene.net/trunk/build/scripts/Contrib-Core/project.targets Tue Jul 17 17:39:40 2012
@@ -30,25 +30,37 @@
 		<LocalBinFolder>$(BinFolder)\contrib\Core\$(Configuration)</LocalBinFolder>
 		<ArtifactsFolder>$(BuildFolder)\artifacts\Contrib-Core</ArtifactsFolder>
 	</PropertyGroup>
-		
-	<ItemGroup>
-		<!-- Binaries To Copy in case we which to store all build items -->
-		<BuildItems Include="$(ContribCoreFolder)\**\*.*" /> 
-		
-		
-		<!-- Files To Build -->
-		<ProjectFiles Include="$(SourceFolder)\Contrib\Core\*.csproj" />
-		<ProjectFiles Include="$(TestFolder)\Contrib\Core\*.csproj" />
-		
-		
-		<!-- Assemblies To Test -->
-		<TestFiles Include="$(ContribCoreFolder)\**\Lucene.Net.Contrib.Core.Test.dll" />
-		
-		<!-- Files To Release -->
-		<ReleaseFiles Include="$(ContribCoreFolder)\**\Lucene.Net.Contrib.Core.dll" />
-		<ReleaseFiles Include="$(ContribCoreFolder)\**\Lucene.Net.Contrib.Core.XML" />
-	
-		<!-- Files to Analysis -->
-		<AnalysisFiles Include="$(ContribCoreFolder)\**\Lucene.Net.Contrib.Core.dll" />	
-	</ItemGroup>
+
+	<Target Name="_contrib-core_build">
+		<ItemGroup>
+			<ContribCoreProjectFiles Include="$(SourceFolder)\Contrib\Core\*.csproj" />
+			<ContribCoreProjectFiles Include="$(TestFolder)\Contrib\Core\*.csproj" />
+		</ItemGroup>
+
+		<MSBuild Projects="@(ContribCoreProjectFiles)" Properties="Configuration=$(Configuration);ExternalConstants=$(ExternalConstants)" />
+		<!-- Add "35" to the end of configuration to build .NET35 projects -->
+		<MSBuild Projects="@(ContribCoreProjectFiles)" Properties="Configuration=$(Configuration)35;ExternalConstants=$(ExternalConstants)" />
+	</Target>
+
+	<Target Name="_contrib-core_properties">
+		<ItemGroup>
+			<!-- Binaries To Copy in case we which to store all build items -->
+			<BuildItems Include="$(ContribCoreFolder)\**\*.*" /> 
+			
+			<!-- Assemblies To Test -->
+			<TestFiles Include="$(ContribCoreFolder)\**\Lucene.Net.Contrib.Core.Test.dll" />
+			
+			<!-- Files To Release -->
+			<ReleaseFiles Include="$(ContribCoreFolder)\**\Lucene.Net.Contrib.Core.dll" />
+			<ReleaseFiles Include="$(ContribCoreFolder)\**\Lucene.Net.Contrib.Core.XML" />
+		
+			<!-- Files to Analysis -->
+			<AnalysisFiles Include="$(ContribCoreFolder)\**\Lucene.Net.Contrib.Core.dll" />	
+		</ItemGroup>
+	</Target>
+
+	<Target Name="BuildContrib-Core">
+		<CallTarget Targets="_contrib-core_build" />
+		<CallTarget Targets="_contrib-core_properties" />
+	</Target>
 </Project>
\ No newline at end of file

Modified: incubator/lucene.net/trunk/build/scripts/Contrib/project.targets
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/scripts/Contrib/project.targets?rev=1362583&r1=1362582&r2=1362583&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/scripts/Contrib/project.targets (original)
+++ incubator/lucene.net/trunk/build/scripts/Contrib/project.targets Tue Jul 17 17:39:40 2012
@@ -48,5 +48,18 @@
 	<Import Project="../Spatial/project.targets"  />
 	<Import Project="../SpellChecker/project.targets"  />
 		
+	<Target Name="BuildContrib">
+		<CallTarget Targets="BuildAnalyzers" />
+		<CallTarget Targets="BuildContrib-Core" />
+		<CallTarget Targets="BuildFastVectorHighlighter" />
+		<CallTarget Targets="BuildHighlighter" />
+		<CallTarget Targets="BuildMemory" />
+		<CallTarget Targets="BuildQueries" />
+		<CallTarget Targets="BuildRegex" />
+		<CallTarget Targets="BuildSimpleFacetedSearch" />
+		<CallTarget Targets="BuildSnowball" />
+		<CallTarget Targets="BuildSpatial" />
+		<CallTarget Targets="BuildSpellChecker" />
+	</Target>
 	
 </Project>
\ No newline at end of file

Modified: incubator/lucene.net/trunk/build/scripts/Core/project.targets
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/scripts/Core/project.targets?rev=1362583&r1=1362582&r2=1362583&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/scripts/Core/project.targets (original)
+++ incubator/lucene.net/trunk/build/scripts/Core/project.targets Tue Jul 17 17:39:40 2012
@@ -34,27 +34,42 @@
 	<Target Name="package-core">
 		<Exec Command="$(PackageManager) $(ScriptsFolder)\Core\$(CorePackage)  $(PackageManagerOptions) $(ArtifactsFolder)" />
 	</Target>
-	<ItemGroup>
-		<!-- Binaries To Copy in case we which to store all build items -->
-		<BuildItems Include="$(CoreFolder)\**\*.*" /> 
-		
-		<!-- Add To The List of Packages to Build -->
-		<PackageTargets Include="package-core" />
-		
-		<!-- Files To Build -->
-		<ProjectFiles Include="$(SourceFolder)\Core\*.csproj" />
-		<ProjectFiles Include="$(TestFolder)\Core\*.csproj" />
-		
-		
-		<!-- Assemblies To Test -->
-		<TestFiles Include="$(CoreFolder)\**\Lucene.Net.Test.dll" />
+
+	<Target Name="_core_build">
+		<ItemGroup>
+			<CoreProjectFiles Include="$(SourceFolder)\Core\*.csproj" />
+			<CoreProjectFiles Include="$(TestFolder)\Core\*.csproj" />
+		</ItemGroup>
+		<MSBuild Projects="@(CoreProjectFiles)" Properties="Configuration=$(Configuration);ExternalConstants=$(ExternalConstants)" />
+		<!-- Add "35" to the end of configuration to build .NET35 projects -->
+		<MSBuild Projects="@(CoreProjectFiles)" Properties="Configuration=$(Configuration)35;ExternalConstants=$(ExternalConstants)" />
+	</Target>
+
+	<Target Name="_core_properties">
+
+		<ItemGroup>
+			<!-- Binaries To Copy in case we which to store all build items -->
+			<BuildItems Include="$(CoreFolder)\**\*.*" /> 
+			
+			<!-- Add To The List of Packages to Build -->
+			<PackageTargets Include="package-core" />
+					
+			
+			<!-- Assemblies To Test -->
+			<TestFiles Include="$(CoreFolder)\**\Lucene.Net.Test.dll" />
+			
+			<!-- Files To Release -->
+			<ReleaseFiles Include="$(CoreFolder)\**\Lucene.Net.dll" />
+			<ReleaseFiles Include="$(CoreFolder)\**\Lucene.Net.XML" />
+			<ReleaseFiles Include="$(CoreFolder)\**\ICSharpCode.SharpZipLib.dll" />
 		
-		<!-- Files To Release -->
-		<ReleaseFiles Include="$(CoreFolder)\**\Lucene.Net.dll" />
-		<ReleaseFiles Include="$(CoreFolder)\**\Lucene.Net.XML" />
-		<ReleaseFiles Include="$(CoreFolder)\**\ICSharpCode.SharpZipLib.dll" />
-	
-		<!-- Files to Analysis -->
-		<AnalysisFiles Include="$(CoreFolder)\**\Lucene.Net.dll" />	
-	</ItemGroup>
+			<!-- Files to Analysis -->
+			<AnalysisFiles Include="$(CoreFolder)\**\Lucene.Net.dll" />	
+		</ItemGroup>
+	</Target>	
+
+	<Target Name="BuildCore">
+		<CallTarget Targets="_core_build" />
+		<CallTarget Targets="_core_properties" />
+	</Target>
 </Project>
\ No newline at end of file

Modified: incubator/lucene.net/trunk/build/scripts/FastVectorHighlighter/project.targets
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/scripts/FastVectorHighlighter/project.targets?rev=1362583&r1=1362582&r2=1362583&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/scripts/FastVectorHighlighter/project.targets (original)
+++ incubator/lucene.net/trunk/build/scripts/FastVectorHighlighter/project.targets Tue Jul 17 17:39:40 2012
@@ -30,15 +30,23 @@
 		<LocalBinFolder>$(BinFolder)\contrib\FastVectorHighlighter\$(Configuration)</LocalBinFolder>
 		<ArtifactsFolder>$(BuildFolder)\artifacts\FastVectorHighlighter</ArtifactsFolder>
 	</PropertyGroup>
-		
-	<ItemGroup>
+
+	<Target Name="_fastvectorhighlighter_build">
+		<ItemGroup>
+			<FVHProjectFiles Include="$(SourceFolder)\Contrib\FastVectorHighlighter\*.csproj" />
+			<FVHProjectFiles Include="$(TestFolder)\Contrib\FastVectorHighlighter\*.csproj" />
+		</ItemGroup>
+
+		<MSBuild Projects="@(FVHProjectFiles)" Properties="Configuration=$(Configuration);ExternalConstants=$(ExternalConstants)" />
+		<!-- Add "35" to the end of configuration to build .NET35 projects -->
+		<MSBuild Projects="@(FVHProjectFiles)" Properties="Configuration=$(Configuration)35;ExternalConstants=$(ExternalConstants)" />
+	</Target>
+
+	<Target Name="_fastvectorhighlighter_properties">
+			<ItemGroup>
 		<!-- Binaries To Copy in case we which to store all build items -->
 		<BuildItems Include="$(FastVectorHighlighterFolder)\**\*.*" /> 
 		
-		<!-- Files To Build -->
-		<ProjectFiles Include="$(SourceFolder)\Contrib\FastVectorHighlighter\*.csproj" />
-		<ProjectFiles Include="$(TestFolder)\Contrib\FastVectorHighlighter\*.csproj" />
-		
 		<!-- Assemblies To Test -->
 		<TestFiles Include="$(FastVectorHighlighterFolder)\**\Lucene.Net.FastVectorHighlighter.Test.dll" />
 		
@@ -49,4 +57,10 @@
 		<!-- Files to Analysis -->
 		<AnalysisFiles Include="$(FastVectorHighlighterFolder)\**\Lucene.Net.FastVectorHighlighter.dll" />	
 	</ItemGroup>
+	</Target>
+
+	<Target Name="BuildFastVectorHighlighter">
+		<CallTarget Targets="_fastvectorhighlighter_build" />
+		<CallTarget Targets="_fastvectorhighlighter_properties" />
+	</Target>
 </Project>
\ No newline at end of file

Modified: incubator/lucene.net/trunk/build/scripts/Highlighter/project.targets
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/scripts/Highlighter/project.targets?rev=1362583&r1=1362582&r2=1362583&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/scripts/Highlighter/project.targets (original)
+++ incubator/lucene.net/trunk/build/scripts/Highlighter/project.targets Tue Jul 17 17:39:40 2012
@@ -30,25 +30,36 @@
 		<LocalBinFolder>$(BinFolder)\contrib\Highlighter\$(Configuration)</LocalBinFolder>
 		<ArtifactsFolder>$(BuildFolder)\artifacts\Highlighter</ArtifactsFolder>
 	</PropertyGroup>
-		
-	<ItemGroup>
-		<!-- Binaries To Copy in case we which to store all build items -->
-		<BuildItems Include="$(HighlighterFolder)\**\*.*" /> 
-		
-		
-		<!-- Files To Build -->
-		<ProjectFiles Include="$(SourceFolder)\Contrib\Highlighter\*.csproj" />
-		<ProjectFiles Include="$(TestFolder)\Contrib\Highlighter\*.csproj" />
-		
-		
-		<!-- Assemblies To Test -->
-		<TestFiles Include="$(HighlighterFolder)\**\Lucene.Net.Contrib.Highlighter.Test.dll" />
-		
-		<!-- Files To Release -->
-		<ReleaseFiles Include="$(HighlighterFolder)\**\Lucene.Net.Contrib.Highlighter.dll" />
-		<ReleaseFiles Include="$(HighlighterFolder)\**\Lucene.Net.Contrib.Highlighter.XML" />
-	
-		<!-- Files to Analysis -->
-		<AnalysisFiles Include="$(HighlighterFolder)\**\Lucene.Net.Contrib.Highlighter.dll" />	
-	</ItemGroup>
+
+	<Target Name="_highlighter_build">
+		<ItemGroup>
+			<HighligherProjectFiles Include="$(SourceFolder)\Contrib\Highlighter\*.csproj" />
+			<HighligherProjectFiles Include="$(TestFolder)\Contrib\Highlighter\*.csproj" />
+		</ItemGroup>
+		<MSBuild Projects="@(HighligherProjectFiles)" Properties="Configuration=$(Configuration);ExternalConstants=$(ExternalConstants)" />
+		<!-- Add "35" to the end of configuration to build .NET35 projects -->
+		<MSBuild Projects="@(HighligherProjectFiles)" Properties="Configuration=$(Configuration)35;ExternalConstants=$(ExternalConstants)" />
+	</Target>
+
+	<Target Name="_highlighter_properties">
+		<ItemGroup>
+			<!-- Binaries To Copy in case we which to store all build items -->
+			<BuildItems Include="$(HighlighterFolder)\**\*.*" /> 
+			
+			<!-- Assemblies To Test -->
+			<TestFiles Include="$(HighlighterFolder)\**\Lucene.Net.Contrib.Highlighter.Test.dll" />
+			
+			<!-- Files To Release -->
+			<ReleaseFiles Include="$(HighlighterFolder)\**\Lucene.Net.Contrib.Highlighter.dll" />
+			<ReleaseFiles Include="$(HighlighterFolder)\**\Lucene.Net.Contrib.Highlighter.XML" />
+		
+			<!-- Files to Analysis -->
+			<AnalysisFiles Include="$(HighlighterFolder)\**\Lucene.Net.Contrib.Highlighter.dll" />	
+		</ItemGroup>
+	</Target>
+
+	<Target Name="BuildHighlighter">
+		<CallTarget Targets="_highlighter_build" />
+		<CallTarget Targets="_highlighter_properties" />
+	</Target>
 </Project>
\ No newline at end of file

Modified: incubator/lucene.net/trunk/build/scripts/Memory/project.targets
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/scripts/Memory/project.targets?rev=1362583&r1=1362582&r2=1362583&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/scripts/Memory/project.targets (original)
+++ incubator/lucene.net/trunk/build/scripts/Memory/project.targets Tue Jul 17 17:39:40 2012
@@ -31,24 +31,36 @@
 		<ArtifactsFolder>$(BuildFolder)\artifacts\Memory</ArtifactsFolder>
 	</PropertyGroup>
 		
-	<ItemGroup>
-		<!-- Binaries To Copy in case we which to store all build items -->
-		<BuildItems Include="$(MemoryFolder)\**\*.*" /> 
-		
-		
-		<!-- Files To Build -->
-		<ProjectFiles Include="$(SourceFolder)\Contrib\Memory\*.csproj" />
-		<ProjectFiles Include="$(TestFolder)\Contrib\Memory\*.csproj" />
-		
-		
-		<!-- Assemblies To Test -->
-		<TestFiles Include="$(MemoryFolder)\**\Lucene.Net.Contrib.Memory.Test.dll" />
-		
-		<!-- Files To Release -->
-		<ReleaseFiles Include="$(MemoryFolder)\**\Lucene.Net.Contrib.Memory.dll" />
-		<ReleaseFiles Include="$(MemoryFolder)\**\Lucene.Net.Contrib.Memory.XML" />
-	
-		<!-- Files to Analysis -->
-		<AnalysisFiles Include="$(MemoryFolder)\**\Lucene.Net.Contrib.Memory.dll" />	
-	</ItemGroup>
+	<Target Name="_memory_build">
+		<ItemGroup>
+			<MemoryProjectFiles Include="$(SourceFolder)\Contrib\Memory\*.csproj" />
+			<MemoryProjectFiles Include="$(TestFolder)\Contrib\Memory\*.csproj" />
+		</ItemGroup>
+
+		<MSBuild Projects="@(MemoryProjectFiles)" Properties="Configuration=$(Configuration);ExternalConstants=$(ExternalConstants)" />
+		<!-- Add "35" to the end of configuration to build .NET35 projects -->
+		<MSBuild Projects="@(MemoryProjectFiles)" Properties="Configuration=$(Configuration)35;ExternalConstants=$(ExternalConstants)" />
+	</Target>
+
+	<Target Name="_memory_properties">
+		<ItemGroup>
+			<!-- Binaries To Copy in case we which to store all build items -->
+			<BuildItems Include="$(MemoryFolder)\**\*.*" /> 
+					
+			<!-- Assemblies To Test -->
+			<TestFiles Include="$(MemoryFolder)\**\Lucene.Net.Contrib.Memory.Test.dll" />
+			
+			<!-- Files To Release -->
+			<ReleaseFiles Include="$(MemoryFolder)\**\Lucene.Net.Contrib.Memory.dll" />
+			<ReleaseFiles Include="$(MemoryFolder)\**\Lucene.Net.Contrib.Memory.XML" />
+		
+			<!-- Files to Analysis -->
+			<AnalysisFiles Include="$(MemoryFolder)\**\Lucene.Net.Contrib.Memory.dll" />	
+		</ItemGroup>
+	</Target>
+
+	<Target Name="BuildMemory">
+		<CallTarget Targets="_memory_build" />
+		<CallTarget Targets="_memory_properties" />
+	</Target>
 </Project>
\ No newline at end of file

Modified: incubator/lucene.net/trunk/build/scripts/Queries/project.targets
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/scripts/Queries/project.targets?rev=1362583&r1=1362582&r2=1362583&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/scripts/Queries/project.targets (original)
+++ incubator/lucene.net/trunk/build/scripts/Queries/project.targets Tue Jul 17 17:39:40 2012
@@ -31,24 +31,36 @@
 		<ArtifactsFolder>$(BuildFolder)\artifacts\Queries</ArtifactsFolder>
 	</PropertyGroup>
 		
-	<ItemGroup>
-		<!-- Binaries To Copy in case we which to store all build items -->
-		<BuildItems Include="$(QueriesFolder)\**\*.*" /> 
-		
-		
-		<!-- Files To Build -->
-		<ProjectFiles Include="$(SourceFolder)\Contrib\Queries\*.csproj" />
-		<ProjectFiles Include="$(TestFolder)\Contrib\Queries\*.csproj" />
-		
-		
-		<!-- Assemblies To Test -->
-		<TestFiles Include="$(QueriesFolder)\**\Lucene.Net.Contrib.Queries.Test.dll" />
-		
-		<!-- Files To Release -->
-		<ReleaseFiles Include="$(QueriesFolder)\**\Lucene.Net.Contrib.Queries.dll" />
-		<ReleaseFiles Include="$(QueriesFolder)\**\Lucene.Net.Contrib.Queries.XML" />
-	
-		<!-- Files to Analysis -->
-		<AnalysisFiles Include="$(QueriesFolder)\**\Lucene.Net.Contrib.Queries.dll" />	
-	</ItemGroup>
+	<Target Name="_queries_build">
+		<ItemGroup>
+			<QueriesProjectFiles Include="$(SourceFolder)\Contrib\Queries\*.csproj" />
+			<QueriesProjectFiles Include="$(TestFolder)\Contrib\Queries\*.csproj" />
+		</ItemGroup>
+
+		<MSBuild Projects="@(QueriesProjectFiles)" Properties="Configuration=$(Configuration);ExternalConstants=$(ExternalConstants)" />
+		<!-- Add "35" to the end of configuration to build .NET35 projects -->
+		<MSBuild Projects="@(QueriesProjectFiles)" Properties="Configuration=$(Configuration)35;ExternalConstants=$(ExternalConstants)" />
+	</Target>
+
+	<Target Name="_queries_properties">
+		<ItemGroup>
+			<!-- Binaries To Copy in case we which to store all build items -->
+			<BuildItems Include="$(QueriesFolder)\**\*.*" /> 
+			
+			<!-- Assemblies To Test -->
+			<TestFiles Include="$(QueriesFolder)\**\Lucene.Net.Contrib.Queries.Test.dll" />
+			
+			<!-- Files To Release -->
+			<ReleaseFiles Include="$(QueriesFolder)\**\Lucene.Net.Contrib.Queries.dll" />
+			<ReleaseFiles Include="$(QueriesFolder)\**\Lucene.Net.Contrib.Queries.XML" />
+		
+			<!-- Files to Analysis -->
+			<AnalysisFiles Include="$(QueriesFolder)\**\Lucene.Net.Contrib.Queries.dll" />	
+		</ItemGroup>
+	</Target>
+
+	<Target Name="BuildQueries">
+		<CallTarget Targets="_queries_build" />
+		<CallTarget Targets="_queries_properties" />
+	</Target>
 </Project>
\ No newline at end of file

Modified: incubator/lucene.net/trunk/build/scripts/Regex/project.targets
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/scripts/Regex/project.targets?rev=1362583&r1=1362582&r2=1362583&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/scripts/Regex/project.targets (original)
+++ incubator/lucene.net/trunk/build/scripts/Regex/project.targets Tue Jul 17 17:39:40 2012
@@ -30,25 +30,37 @@
 		<LocalBinFolder>$(BinFolder)\contrib\Regex\$(Configuration)</LocalBinFolder>
 		<ArtifactsFolder>$(BuildFolder)\artifacts\Regex</ArtifactsFolder>
 	</PropertyGroup>
-		
-	<ItemGroup>
-		<!-- Binaries To Copy in case we which to store all build items -->
-		<BuildItems Include="$(RegexFolder)\**\*.*" /> 
-		
-		
-		<!-- Files To Build -->
-		<ProjectFiles Include="$(SourceFolder)\Contrib\Regex\*.csproj" />
-		<ProjectFiles Include="$(TestFolder)\Contrib\Regex\*.csproj" />
-		
-		
-		<!-- Assemblies To Test -->
-		<TestFiles Include="$(RegexFolder)\**\Contrib.Regex.Test.dll" />
-		
-		<!-- Files To Release -->
-		<ReleaseFiles Include="$(RegexFolder)\**\Contrib.Regex.dll" />
-		<ReleaseFiles Include="$(RegexFolder)\**\Contrib.Regex.XML" />
-	
-		<!-- Files to Analysis -->
-		<AnalysisFiles Include="$(RegexFolder)\**\Contrib.Regex.dll" />	
-	</ItemGroup>
+
+	<Target Name="_regex_build">
+		<ItemGroup>
+			<RegexProjectFiles Include="$(SourceFolder)\Contrib\Regex\*.csproj" />
+			<RegexProjectFiles Include="$(TestFolder)\Contrib\Regex\*.csproj" />
+		</ItemGroup>
+
+		<MSBuild Projects="@(RegexProjectFiles)" Properties="Configuration=$(Configuration);ExternalConstants=$(ExternalConstants)" />
+		<!-- Add "35" to the end of configuration to build .NET35 projects -->
+		<MSBuild Projects="@(RegexProjectFiles)" Properties="Configuration=$(Configuration)35;ExternalConstants=$(ExternalConstants)" />
+	</Target>
+
+	<Target Name="_regex_properties">
+		<ItemGroup>
+			<!-- Binaries To Copy in case we which to store all build items -->
+			<BuildItems Include="$(RegexFolder)\**\*.*" /> 
+			
+			<!-- Assemblies To Test -->
+			<TestFiles Include="$(RegexFolder)\**\Contrib.Regex.Test.dll" />
+			
+			<!-- Files To Release -->
+			<ReleaseFiles Include="$(RegexFolder)\**\Contrib.Regex.dll" />
+			<ReleaseFiles Include="$(RegexFolder)\**\Contrib.Regex.XML" />
+		
+			<!-- Files to Analysis -->
+			<AnalysisFiles Include="$(RegexFolder)\**\Contrib.Regex.dll" />	
+		</ItemGroup>
+	</Target>
+
+	<Target Name="BuildRegex">
+		<CallTarget Targets="_regex_build" />
+		<CallTarget Targets="_regex_properties" />
+	</Target>
 </Project>
\ No newline at end of file

Modified: incubator/lucene.net/trunk/build/scripts/Similarity/project.targets
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/scripts/Similarity/project.targets?rev=1362583&r1=1362582&r2=1362583&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/scripts/Similarity/project.targets (original)
+++ incubator/lucene.net/trunk/build/scripts/Similarity/project.targets Tue Jul 17 17:39:40 2012
@@ -31,26 +31,38 @@
 		<ArtifactsFolder>$(BuildFolder)\artifacts\Similarity</ArtifactsFolder>
 	</PropertyGroup>
 		
-	<ItemGroup>
-		<!-- Binaries To Copy in case we which to store all build items -->
-		<BuildItems Include="$(SimilarityFolder)\**\*.*" /> 
-		
-		
-		<!-- Files To Build -->
-		<ProjectFiles Include="$(SourceFolder)\Contrib\Similarity\*.csproj" />
-		<ProjectFiles Include="$(TestFolder)\Contrib\Similarity\*.csproj" />
-		
-		
-		<!-- Assemblies To Test -->
-		<!-- TODO: re-enable so that build fails till a test project is created
-		<TestFiles Include="$(SimilarityFolder)\Lucene.Net.Contrib.Similarity.Test.dll" />
-		-->
-		
-		<!-- Files To Release -->
-		<ReleaseFiles Include="$(SimilarityFolder)\**\Lucene.Net.Contrib.Similarity.dll" />
-		<ReleaseFiles Include="$(SimilarityFolder)\**\Lucene.Net.Contrib.Similarity.XML" />
-	
-		<!-- Files to Analysis -->
-		<AnalysisFiles Include="$(SimilarityFolder)\**\Lucene.Net.Contrib.Similarity.dll" />	
-	</ItemGroup>
+	<Target Name="_similarity_build">
+		<ItemGroup>
+			<SimilarityProjectFiles Include="$(SourceFolder)\Contrib\Similarity\*.csproj" />
+			<SimilarityProjectFiles Include="$(TestFolder)\Contrib\Similarity\*.csproj" />
+		</ItemGroup>
+
+		<MSBuild Projects="@(SimilarityProjectFiles)" Properties="Configuration=$(Configuration);ExternalConstants=$(ExternalConstants)" />
+		<!-- Add "35" to the end of configuration to build .NET35 projects -->
+		<MSBuild Projects="@(SimilarityProjectFiles)" Properties="Configuration=$(Configuration)35;ExternalConstants=$(ExternalConstants)" />
+	</Target>
+
+	<Target Name="_similarity_properties">
+		<ItemGroup>
+			<!-- Binaries To Copy in case we which to store all build items -->
+			<BuildItems Include="$(SimilarityFolder)\**\*.*" /> 
+			
+			<!-- Assemblies To Test -->
+			<!-- TODO: re-enable so that build fails till a test project is created
+			<TestFiles Include="$(SimilarityFolder)\Lucene.Net.Contrib.Similarity.Test.dll" />
+			-->
+			
+			<!-- Files To Release -->
+			<ReleaseFiles Include="$(SimilarityFolder)\**\Lucene.Net.Contrib.Similarity.dll" />
+			<ReleaseFiles Include="$(SimilarityFolder)\**\Lucene.Net.Contrib.Similarity.XML" />
+		
+			<!-- Files to Analysis -->
+			<AnalysisFiles Include="$(SimilarityFolder)\**\Lucene.Net.Contrib.Similarity.dll" />	
+		</ItemGroup>
+	</Target>
+
+	<Target Name="BuildSimilarity">
+		<CallTarget Targets="_similarity_build" />
+		<CallTarget Targets="_similarity_properties" />
+	</Target>
 </Project>
\ No newline at end of file

Modified: incubator/lucene.net/trunk/build/scripts/SimpleFacetedSearch/project.targets
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/scripts/SimpleFacetedSearch/project.targets?rev=1362583&r1=1362582&r2=1362583&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/scripts/SimpleFacetedSearch/project.targets (original)
+++ incubator/lucene.net/trunk/build/scripts/SimpleFacetedSearch/project.targets Tue Jul 17 17:39:40 2012
@@ -31,24 +31,36 @@
 		<ArtifactsFolder>$(BuildFolder)\artifacts\SimpleFacetedSearch</ArtifactsFolder>
 	</PropertyGroup>
 		
-	<ItemGroup>
-		<!-- Binaries To Copy in case we which to store all build items -->
-		<BuildItems Include="$(SimpleFacetedSearchFolder)\**\*.*" /> 
-		
-		
-		<!-- Files To Build -->
-		<ProjectFiles Include="$(SourceFolder)\Contrib\SimpleFacetedSearch\*.csproj" />
-		<ProjectFiles Include="$(TestFolder)\Contrib\SimpleFacetedSearch\*.csproj" />
-		
-		
-		<!-- Assemblies To Test -->
-		<TestFiles Include="$(SimpleFacetedSearchFolder)\**\Lucene.Net.Search.SimpleFacetedSearch.Test.dll" />
-		
-		<!-- Files To Release -->
-		<ReleaseFiles Include="$(SimpleFacetedSearchFolder)\**\Lucene.Net.Search.SimpleFacetedSearch.dll" />
-		<ReleaseFiles Include="$(SimpleFacetedSearchFolder)\**\Lucene.Net.Search.SimpleFacetedSearch.XML" />
-	
-		<!-- Files to Analysis -->
-		<AnalysisFiles Include="$(SimpleFacetedSearchFolder)\**\Lucene.Net.Search.SimpleFacetedSearch.dll" />	
-	</ItemGroup>
+	<Target Name="_simplefacetedsearch_build">
+		<ItemGroup>
+			<SimpleFacetedSearchProjectFiles Include="$(SourceFolder)\Contrib\SimpleFacetedSearch\*.csproj" />
+			<SimpleFacetedSearchProjectFiles Include="$(TestFolder)\Contrib\SimpleFacetedSearch\*.csproj" />
+		</ItemGroup>
+
+		<MSBuild Projects="@(SimpleFacetedSearchProjectFiles)" Properties="Configuration=$(Configuration);ExternalConstants=$(ExternalConstants)" />
+		<!-- Add "35" to the end of configuration to build .NET35 projects -->
+		<MSBuild Projects="@(SimpleFacetedSearchProjectFiles)" Properties="Configuration=$(Configuration)35;ExternalConstants=$(ExternalConstants)" />
+	</Target>
+
+	<Target Name="_simplefacetedsearch_properties">
+		<ItemGroup>
+			<!-- Binaries To Copy in case we which to store all build items -->
+			<BuildItems Include="$(SimpleFacetedSearchFolder)\**\*.*" /> 
+					
+			<!-- Assemblies To Test -->
+			<TestFiles Include="$(SimpleFacetedSearchFolder)\**\Lucene.Net.Search.SimpleFacetedSearch.Test.dll" />
+			
+			<!-- Files To Release -->
+			<ReleaseFiles Include="$(SimpleFacetedSearchFolder)\**\Lucene.Net.Search.SimpleFacetedSearch.dll" />
+			<ReleaseFiles Include="$(SimpleFacetedSearchFolder)\**\Lucene.Net.Search.SimpleFacetedSearch.XML" />
+		
+			<!-- Files to Analysis -->
+			<AnalysisFiles Include="$(SimpleFacetedSearchFolder)\**\Lucene.Net.Search.SimpleFacetedSearch.dll" />	
+		</ItemGroup>
+	</Target>
+
+	<Target Name="BuildSimpleFacetedSearch">
+		<CallTarget Targets="_simplefacetedsearch_build" />
+		<CallTarget Targets="_simplefacetedsearch_properties" />
+	</Target>
 </Project>
\ No newline at end of file

Modified: incubator/lucene.net/trunk/build/scripts/Snowball/project.targets
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/scripts/Snowball/project.targets?rev=1362583&r1=1362582&r2=1362583&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/scripts/Snowball/project.targets (original)
+++ incubator/lucene.net/trunk/build/scripts/Snowball/project.targets Tue Jul 17 17:39:40 2012
@@ -31,24 +31,36 @@
 		<ArtifactsFolder>$(BuildFolder)\artifacts\Snowball</ArtifactsFolder>
 	</PropertyGroup>
 		
-	<ItemGroup>
-		<!-- Binaries To Copy in case we which to store all build items -->
-		<BuildItems Include="$(SnowballFolder)\**\*.*" /> 
-		
-		
-		<!-- Files To Build -->
-		<ProjectFiles Include="$(SourceFolder)\Contrib\Snowball\*.csproj" />
-		<ProjectFiles Include="$(TestFolder)\Contrib\Snowball\*.csproj" />
-		
-		
-		<!-- Assemblies To Test -->
-		<TestFiles Include="$(SnowballFolder)\**\Lucene.Net.Contrib.Snowball.Test.dll" />
-		
-		<!-- Files To Release -->
-		<ReleaseFiles Include="$(SnowballFolder)\**\Lucene.Net.Contrib.Snowball.dll" />
-		<ReleaseFiles Include="$(SnowballFolder)\**\Lucene.Net.Contrib.Snowball.XML" />
-	
-		<!-- Files to Analysis -->
-		<AnalysisFiles Include="$(SnowballFolder)\**\Lucene.Net.Contrib.Snowball.dll" />	
-	</ItemGroup>
+	<Target Name="_snowball_build">
+		<ItemGroup>
+			<SnowballProjectFiles Include="$(SourceFolder)\Contrib\Snowball\*.csproj" />
+			<SnowballProjectFiles Include="$(TestFolder)\Contrib\Snowball\*.csproj" />
+		</ItemGroup>
+
+		<MSBuild Projects="@(SnowballProjectFiles)" Properties="Configuration=$(Configuration);ExternalConstants=$(ExternalConstants)" />
+		<!-- Add "35" to the end of configuration to build .NET35 projects -->
+		<MSBuild Projects="@(SnowballProjectFiles)" Properties="Configuration=$(Configuration)35;ExternalConstants=$(ExternalConstants)" />
+	</Target>
+
+	<Target Name="_snowball_properties">
+		<ItemGroup>
+			<!-- Binaries To Copy in case we which to store all build items -->
+			<BuildItems Include="$(SnowballFolder)\**\*.*" /> 
+			
+			<!-- Assemblies To Test -->
+			<TestFiles Include="$(SnowballFolder)\**\Lucene.Net.Contrib.Snowball.Test.dll" />
+			
+			<!-- Files To Release -->
+			<ReleaseFiles Include="$(SnowballFolder)\**\Lucene.Net.Contrib.Snowball.dll" />
+			<ReleaseFiles Include="$(SnowballFolder)\**\Lucene.Net.Contrib.Snowball.XML" />
+		
+			<!-- Files to Analysis -->
+			<AnalysisFiles Include="$(SnowballFolder)\**\Lucene.Net.Contrib.Snowball.dll" />	
+		</ItemGroup>
+	</Target>
+
+	<Target Name="BuildSnowball">
+		<CallTarget Targets="_snowball_build" />
+		<CallTarget Targets="_snowball_properties" />
+	</Target>
 </Project>
\ No newline at end of file

Modified: incubator/lucene.net/trunk/build/scripts/Spatial/project.targets
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/scripts/Spatial/project.targets?rev=1362583&r1=1362582&r2=1362583&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/scripts/Spatial/project.targets (original)
+++ incubator/lucene.net/trunk/build/scripts/Spatial/project.targets Tue Jul 17 17:39:40 2012
@@ -30,25 +30,37 @@
 		<LocalBinFolder>$(BinFolder)\contrib\Spatial\$(Configuration)</LocalBinFolder>
 		<ArtifactsFolder>$(BuildFolder)\artifacts\Spatial</ArtifactsFolder>
 	</PropertyGroup>
-		
-	<ItemGroup>
-		<!-- Binaries To Copy in case we which to store all build items -->
-		<BuildItems Include="$(SpatialFolder)\**\*.*" /> 
-		
-		
-		<!-- Files To Build -->
-		<ProjectFiles Include="$(SourceFolder)\Contrib\Spatial\*.csproj" />
-		<ProjectFiles Include="$(TestFolder)\Contrib\Spatial\*.csproj" />
-		
-		
-		<!-- Assemblies To Test -->
-		<TestFiles Include="$(SpatialFolder)\**\Lucene.Net.Contrib.Spatial.Test.dll" />
-		
-		<!-- Files To Release -->
-		<ReleaseFiles Include="$(SpatialFolder)\**\Lucene.Net.Contrib.Spatial.dll" />
-		<ReleaseFiles Include="$(SpatialFolder)\**\Lucene.Net.Contrib.Spatial.XML" />
-	
-		<!-- Files to Analysis -->
-		<AnalysisFiles Include="$(SpatialFolder)\**\Lucene.Net.Contrib.Spatial.dll" />	
-	</ItemGroup>
+
+	<Target Name="_spatial_build">
+		<ItemGroup>
+			<SpatialProjectFiles Include="$(SourceFolder)\Contrib\Spatial\*.csproj" />
+			<SpatialProjectFiles Include="$(TestFolder)\Contrib\Spatial\*.csproj" />
+		</ItemGroup>
+
+		<MSBuild Projects="@(SpatialProjectFiles)" Properties="Configuration=$(Configuration);ExternalConstants=$(ExternalConstants)" />
+		<!-- Add "35" to the end of configuration to build .NET35 projects -->
+		<MSBuild Projects="@(SpatialProjectFiles)" Properties="Configuration=$(Configuration)35;ExternalConstants=$(ExternalConstants)" />
+	</Target>
+
+	<Target Name="_spatial_properties">
+		<ItemGroup>
+			<!-- Binaries To Copy in case we which to store all build items -->
+			<BuildItems Include="$(SpatialFolder)\**\*.*" /> 
+			
+			<!-- Assemblies To Test -->
+			<TestFiles Include="$(SpatialFolder)\**\Lucene.Net.Contrib.Spatial.Test.dll" />
+			
+			<!-- Files To Release -->
+			<ReleaseFiles Include="$(SpatialFolder)\**\Lucene.Net.Contrib.Spatial.dll" />
+			<ReleaseFiles Include="$(SpatialFolder)\**\Lucene.Net.Contrib.Spatial.XML" />
+		
+			<!-- Files to Analysis -->
+			<AnalysisFiles Include="$(SpatialFolder)\**\Lucene.Net.Contrib.Spatial.dll" />	
+		</ItemGroup>
+	</Target>
+
+	<Target Name="BuildSpatial">
+		<CallTarget Targets="_spatial_build" />
+		<CallTarget Targets="_spatial_properties" />
+	</Target>
 </Project>
\ No newline at end of file

Modified: incubator/lucene.net/trunk/build/scripts/SpellChecker/project.targets
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/scripts/SpellChecker/project.targets?rev=1362583&r1=1362582&r2=1362583&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/scripts/SpellChecker/project.targets (original)
+++ incubator/lucene.net/trunk/build/scripts/SpellChecker/project.targets Tue Jul 17 17:39:40 2012
@@ -31,24 +31,36 @@
 		<ArtifactsFolder>$(BuildFolder)\artifacts\SpellChecker</ArtifactsFolder>
 	</PropertyGroup>
 		
-	<ItemGroup>
-		<!-- Binaries To Copy in case we which to store all build items -->
-		<BuildItems Include="$(SpellCheckerFolder)\**\*.*" /> 
-		
-		
-		<!-- Files To Build -->
-		<ProjectFiles Include="$(SourceFolder)\Contrib\SpellChecker\*.csproj" />
-		<ProjectFiles Include="$(TestFolder)\Contrib\SpellChecker\*.csproj" />
-		
-		
-		<!-- Assemblies To Test -->
-		<TestFiles Include="$(SpellCheckerFolder)\**\Lucene.Net.Contrib.SpellChecker.Test.dll" />
-		
-		<!-- Files To Release -->
-		<ReleaseFiles Include="$(SpellCheckerFolder)\**\Lucene.Net.Contrib.SpellChecker.dll" />
-		<ReleaseFiles Include="$(SpellCheckerFolder)\**\Lucene.Net.Contrib.SpellChecker.XML" />
-	
-		<!-- Files to Analysis -->
-		<AnalysisFiles Include="$(SpellCheckerFolder)\**\Lucene.Net.Contrib.SpellChecker.dll" />	
-	</ItemGroup>
+	<Target Name="_spellchecker_build">
+		<ItemGroup>
+			<SpellCheckerProjectFiles Include="$(SourceFolder)\Contrib\SpellChecker\*.csproj" />
+			<SpellCheckerProjectFiles Include="$(TestFolder)\Contrib\SpellChecker\*.csproj" />
+		</ItemGroup>
+
+		<MSBuild Projects="@(SpellCheckerProjectFiles)" Properties="Configuration=$(Configuration);ExternalConstants=$(ExternalConstants)" />
+		<!-- Add "35" to the end of configuration to build .NET35 projects -->
+		<MSBuild Projects="@(SpellCheckerProjectFiles)" Properties="Configuration=$(Configuration)35;ExternalConstants=$(ExternalConstants)" />
+	</Target>
+
+	<Target Name="_spellchecker_properties">
+		<ItemGroup>
+			<!-- Binaries To Copy in case we which to store all build items -->
+			<BuildItems Include="$(SpellCheckerFolder)\**\*.*" /> 
+			
+			<!-- Assemblies To Test -->
+			<TestFiles Include="$(SpellCheckerFolder)\**\Lucene.Net.Contrib.SpellChecker.Test.dll" />
+			
+			<!-- Files To Release -->
+			<ReleaseFiles Include="$(SpellCheckerFolder)\**\Lucene.Net.Contrib.SpellChecker.dll" />
+			<ReleaseFiles Include="$(SpellCheckerFolder)\**\Lucene.Net.Contrib.SpellChecker.XML" />
+		
+			<!-- Files to Analysis -->
+			<AnalysisFiles Include="$(SpellCheckerFolder)\**\Lucene.Net.Contrib.SpellChecker.dll" />	
+		</ItemGroup>
+	</Target>
+
+	<Target Name="BuildSpellChecker">
+		<CallTarget Targets="_spellchecker_build" />
+		<CallTarget Targets="_spellchecker_properties" />
+	</Target>
 </Project>
\ No newline at end of file

Modified: incubator/lucene.net/trunk/build/scripts/build.targets
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/scripts/build.targets?rev=1362583&r1=1362582&r2=1362583&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/scripts/build.targets (original)
+++ incubator/lucene.net/trunk/build/scripts/build.targets Tue Jul 17 17:39:40 2012
@@ -52,25 +52,26 @@
 
 
 	
-	  <Import Project="All/project.targets" Condition="'$(Area)' == 'all'" />
-	  <Import Project="Analyzers/project.targets" Condition="'$(Area)' == 'analyzers'" />
-	  <Import Project="Contrib/project.targets" Condition="'$(Area)' == 'contrib'" />
-	  <Import Project="Contrib-Core/project.targets" Condition="'$(Area)' == 'contrib-core'" />
-	  <Import Project="Core/project.targets" Condition="'$(Area)' == 'core'" />
-	  <Import Project="FastVectorHighlighter/project.targets" Condition="'$(Area)' == 'fastvectorhighlighter'" />
-	  <Import Project="Highlighter/project.targets" Condition="'$(Area)' == 'highlighter'" />
-	  <Import Project="Queries/project.targets" Condition="'$(Area)' == 'queries'" />
-	  <Import Project="Regex/project.targets" Condition="'$(Area)' == 'regex'" />
-	  <Import Project="Similarity/project.targets" Condition="'$(Area)' == 'similarity'" />
-	  <Import Project="SimpleFacetedSearch/project.targets" Condition="'$(Area)' == 'simplefacetedsearch'" />
-	  <Import Project="Snowball/project.targets" Condition="'$(Area)' == 'snowball'" />
-	  <Import Project="Spatial/project.targets" Condition="'$(Area)' == 'spatial'" />
-	  <Import Project="SpellChecker/project.targets" Condition="'$(Area)' == 'spellchecker'" />
+	<Import Project="All/project.targets" Condition="'$(Area)' == 'all'" />
+	<Import Project="Analyzers/project.targets" Condition="'$(Area)' == 'analyzers'" />
+	<Import Project="Contrib/project.targets" Condition="'$(Area)' == 'contrib'" />
+	<Import Project="Contrib-Core/project.targets" Condition="'$(Area)' == 'contrib-core'" />
+	<Import Project="Core/project.targets" Condition="'$(Area)' == 'core'" />
+	<Import Project="FastVectorHighlighter/project.targets" Condition="'$(Area)' == 'fastvectorhighlighter'" />
+	<Import Project="Highlighter/project.targets" Condition="'$(Area)' == 'highlighter'" />
+	<Import Project="Queries/project.targets" Condition="'$(Area)' == 'queries'" />
+	<Import Project="Regex/project.targets" Condition="'$(Area)' == 'regex'" />
+	<Import Project="Similarity/project.targets" Condition="'$(Area)' == 'similarity'" />
+	<Import Project="SimpleFacetedSearch/project.targets" Condition="'$(Area)' == 'simplefacetedsearch'" />
+	<Import Project="Snowball/project.targets" Condition="'$(Area)' == 'snowball'" />
+	<Import Project="Spatial/project.targets" Condition="'$(Area)' == 'spatial'" />
+	<Import Project="SpellChecker/project.targets" Condition="'$(Area)' == 'spellchecker'" />
 	
 
 	<ItemGroup Condition="'$(ArtifactsFolder)' != ''">
 		<CleanFiles Include="$(ArtifactsFolder)\**\*.*" />
-		<CleanFiles Include="$(RootFolder)\bin\**\*"  Exclude="$(RootFolder)\**\.svn\*; $(RootFolder)\.svn\*" />
+		<CleanFiles Include="$(RootFolder)\bin\**\*" Exclude="$(RootFolder)\**\.svn\*; $(RootFolder)\.svn\*" />
+		<CleanFiles Include="$(RootFolder)\build\bin\**\*.*" />
 	</ItemGroup>	
 	
     <Target Name="diag">
@@ -106,9 +107,7 @@
   	 		Condition="!Exists('$(MSBuildExtensionsPath32)\StyleCop\v4.5\StyleCop.targets')"
   	 		Text="StyleCop is not installed at its expected location: $(MSBuildExtensionsPath32)\StyleCop\v4.5\StyleCop.targets" />
  		<Message Text="Project Files: @(ProjectFiles)" />
-		<MSBuild Projects="@(ProjectFiles)" Properties="Configuration=$(Configuration);ExternalConstants=$(ExternalConstants)" />
-		<!-- Add "35" to the end of configuration to build .NET35 projecsts -->
-		<MSBuild Projects="@(ProjectFiles)" Properties="Configuration=$(Configuration)35;ExternalConstants=$(ExternalConstants)" />
+ 		<CallTarget Targets="Build$(Area)" />
 	</Target>
 	
 	<Target Name="copy-release">
@@ -135,7 +134,7 @@
 	</Target>
 
 	<Target Name="nightly">
-		<CallTarget Targets="clean;build;package;document;copy-release" />
+		<CallTarget Targets="clean;build;test-report-html;package;copy-release" />
 	</Target>
 	
 	<!-- 

Modified: incubator/lucene.net/trunk/build/scripts/dot-net-tools.targets
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/scripts/dot-net-tools.targets?rev=1362583&r1=1362582&r2=1362583&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/scripts/dot-net-tools.targets (original)
+++ incubator/lucene.net/trunk/build/scripts/dot-net-tools.targets Tue Jul 17 17:39:40 2012
@@ -86,7 +86,7 @@
   	
   	<Target Name="test-report-xml"  DependsOnTargets="build">
 		<MakeDir Condition="!Exists('$(TEMP)')" Directories="$(TEMP)" />
-		<Copy SourceFiles="@(Compile)" DestinationFolder="c:\foocopy\%(RecursiveDir)"></Copy>
+		<Copy SourceFiles="@(Compile)" DestinationFolder="c:\foocopy\%(RecursiveDir)" />
 		<Exec Condition="Exists('%(GallioFolder.FullPath)')" Command="%(GallioFolder.FullPath)Gallio.Echo.exe@(TestFiles-> '%(rootdir)%(directory)%(filename)%(extension)', ' ') /hd:$(PackagesFolder)\$(NUnitVersionFolder) /nl /rd:$(ArtifactsFolder)\xml-test-reports /rt:Xml /rnf:test-reports" />
 		
 		
@@ -101,9 +101,6 @@
 			Text="NUnit is not installed under its expected location: %(NUnit.FullPath)"  />
 	</Target>
 	
-	
-	
-	
 	<Target Name="test-report-html"  DependsOnTargets="build">
 		<MakeDir 
 			Condition="!Exists('$(TEMP)')" 
@@ -123,10 +120,7 @@
 			Condition="!Exists('%(NUnitFolder.FullPath)')" 
 			Text="NUnit is not installed under its expected location: %(NUnit.FullPath)"  />
 	</Target>
-	
-	
-	
-	
+		
 	<Target Name="document"  DependsOnTargets="build">
 		<Copy SourceFiles="@(CoverageFiles)" DestinationFolder="$(BinFolder)\core\$(Configuration)" />
    			

Modified: incubator/lucene.net/trunk/test/core/Index/TestDoc.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestDoc.cs?rev=1362583&r1=1362582&r2=1362583&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestDoc.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestDoc.cs Tue Jul 17 17:39:40 2012
@@ -16,6 +16,7 @@
  */
 
 using System;
+using System.IO;
 using Lucene.Net.Documents;
 using Lucene.Net.Support;
 using NUnit.Framework;
@@ -56,7 +57,7 @@ namespace Lucene.Net.Index
 		public override void  SetUp()
 		{
 			base.SetUp();
-			workDir = new System.IO.DirectoryInfo(System.IO.Path.Combine(AppSettings.Get("tempDir", ""), "TestDoc"));
+			workDir = new System.IO.DirectoryInfo(System.IO.Path.Combine(Path.GetTempPath(), "TestDoc"));
 			System.IO.Directory.CreateDirectory(workDir.FullName);
 			
 			indexDir = new System.IO.DirectoryInfo(System.IO.Path.Combine(workDir.FullName, "testIndex"));



Mime
View raw message