You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by mh...@apache.org on 2011/09/19 07:06:21 UTC
[Lucene.Net] svn commit: r1172425 [3/3] - in
/incubator/lucene.net/branches/Lucene.Net_4e: build/scripts/Coverage.xml
build/scripts/documentation.shfbproj build/scripts/shfb.targets
src/Lucene.Net/Lucene.Net.csproj src/Lucene.Net/Util/CharsRef.cs
Modified: incubator/lucene.net/branches/Lucene.Net_4e/build/scripts/documentation.shfbproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_4e/build/scripts/documentation.shfbproj?rev=1172425&r1=1172424&r2=1172425&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_4e/build/scripts/documentation.shfbproj (original)
+++ incubator/lucene.net/branches/Lucene.Net_4e/build/scripts/documentation.shfbproj Mon Sep 19 05:06:20 2011
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
- <!-- The configuration and platform will be used to determine which
- assemblies to include from solution and project documentation
+ <!-- The configuration and platform will be used to determine which
+ assemblies to include from solution and project documentation
sources -->
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{f57dd4a8-d22e-43fd-87de-2ba22a54564d}</ProjectGuid>
<SHFBSchemaVersion>1.9.3.0</SHFBSchemaVersion>
- <!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
+ <!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
Studio adds them anyway -->
<AssemblyName>Documentation</AssemblyName>
<RootNamespace>Documentation</RootNamespace>
@@ -31,8 +31,8 @@
<HelpTitle>Lucene.Net Class Library</HelpTitle>
<BinaryTOC>False</BinaryTOC>
</PropertyGroup>
- <!-- There are no properties for these groups. AnyCPU needs to appear in
- order for Visual Studio to perform the build. The others are optional
+ <!-- There are no properties for these groups. AnyCPU needs to appear in
+ order for Visual Studio to perform the build. The others are optional
common platform types that may appear. -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
</PropertyGroup>
@@ -68,5 +68,5 @@
</Reference>
</ItemGroup>
<!-- Import the SHFB build targets -->
- <Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
+ <Import Project="shfb.targets" />
</Project>
\ No newline at end of file
Added: incubator/lucene.net/branches/Lucene.Net_4e/build/scripts/shfb.targets
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_4e/build/scripts/shfb.targets?rev=1172425&view=auto
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_4e/build/scripts/shfb.targets (added)
+++ incubator/lucene.net/branches/Lucene.Net_4e/build/scripts/shfb.targets Mon Sep 19 05:06:20 2011
@@ -0,0 +1,88 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <!-- Sandcastle Help File Builder Tasks. http://SHFB.CodePlex.com -->
+ <UsingTask TaskName="SandcastleBuilder.Utils.MSBuild.BuildHelp"
+ AssemblyFile="$(SHFBROOT)\SandcastleBuilder.Utils.dll" />
+ <UsingTask TaskName="SandcastleBuilder.Utils.MSBuild.CleanHelp"
+ AssemblyFile="$(SHFBROOT)\SandcastleBuilder.Utils.dll" />
+
+ <Import Project="$(CustomBeforeSHFBTargets)" Condition="Exists('$(CustomBeforeSHFBTargets)')" />
+
+ <!-- This defines the dependencies for the Build target -->
+ <PropertyGroup>
+ <BuildDependsOn>
+ BeforeBuildHelp;
+ CoreBuildHelp;
+ AfterBuildHelp
+ </BuildDependsOn>
+ </PropertyGroup>
+
+ <Target Name="Build" DependsOnTargets="$(BuildDependsOn)" />
+
+ <!-- The Core Build Help target -->
+ <Target Name="CoreBuildHelp">
+ <SandcastleBuilder.Utils.MSBuild.BuildHelp
+ ProjectFile="$(MSBuildProjectFullPath)"
+ Configuration="$(Configuration)"
+ Platform="$(Platform)"
+ OutDir="$(OutDir)"
+ Verbose="$(Verbose)"
+ DumpLogOnFailure="$(DumpLogOnFailure)"
+ AlwaysLoadProject="$(AlwaysLoadProject)">
+ <Output TaskParameter="Help1Files" ItemName="Help1Files" />
+ <Output TaskParameter="Help2Files" ItemName="Help2Files" />
+ <Output TaskParameter="HelpViewerFiles" ItemName="HelpViewerFiles" />
+ <Output TaskParameter="WebsiteFiles" ItemName="WebsiteFiles" />
+ <Output TaskParameter="AllHelpFiles" ItemName="AllHelpFiles" />
+ </SandcastleBuilder.Utils.MSBuild.BuildHelp>
+ </Target>
+
+ <!-- The following targets may be overridden in project files to perform
+ additional processing. -->
+ <Target Name="BeforeBuildHelp" />
+ <Target Name="AfterBuildHelp" />
+
+ <!-- This defines the dependencies for the Clean target -->
+ <PropertyGroup>
+ <CleanDependsOn>
+ BeforeCleanHelp;
+ CoreCleanHelp;
+ AfterCleanHelp
+ </CleanDependsOn>
+ </PropertyGroup>
+
+ <Target Name="Clean" DependsOnTargets="$(CleanDependsOn)" />
+
+ <!-- The Core Clean Help target -->
+ <Target Name="CoreCleanHelp">
+ <SandcastleBuilder.Utils.MSBuild.CleanHelp
+ ProjectFile="$(MSBuildProjectFullPath)"
+ OutputPath="$(OutputPath)"
+ WorkingPath="$(WorkingPath)"
+ LogFileLocation="$(LogFileLocation)" />
+ </Target>
+
+ <!-- The following targets may be overridden in project files to perform
+ additional processing. -->
+ <Target Name="BeforeCleanHelp" />
+ <Target Name="AfterCleanHelp" />
+
+ <!-- This defines the dependencies for the Rebuild target -->
+ <PropertyGroup>
+ <RebuildDependsOn>
+ BeforeRebuildHelp;
+ Clean;
+ Build;
+ AfterRebuildHelp;
+ </RebuildDependsOn>
+ </PropertyGroup>
+
+ <Target Name="Rebuild" DependsOnTargets="$(RebuildDependsOn)" />
+
+ <!-- The following targets may be overridden in project files to perform
+ additional processing. -->
+ <Target Name="BeforeRebuildHelp" />
+ <Target Name="AfterRebuildHelp" />
+
+ <Import Project="$(CustomAfterSHFBTargets)" Condition="Exists('$(CustomAfterSHFBTargets)')" />
+
+</Project>
Modified: incubator/lucene.net/branches/Lucene.Net_4e/src/Lucene.Net/Lucene.Net.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_4e/src/Lucene.Net/Lucene.Net.csproj?rev=1172425&r1=1172424&r2=1172425&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_4e/src/Lucene.Net/Lucene.Net.csproj (original)
+++ incubator/lucene.net/branches/Lucene.Net_4e/src/Lucene.Net/Lucene.Net.csproj Mon Sep 19 05:06:20 2011
@@ -39,16 +39,26 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System">
- <Private>False</Private>
+ <Private>True</Private>
</Reference>
<Reference Include="System.Core">
- <Private>False</Private>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="System.Net">
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="System.Runtime.Serialization">
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="System.ServiceModel">
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="System.Xml">
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="System.Xml.Serialization">
+ <Private>True</Private>
</Reference>
- <Reference Include="System.Net" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.ServiceModel" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Xml.Serialization" />
</ItemGroup>
<ItemGroup>
<Compile Include="Analysis\Analyzer.cs" />
Modified: incubator/lucene.net/branches/Lucene.Net_4e/src/Lucene.Net/Util/CharsRef.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_4e/src/Lucene.Net/Util/CharsRef.cs?rev=1172425&r1=1172424&r2=1172425&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_4e/src/Lucene.Net/Util/CharsRef.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_4e/src/Lucene.Net/Util/CharsRef.cs Mon Sep 19 05:06:20 2011
@@ -471,11 +471,12 @@ namespace Lucene.Net.Util
rightOffset = right.Offset,
end = leftOffset + Math.Min(left.Length, right.Length);
- Action<int> normalize = (value) => {
+ Func<int, int> normalize = (value) => {
if (value >= 0xe000)
value -= 0x800;
else
value += 0x2000;
+ return value;
};
@@ -489,8 +490,8 @@ namespace Lucene.Net.Util
//// fix up each value if both values are inside of or above the surrogate range. then compare.
if (leftChar >= 0xd800 && rightChar >= 0xd800)
{
- normalize(leftChar);
- normalize(rightChar);
+ leftChar = normalize(leftChar);
+ rightChar = normalize(rightChar);
}
return leftChar - rightChar;