Skip to content

Commit

Permalink
Merge in changes from 3.0.3 branch, that were missing from 3.0.3 trun…
Browse files Browse the repository at this point in the history
…k changes

Updated build scripts to output assemblies with correct names and packages

git-svn-id: https://svn.apache.org/repos/asf/lucene.net/trunk@1391535 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
ccurrens committed Sep 28, 2012
1 parent e7d6c21 commit 6869de0
Show file tree
Hide file tree
Showing 113 changed files with 5,048 additions and 5,279 deletions.
6 changes: 6 additions & 0 deletions ACKNOWLEDGEMENTS.txt
Expand Up @@ -2,3 +2,9 @@ The snowball stemmers in contrib/Snowball.Net/Snowball.Net/SF/Snowball
were developed by Martin Porter and Richard Boulton.

The full snowball package is available from http://snowball.tartarus.org/

Apache Lucene.Net is a port of Jakarta Lucene to C#.
The port from Java to C# of version 1.4.0, 1.4.3, 1.9, 1.9.1, 2.0 and 2.1 were done
primary by George Aroush. To contact George Aroush please visit http://www.aroush.net/.
Much thanks to George

7,970 changes: 4,009 additions & 3,961 deletions src/CHANGES.txt → CHANGES.txt

Large diffs are not rendered by default.

12 changes: 0 additions & 12 deletions DISCLAIMER.txt

This file was deleted.

4 changes: 2 additions & 2 deletions README.txt
Expand Up @@ -9,10 +9,10 @@ but rather a code library and API that can easily be used to add search capabili
Apache Lucene.Net is compiled against Microsoft .NET Framework 4.0

The Apache Lucene.Net web site is at:
http://incubator.apache.org/lucene.net/
http://lucenenet.apache.org

Please join the Apache Lucene.Net-User mailing list by sending a message to:
lucene-net-user-subscribe@incubator.apache.org
user-subscribe@lucenenet.apache.org


FILES
Expand Down
2 changes: 2 additions & 0 deletions build/scripts/All/document.targets
Expand Up @@ -44,6 +44,8 @@
<DocumentationSource sourceFile="..\bin\contrib\Snowball\Release\NET40\Lucene.Net.Contrib.Snowball.XML" />
<DocumentationSource sourceFile="..\bin\contrib\Spatial\Release\NET40\Lucene.Net.Contrib.Spatial.dll" />
<DocumentationSource sourceFile="..\bin\contrib\Spatial\Release\NET40\Lucene.Net.Contrib.Spatial.XML" />
<DocumentationSource sourceFile="..\bin\contrib\Spatial.NTS\Release\NET40\Lucene.Net.Contrib.Spatial.NTS.dll" />
<DocumentationSource sourceFile="..\bin\contrib\Spatial.NTS\Release\NET40\Lucene.Net.Contrib.Spatial.NTS.XML" />
</DocumentationSources>
<HtmlHelpName>Lucene.Net</HtmlHelpName>
<HelpTitle>Lucene.Net Class Libraries</HelpTitle>
Expand Down
12 changes: 6 additions & 6 deletions build/scripts/Contrib/Lucene.Net.Contrib.nuspec
Expand Up @@ -37,8 +37,8 @@
</dependencies>
</metadata>
<files>
<file src="..\..\bin\contrib\FastVectorHighlighter\Release\**\Lucene.Net.FastVectorHighlighter.dll" target="lib" />
<file src="..\..\bin\contrib\FastVectorHighlighter\Release\**\Lucene.Net.FastVectorHighlighter.XML" target="lib" />
<file src="..\..\bin\contrib\FastVectorHighlighter\Release\**\Lucene.Net.Contrib.FastVectorHighlighter.dll" target="lib" />
<file src="..\..\bin\contrib\FastVectorHighlighter\Release\**\Lucene.Net.Contrib.FastVectorHighlighter.XML" target="lib" />
<file src="..\..\bin\contrib\Highlighter\Release\**\Lucene.Net.Contrib.Highlighter.dll" target="lib" />
<file src="..\..\bin\contrib\Highlighter\Release\**\Lucene.Net.Contrib.Highlighter.XML" target="lib" />
<file src="..\..\bin\contrib\Memory\Release\**\Lucene.Net.Contrib.Memory.dll" target="lib" />
Expand All @@ -49,10 +49,10 @@
<file src="..\..\bin\contrib\Core\Release\**\Lucene.Net.Contrib.Core.XML" target="lib" />
<file src="..\..\bin\contrib\Queries\Release\**\Lucene.Net.Contrib.Queries.dll" target="lib" />
<file src="..\..\bin\contrib\Queries\Release\**\Lucene.Net.Contrib.Queries.XML" target="lib" />
<file src="..\..\bin\contrib\Regex\Release\**\Contrib.Regex.dll" target="lib" />
<file src="..\..\bin\contrib\Regex\Release\**\Contrib.Regex.XML" target="lib" />
<file src="..\..\bin\contrib\SimpleFacetedSearch\Release\**\Lucene.Net.Search.SimpleFacetedSearch.dll" target="lib" />
<file src="..\..\bin\contrib\SimpleFacetedSearch\Release\**\Lucene.Net.Search.SimpleFacetedSearch.XML" target="lib" />
<file src="..\..\bin\contrib\Regex\Release\**\Lucene.Net.Contrib.Regex.dll" target="lib" />
<file src="..\..\bin\contrib\Regex\Release\**\Lucene.Net.Contrib.Regex.XML" target="lib" />
<file src="..\..\bin\contrib\SimpleFacetedSearch\Release\**\Lucene.Net.Contrib.SimpleFacetedSearch.dll" target="lib" />
<file src="..\..\bin\contrib\SimpleFacetedSearch\Release\**\Lucene.Net.Contrib.SimpleFacetedSearch.XML" target="lib" />
<file src="..\..\bin\contrib\Snowball\Release\**\Lucene.Net.Contrib.Snowball.dll" target="lib" />
<file src="..\..\bin\contrib\Snowball\Release\**\Lucene.Net.Contrib.Snowball.XML" target="lib" />
<file src="..\..\bin\contrib\Spatial\Release\**\Lucene.Net.Contrib.Spatial.dll" target="lib" />
Expand Down
12 changes: 6 additions & 6 deletions build/scripts/Contrib/document.targets
Expand Up @@ -24,18 +24,18 @@
<DocumentationSource sourceFile="..\bin\contrib\Analyzers\Release\NET40\Lucene.Net.Contrib.Analyzers.XML" />
<DocumentationSource sourceFile="..\bin\contrib\Core\Release\NET40\Lucene.Net.Contrib.Core.dll" />
<DocumentationSource sourceFile="..\bin\contrib\Core\Release\NET40\Lucene.Net.Contrib.Core.XML" />
<DocumentationSource sourceFile="..\bin\contrib\FastVectorHighlighter\Release\NET40\Lucene.Net.FastVectorHighlighter.dll" />
<DocumentationSource sourceFile="..\bin\contrib\FastVectorHighlighter\Release\NET40\Lucene.Net.FastVectorHighlighter.XML" />
<DocumentationSource sourceFile="..\bin\contrib\FastVectorHighlighter\Release\NET40\Lucene.Net.Contrib.FastVectorHighlighter.dll" />
<DocumentationSource sourceFile="..\bin\contrib\FastVectorHighlighter\Release\NET40\Lucene.Net.Contrib.FastVectorHighlighter.XML" />
<DocumentationSource sourceFile="..\bin\contrib\Highlighter\Release\NET40\Lucene.Net.Contrib.Highlighter.dll" />
<DocumentationSource sourceFile="..\bin\contrib\Highlighter\Release\NET40\Lucene.Net.Contrib.Highlighter.XML" />
<DocumentationSource sourceFile="..\bin\contrib\Memory\Release\NET40\Lucene.Net.Contrib.Memory.dll" />
<DocumentationSource sourceFile="..\bin\contrib\Memory\Release\NET40\Lucene.Net.Contrib.Memory.XML" />
<DocumentationSource sourceFile="..\bin\contrib\Queries\Release\NET40\Lucene.Net.Contrib.Queries.dll" />
<DocumentationSource sourceFile="..\bin\contrib\Queries\Release\NET40\Lucene.Net.Contrib.Queries.XML" />
<DocumentationSource sourceFile="..\bin\contrib\Regex\Release\NET40\Contrib.Regex.dll" />
<DocumentationSource sourceFile="..\bin\contrib\Regex\Release\NET40\Contrib.Regex.XML" />
<DocumentationSource sourceFile="..\bin\contrib\SimpleFacetedSearch\Release\NET40\Lucene.Net.Search.SimpleFacetedSearch.dll" />
<DocumentationSource sourceFile="..\bin\contrib\SimpleFacetedSearch\Release\NET40\Lucene.Net.Search.SimpleFacetedSearch.XML" />
<DocumentationSource sourceFile="..\bin\contrib\Regex\Release\NET40\Lucene.Net.Contrib.Regex.dll" />
<DocumentationSource sourceFile="..\bin\contrib\Regex\Release\NET40\Lucene.Net.Contrib.Regex.XML" />
<DocumentationSource sourceFile="..\bin\contrib\SimpleFacetedSearch\Release\NET40\Lucene.Net.Contrib.SimpleFacetedSearch.dll" />
<DocumentationSource sourceFile="..\bin\contrib\SimpleFacetedSearch\Release\NET40\Lucene.Net.Contrib.SimpleFacetedSearch.XML" />
<DocumentationSource sourceFile="..\bin\contrib\Similarity\Release\NET40\Lucene.Net.Contrib.Similarity.dll" />
<DocumentationSource sourceFile="..\bin\contrib\Similarity\Release\NET40\Lucene.Net.Contrib.Similarity.XML" />
<DocumentationSource sourceFile="..\bin\contrib\Snowball\Release\NET40\Lucene.Net.Contrib.Snowball.dll" />
Expand Down
9 changes: 8 additions & 1 deletion build/scripts/Contrib/project.targets
Expand Up @@ -24,16 +24,21 @@
Lucene.Net.Test,
-->
<PropertyGroup>
<ContribPackage>Lucene.Net.Contrib.nuspec</ContribPackage>
<ContribPackage>Lucene.Net.Contrib.nuspec</ContribPackage>
<SpatialNTSPackage>Lucene.Net.Spatial.NTS.nuspec</SpatialNTSPackage>
</PropertyGroup>
<PropertyGroup Condition="'$(Area)' == 'contrib'">
<ArtifactsFolder>$(BuildFolder)\artifacts\contrib</ArtifactsFolder>
</PropertyGroup>
<Target Name="package-contrib">
<Exec Command="$(PackageManager) $(ScriptsFolder)\Contrib\$(ContribPackage) $(PackageManagerOptions) $(ArtifactsFolder)" />
</Target>
<Target Name="package-spatialnts">
<Exec Command="$(PackageManager) $(ScriptsFolder)\Spatial.NTS\$(SpatialNTSPackage) $(PackageManagerOptions) $(ArtifactsFolder)" />
</Target>
<ItemGroup>
<PackageTargets Include="package-contrib" />
<PackageTargets Include="package-spatialnts" />
</ItemGroup>

<Import Project="../Analyzers/project.targets" />
Expand All @@ -46,6 +51,7 @@
<Import Project="../SimpleFacetedSearch/project.targets" />
<Import Project="../Snowball/project.targets" />
<Import Project="../Spatial/project.targets" />
<Import Project="../Spatial.NTS/project.targets" />
<Import Project="../SpellChecker/project.targets" />

<Target Name="BuildContrib">
Expand All @@ -59,6 +65,7 @@
<CallTarget Targets="BuildSimpleFacetedSearch" />
<CallTarget Targets="BuildSnowball" />
<CallTarget Targets="BuildSpatial" />
<CallTarget Targets="BuildSpatialNTS" />
<CallTarget Targets="BuildSpellChecker" />
</Target>

Expand Down
4 changes: 2 additions & 2 deletions build/scripts/FastVectorHighlighter/document.targets
Expand Up @@ -20,8 +20,8 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<DocumentationSources>
<DocumentationSource sourceFile="..\bin\contrib\FastVectorHighlighter\Release\NET40\Lucene.Net.FastVectorHighlighter.dll" />
<DocumentationSource sourceFile="..\bin\contrib\FastVectorHighlighter\Release\NET40\Lucene.Net.FastVectorHighlighter.XML" />
<DocumentationSource sourceFile="..\bin\contrib\FastVectorHighlighter\Release\NET40\Lucene.Net.Contrib.FastVectorHighlighter.dll" />
<DocumentationSource sourceFile="..\bin\contrib\FastVectorHighlighter\Release\NET40\Lucene.Net.Contrib.FastVectorHighlighter.XML" />
</DocumentationSources>
<HtmlHelpName>Lucene.Net.Contrib.FastVectorHighlighter</HtmlHelpName>
<HelpTitle>FastVectorHighlighter Class Library</HelpTitle>
Expand Down
8 changes: 4 additions & 4 deletions build/scripts/FastVectorHighlighter/project.targets
Expand Up @@ -48,14 +48,14 @@
<BuildItems Include="$(FastVectorHighlighterFolder)\**\*.*" />

<!-- Assemblies To Test -->
<TestFiles Include="$(FastVectorHighlighterFolder)\**\Lucene.Net.FastVectorHighlighter.Test.dll" />
<TestFiles Include="$(FastVectorHighlighterFolder)\**\Lucene.Net.Contrib.FastVectorHighlighter.Test.dll" />

<!-- Files To Release -->
<ReleaseFiles Include="$(FastVectorHighlighterFolder)\**\Lucene.Net.FastVectorHighlighter.dll" />
<ReleaseFiles Include="$(FastVectorHighlighterFolder)\**\Lucene.Net.FastVectorHighlighter.XML" />
<ReleaseFiles Include="$(FastVectorHighlighterFolder)\**\Lucene.Net.Contrib.FastVectorHighlighter.dll" />
<ReleaseFiles Include="$(FastVectorHighlighterFolder)\**\Lucene.Net.Contrib.FastVectorHighlighter.XML" />

<!-- Files to Analysis -->
<AnalysisFiles Include="$(FastVectorHighlighterFolder)\**\Lucene.Net.FastVectorHighlighter.dll" />
<AnalysisFiles Include="$(FastVectorHighlighterFolder)\**\Lucene.Net.Contrib.FastVectorHighlighter.dll" />
</ItemGroup>
</Target>

Expand Down
4 changes: 2 additions & 2 deletions build/scripts/Regex/document.targets
Expand Up @@ -20,8 +20,8 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<DocumentationSources>
<DocumentationSource sourceFile="..\bin\contrib\Regex\Release\NET40\Contrib.Regex.dll" />
<DocumentationSource sourceFile="..\bin\contrib\Regex\Release\NET40\Contrib.Regex.XML" />
<DocumentationSource sourceFile="..\bin\contrib\Regex\Release\NET40\Lucene.Net.Contrib.Regex.dll" />
<DocumentationSource sourceFile="..\bin\contrib\Regex\Release\NET40\Lucene.Net.Contrib.Regex.XML" />
</DocumentationSources>
<HtmlHelpName>Lucene.Net.Contrib.Regex</HtmlHelpName>
<HelpTitle>Regex Class Library</HelpTitle>
Expand Down
8 changes: 4 additions & 4 deletions build/scripts/Regex/project.targets
Expand Up @@ -48,14 +48,14 @@
<BuildItems Include="$(RegexFolder)\**\*.*" />

<!-- Assemblies To Test -->
<TestFiles Include="$(RegexFolder)\**\Contrib.Regex.Test.dll" />
<TestFiles Include="$(RegexFolder)\**\Lucene.Net.Contrib.Regex.Test.dll" />

<!-- Files To Release -->
<ReleaseFiles Include="$(RegexFolder)\**\Contrib.Regex.dll" />
<ReleaseFiles Include="$(RegexFolder)\**\Contrib.Regex.XML" />
<ReleaseFiles Include="$(RegexFolder)\**\Lucene.Net.Contrib.Regex.dll" />
<ReleaseFiles Include="$(RegexFolder)\**\Lucene.Net.Contrib.Regex.XML" />

<!-- Files to Analysis -->
<AnalysisFiles Include="$(RegexFolder)\**\Contrib.Regex.dll" />
<AnalysisFiles Include="$(RegexFolder)\**\Lucene.Net.Contrib.Regex.dll" />
</ItemGroup>
</Target>

Expand Down
4 changes: 2 additions & 2 deletions build/scripts/SimpleFacetedSearch/document.targets
Expand Up @@ -20,8 +20,8 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<DocumentationSources>
<DocumentationSource sourceFile="..\bin\contrib\SimpleFacetedSearch\Release\NET40\Lucene.Net.Search.SimpleFacetedSearch.dll" />
<DocumentationSource sourceFile="..\bin\contrib\SimpleFacetedSearch\Release\NET40\Lucene.Net.Search.SimpleFacetedSearch.XML" />
<DocumentationSource sourceFile="..\bin\contrib\SimpleFacetedSearch\Release\NET40\Lucene.Net.Contrib.SimpleFacetedSearch.dll" />
<DocumentationSource sourceFile="..\bin\contrib\SimpleFacetedSearch\Release\NET40\Lucene.Net.Contrib.SimpleFacetedSearch.XML" />
</DocumentationSources>
<HtmlHelpName>Lucene.Net.Contrib.SimpleFacetedSearch</HtmlHelpName>
<HelpTitle>SimpleFacetedSearch Class Library</HelpTitle>
Expand Down
8 changes: 4 additions & 4 deletions build/scripts/SimpleFacetedSearch/project.targets
Expand Up @@ -48,14 +48,14 @@
<BuildItems Include="$(SimpleFacetedSearchFolder)\**\*.*" />

<!-- Assemblies To Test -->
<TestFiles Include="$(SimpleFacetedSearchFolder)\**\Lucene.Net.Search.SimpleFacetedSearch.Test.dll" />
<TestFiles Include="$(SimpleFacetedSearchFolder)\**\Lucene.Net.Contrib.SimpleFacetedSearch.Test.dll" />

<!-- Files To Release -->
<ReleaseFiles Include="$(SimpleFacetedSearchFolder)\**\Lucene.Net.Search.SimpleFacetedSearch.dll" />
<ReleaseFiles Include="$(SimpleFacetedSearchFolder)\**\Lucene.Net.Search.SimpleFacetedSearch.XML" />
<ReleaseFiles Include="$(SimpleFacetedSearchFolder)\**\Lucene.Net.Contrib.SimpleFacetedSearch.dll" />
<ReleaseFiles Include="$(SimpleFacetedSearchFolder)\**\Lucene.Net.Contrib.SimpleFacetedSearch.XML" />

<!-- Files to Analysis -->
<AnalysisFiles Include="$(SimpleFacetedSearchFolder)\**\Lucene.Net.Search.SimpleFacetedSearch.dll" />
<AnalysisFiles Include="$(SimpleFacetedSearchFolder)\**\Lucene.Net.Contrib.SimpleFacetedSearch.dll" />
</ItemGroup>
</Target>

Expand Down
47 changes: 47 additions & 0 deletions build/scripts/Spatial.NTS/Lucene.Net.Spatial.NTS.nuspec
@@ -0,0 +1,47 @@
<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Lucene.Net.Spatial.NTS</id>
<version>$version$</version>
<title>Lucene.Net Spatial NTS Library</title>
<authors>Lucene.Net Community</authors>
<owners>The Apache Software Foundation</owners>
<iconUrl>http://incubator.apache.org/lucene.net/media/lucene-net-ico-128x128.png</iconUrl>
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0.html</licenseUrl>
<projectUrl>http://incubator.apache.org/lucene.net/</projectUrl>
<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 contains only the Spatial NTS Contrib Lucene.Net assembly.</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>
<dependency id="Lucene.Net" version="3.0.3" />
<dependency id="NetTopologySuite" version="1.12.0" />
<dependency id="GeoAPI" version="1.6.0" />
</dependencies>
</metadata>
<files>
<file src="..\..\bin\contrib\Spatial.NTS\Release\**\Lucene.Net.Contrib.Spatial.NTS.dll" target="lib" />
<file src="..\..\bin\contrib\Spatial.NTS\Release\**\Lucene.Net.Contrib.Spatial.NTS.XML" target="lib" />
</files>

</package>
31 changes: 31 additions & 0 deletions build/scripts/Spatial.NTS/document.targets
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<DocumentationSources>
<DocumentationSource sourceFile="..\bin\contrib\Spatial.NTS\Release\NET40\Lucene.Net.Contrib.Spatial.dll" />
<DocumentationSource sourceFile="..\bin\contrib\Spatial.NTS\Release\NET40\Lucene.Net.Contrib.Spatial.XML" />
</DocumentationSources>
<HtmlHelpName>Lucene.Net.Contrib.Spatial.NTS</HtmlHelpName>
<HelpTitle>Spatial.NTS Class Library</HelpTitle>
<WorkingPath>..\artifacts\Spatial.NTS\working\</WorkingPath>
<OutputPath>..\artifacts\Spatial.NTS\docs\</OutputPath>
</PropertyGroup>
</Project>

0 comments on commit 6869de0

Please sign in to comment.