lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mhern...@apache.org
Subject [Lucene.Net] svn commit: r1175101 - in /incubator/lucene.net/trunk/build/scripts: All/Lucene.Net.nuspec build.targets dot-net-tools.targets validate-tool-chain.ps1
Date Sat, 24 Sep 2011 04:50:49 GMT
Author: mherndon
Date: Sat Sep 24 04:50:48 2011
New Revision: 1175101

URL: http://svn.apache.org/viewvc?rev=1175101&view=rev
Log:
The main package was choking on the '&' because it was not escaped.  The dot-net-tools
targets can now copy the html generated docs to ~/trunk/bin/docs/site folder when a release
is generated by a nighty build. The 'coverage' command now generates the xml & html test
reports from gallio along with the ncover reports. We no longer have to run tests twice which
is a time suck when the tests for core take 40 minutes to run just a single pass.

Modified:
    incubator/lucene.net/trunk/build/scripts/All/Lucene.Net.nuspec
    incubator/lucene.net/trunk/build/scripts/build.targets
    incubator/lucene.net/trunk/build/scripts/dot-net-tools.targets
    incubator/lucene.net/trunk/build/scripts/validate-tool-chain.ps1

Modified: incubator/lucene.net/trunk/build/scripts/All/Lucene.Net.nuspec
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/scripts/All/Lucene.Net.nuspec?rev=1175101&r1=1175100&r2=1175101&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/scripts/All/Lucene.Net.nuspec (original)
+++ incubator/lucene.net/trunk/build/scripts/All/Lucene.Net.nuspec Sat Sep 24 04:50:48 2011
@@ -30,7 +30,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Lucene.Net is a port of the Lucene search engine library, written
in C# and targeted at .NET runtime users.
 
-**This package installs the Lucene.Net.Core & Lucene.Net.Contrib packages.</description>
+**This package installs the Lucene.Net.Core &amp; Lucene.Net.Contrib packages.</description>
     <summary>Lucene.Net is a port of the Lucene search engine library, written in C#
and targeted at .NET runtime users.</summary>
 	<tags>lucene.net core search information retrieval lucene apache</tags>
      <dependencies>

Modified: incubator/lucene.net/trunk/build/scripts/build.targets
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/scripts/build.targets?rev=1175101&r1=1175100&r2=1175101&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/scripts/build.targets (original)
+++ incubator/lucene.net/trunk/build/scripts/build.targets Sat Sep 24 04:50:48 2011
@@ -69,9 +69,8 @@
 	
 
 	<ItemGroup>
-		<CleanFiles Include="$(ArtifactsFolder)\*.*" />
-		<CleanFiles Include="$(RootFolder)\bin\*.*" />
-		<CleanFiles Include="$(LocalBuildFolder)\*.*" />
+		<CleanFiles Include="$(ArtifactsFolder)\**\*.*" />
+		<CleanFiles Include="$(RootFolder)\bin\**\*" />
 	</ItemGroup>	
 	
 	<Target Name="paths">
@@ -102,18 +101,19 @@
 	<Target Name="copy-release">
 		<MakeDir Condition="!Exists('$(RootFolder)\bin')" Directories="$(RootFolder)\bin" />
 		<Copy SourceFiles="@(ReleaseFiles)" DestinationFolder="$(RootFolder)\bin" />
+		<CallTarget Targets="@(CopyTargets)" />
 	</Target>
 	
 	<Target Name="simple">
-		<CallTarget Targets="build;copy-release" />
+		<CallTarget Targets="clean;build;test" />
 	</Target>
 	
 	<Target Name="nightly">
-		<CallTarget Targets="commit" />
+		<CallTarget Targets="clean;build;coverage;rules;package;document;copy-release" />
 	</Target>
   
 	<Target Name="commit">
-		<CallTarget Targets="clean;build;test-report-html;rules;coverage;document;copy-release"
/>
+		<CallTarget Targets="clean;build;coverage;rules;" />
 	</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=1175101&r1=1175100&r2=1175101&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/scripts/dot-net-tools.targets (original)
+++ incubator/lucene.net/trunk/build/scripts/dot-net-tools.targets Sat Sep 24 04:50:48 2011
@@ -46,13 +46,19 @@
   		
   		<SHFBFolder Include="$(ProgramFiles32)\EWSoftware\Sand Castle Help File Builder" />
   		<SandCastleFolder Include="$(ProgramFiles32)\Sandcastle" />
-  		<CleanFiles Include="$(ArtifactsFolder)\ncover\*.*" />
-  		<CleanFiles Include="$(ArtifactsFolder)\html-test-reports\*.*" />
-  		<CleanFiles Include="$(ArtifactsFolder)\xml-test-reports\*.*" />
-  		<CleanFiles Include="$(ArtifactsFolder)\docs\*.*" />
-  		<CoverageFiles Include="$(PackagesFolder)\PortableLibrary\*.*" />
-  		<CleanPackages Include="$(ArtifactsFolder)\*.nupkg" />
-  		<ReleaseFiles Include="$(ArtifactsFolder)\docs\Lucene.Net.chm" Condition="Exists('$(ArtifactsFolder)\docs\Lucene.Net.chm')"
/>
+  		
+  		
+  		<CopyTargets Include="copy-doc" />
+  		<CopyTargets Include="copy-packages" />
+  		
+  		<ChmFiles Include="$(ArtifactsFolder)\docs\*.chm" />
+  		<DocStyles Include="$(ArtifactsFolder)\docs\styles\*" />
+  		<DocHtml Include="$(ArtifactsFolder)\docs\html\*" />
+  		<DocIcons Include="$(ArtifactsFolder)\docs\icons\*" />
+  		<DocScripts Include="$(ArtifactsFolder)\docs\scripts\*" />
+  		<DocCore Include="$(ArtifactsFolder)\docs\*"
+  			Exclude="$(ArtifactsFolder)\docs\Web.Config; $(ArtifactsFolder)\docs\WebKI.xml; $(ArtifactsFolder)\docs\WebTOC.xml;
$(ArtifactsFolder)\docs\SearchHelp.aspx; $(ArtifactsFolder)\docs\LoadIndexKeywords.aspx; $(ArtifactsFolder)\docs\Index.aspx;
$(ArtifactsFolder)\docs\FillNode.aspx; $(ArtifactsFolder)\docs\LastBuild.log; $(ArtifactsFolder)\docs\*.chm"
/> 
+  		<NugetPackages Include="$(ArtifactsFolder)\*.nupkg" />
   	</ItemGroup>
   	
   
@@ -61,7 +67,7 @@
   	<Target Name="coverage" DependsOnTargets="build">
   		<MakeDir Condition="!Exists('$(ArtifactsFolder)\ncover')" Directories="$(ArtifactsFolder)\ncover"
/>
   		
-  		<Exec Command='%(GallioFolder.FullPath)Gallio.Echo.exe @(TestFiles)  /hd:$(PackagesFolder)\$(NUnitVersionFolder)\tools\
/runner:ncover3 /runner-property:NCoverArguments="//html $(ArtifactsFolder)\ncover //at ncover3.trend"'
/> 
+  		<Exec Command='%(GallioFolder.FullPath)Gallio.Echo.exe @(TestFiles) /rd:$(ArtifactsFolder)
/rt:Xml  /rt:Html /rnf:test-report /hd:$(PackagesFolder)\$(NUnitVersionFolder) /runner:ncover3
/runner-property:NCoverArguments="//html $(ArtifactsFolder)\ncover //at ncover3.trend"'  
 /> 
   		
   		<!-- Notify user if code coverage tool is not found -->
   		<Warning
@@ -72,7 +78,8 @@
   			Condition="!Exists('%(GallioFolder.FullPath)')"
             Text="Gallio is not installed under its expected location: %(GallioFolder.FullPath)"
              />
-  		
+  		 <Copy Condition="Exists('$(BuildFolder)/scripts/Coverage.xml')" SourceFiles="$(BuildFolder)/scripts/Coverage.xml"
DestinationFolder="$(ArtifactsFolder)/ncover/Coverage.xml" /> 
+  		 <Delete Files="$(BuildFolder)/scripts/Coverage.xml" />
   	</Target>
   	
   	
@@ -128,14 +135,32 @@
    			Properties='Configuration=Release;Platform=AnyCPU;OutDir=$(ArtifactsFolder)\docs;area=
    			$(Area)' />
 
+		
+
 		<!-- Notify user if Sand Castle is not found -->
 		<Warning
 			Condition="!Exists('%(SandCastleFolder.FullPath)')" 
 			Text="Sand Castle is not installed under its expected location: %(SandCastleFolder.FullPath)"
/>
 	</Target>
   
+	<Target Name="copy-doc">
+		<MakeDir Condition="!Exists('$(RootFolder)\bin\docs')" Directories="$(RootFolder)\bin\docs"
/>
+		<MakeDir Condition="!Exists('$(RootFolder)\bin\docs\site\styles')" Directories="$(RootFolder)\bin\docs\site\styles"
/>
+		<MakeDir Condition="!Exists('$(RootFolder)\bin\docs\site\scripts')" Directories="$(RootFolder)\bin\docs\site\scripts"
/>
+		<MakeDir Condition="!Exists('$(RootFolder)\bin\docs\site\icons')" Directories="$(RootFolder)\bin\docs\site\icons"
/>
+		<MakeDir Condition="!Exists('$(RootFolder)\bin\docs\site\html')" Directories="$(RootFolder)\bin\docs\site\html"
/>
+		
+		<Copy SourceFiles="@(DocStyles)"   	    DestinationFolder="$(RootFolder)\bin\docs\site\styles"
/>
+		<Copy SourceFiles="@(DocHtml)"          DestinationFolder="$(RootFolder)\bin\docs\site\html"
/>
+		<Copy SourceFiles="@(DocIcons)"         DestinationFolder="$(RootFolder)\bin\docs\site\icons"
/>
+		<Copy SourceFiles="@(DocScripts)"       DestinationFolder="$(RootFolder)\bin\docs\site\scripts"
/>
+		<Copy SourceFiles="@(DocCore)"          DestinationFolder="$(RootFolder)\bin\docs\site\"
/>
+		<Copy SourceFiles="@(ChmFiles)"         DestinationFolder="$(RootFolder)\bin\docs\"
/>
+	</Target>
 	
-	
+	<Target Name="copy-packages">
+		<Copy SourceFiles="@(NugetPackages)"    DestinationFolder="$(RootFolder)\bin\packages"/>
+	</Target>
 	
 	<Target Name="test" DependsOnTargets="build">
 		<MakeDir Condition="!Exists('$(TEMP)')" Directories="$(TEMP)" />

Modified: incubator/lucene.net/trunk/build/scripts/validate-tool-chain.ps1
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/scripts/validate-tool-chain.ps1?rev=1175101&r1=1175100&r2=1175101&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/scripts/validate-tool-chain.ps1 (original)
+++ incubator/lucene.net/trunk/build/scripts/validate-tool-chain.ps1 Sat Sep 24 04:50:48 2011
@@ -18,20 +18,20 @@
 #
 # NOTICE: This script could mess up your development box. Use with extreme 
 # caution. Better yet, test this on a non-production env vm before attempting
-# to use it on any box of importance.
+# to use it on any box you consider important.
 #
 #
-# This is essentially a devopts script for installing tools that needed for
+# This is essentially a devopts script for installing tools that are needed for
 # the Lucene.NEt build scripts to run CI on windows. 
 #
-# Its could use some refactoring and increase its functionality for version 
-# & error checking.
+# The script could use some refactoring and has the need to 
+# increase its functionality for version & better error checking.
 # 
-# But it beats having to remember where to download & install packages from. 
+# However it is a good alternative to having to remember where to 
+# certain download software packages from or what to execute after the install. 
 #
 # This could also be handy for setting up new dev machines on windows 8 previews. 
 #
-#
 # When Co-App is finally released and is considered stable, we could potentially 
 # replace this script with that. 
 # http://coapp.org/
@@ -301,12 +301,4 @@ if($RequireWin7_1 -eq $false -and $Requi
 if($RequireNCover -eq $true)
 {
 	PromptForNCoverInstall
-}
-
-
-
-
-
-
-#$client.DownloadFile($WinSdk7_1Url, $WinSdk7_1FileName);
-
+}
\ No newline at end of file



Mime
View raw message