You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@openoffice.apache.org by Jim Jagielski <ji...@jaguNET.com> on 2018/03/14 14:11:27 UTC
Issue w/ lucene build/patch in trunk
I am getting the below error:
=============
Building module lucene
=============
Entering /Users/jim/src/asf/AOO420/main/lucene
missing header for unified diff at line 3 of patch
patching file lucene-2.9.4/common-build.xml
Reversed (or previously applied) patch detected! Assume -R? [n] y
patching file lucene-2.9.4/common-build.xml
Reversed (or previously applied) patch detected! Assume -R? [n] y
patching file lucene-2.9.4/contrib/analyzers/common/build.xml
Reversed (or previously applied) patch detected! Assume -R? [n] y
(Stripping trailing CRs from patch.)
patching file lucene-2.9.4/contrib/analyzers/smartcn/build.xml
Hunk #1 FAILED at 23.
1 out of 1 hunk FAILED -- saving rejects to file lucene-2.9.4/contrib/analyzers/smartcn/build.xml.rej
dmake: Error code 1, while making './unxmaccx.pro/misc/build/so_patched_so_lucene'
The rejected patch is:
% cat lucene/unxmaccx.pro/misc/build/lucene-2.9.4/contrib/analyzers/smartcn/build.xml.rej
***************
*** 23,30 ****
Smart Chinese Analyzer
</description>
- <property name="javac.source" value="1.4" />
- <property name="javac.target" value="1.4" />
<property name="build.dir" location="../../../build/contrib/analyzers/smartcn" />
<property name="dist.dir" location="../../../dist/contrib/analyzers/smartcn" />
--- 23,30 ----
Smart Chinese Analyzer
</description>
+ <property name="javac.source" value="1.6" />
+ <property name="javac.target" value="1.6" />
<property name="build.dir" location="../../../build/contrib/analyzers/smartcn" />
<property name="dist.dir" location="../../../dist/contrib/analyzers/smartcn" />
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org
Re: Issue w/ lucene build/patch in trunk
Posted by Damjan Jovanovic <da...@apache.org>.
Sorry about that, and well done on fixing it :).
On Mon, Mar 19, 2018 at 4:20 PM, Jim Jagielski <ji...@jagunet.com> wrote:
> Fixed in r1827202... there were some EOL gremlins in the patch-file which
> caused patch to barf
>
> > On Mar 14, 2018, at 10:11 AM, Jim Jagielski <ji...@jaguNET.com> wrote:
> >
> > I am getting the below error:
> >
> > =============
> > Building module lucene
> > =============
> >
> > Entering /Users/jim/src/asf/AOO420/main/lucene
> >
> > missing header for unified diff at line 3 of patch
> > patching file lucene-2.9.4/common-build.xml
> > Reversed (or previously applied) patch detected! Assume -R? [n] y
> > patching file lucene-2.9.4/common-build.xml
> > Reversed (or previously applied) patch detected! Assume -R? [n] y
> > patching file lucene-2.9.4/contrib/analyzers/common/build.xml
> > Reversed (or previously applied) patch detected! Assume -R? [n] y
> > (Stripping trailing CRs from patch.)
> > patching file lucene-2.9.4/contrib/analyzers/smartcn/build.xml
> > Hunk #1 FAILED at 23.
> > 1 out of 1 hunk FAILED -- saving rejects to file lucene-2.9.4/contrib/
> analyzers/smartcn/build.xml.rej
> > dmake: Error code 1, while making './unxmaccx.pro/misc/build/so_
> patched_so_lucene'
> >
> >
> > The rejected patch is:
> >
> > % cat lucene/unxmaccx.pro/misc/build/lucene-2.9.4/contrib/
> analyzers/smartcn/build.xml.rej
> > ***************
> > *** 23,30 ****
> > Smart Chinese Analyzer
> > </description>
> >
> > - <property name="javac.source" value="1.4" />
> > - <property name="javac.target" value="1.4" />
> >
> > <property name="build.dir" location="../../../build/contrib/analyzers/smartcn"
> />
> > <property name="dist.dir" location="../../../dist/contrib/analyzers/smartcn"
> />
> > --- 23,30 ----
> > Smart Chinese Analyzer
> > </description>
> >
> > + <property name="javac.source" value="1.6" />
> > + <property name="javac.target" value="1.6" />
> >
> > <property name="build.dir" location="../../../build/contrib/analyzers/smartcn"
> />
> > <property name="dist.dir" location="../../../dist/contrib/analyzers/smartcn"
> />
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
> > For additional commands, e-mail: dev-help@openoffice.apache.org
> >
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
> For additional commands, e-mail: dev-help@openoffice.apache.org
>
>
Re: Issue w/ lucene build/patch in trunk
Posted by Jim Jagielski <ji...@jaguNET.com>.
Fixed in r1827202... there were some EOL gremlins in the patch-file which
caused patch to barf
> On Mar 14, 2018, at 10:11 AM, Jim Jagielski <ji...@jaguNET.com> wrote:
>
> I am getting the below error:
>
> =============
> Building module lucene
> =============
>
> Entering /Users/jim/src/asf/AOO420/main/lucene
>
> missing header for unified diff at line 3 of patch
> patching file lucene-2.9.4/common-build.xml
> Reversed (or previously applied) patch detected! Assume -R? [n] y
> patching file lucene-2.9.4/common-build.xml
> Reversed (or previously applied) patch detected! Assume -R? [n] y
> patching file lucene-2.9.4/contrib/analyzers/common/build.xml
> Reversed (or previously applied) patch detected! Assume -R? [n] y
> (Stripping trailing CRs from patch.)
> patching file lucene-2.9.4/contrib/analyzers/smartcn/build.xml
> Hunk #1 FAILED at 23.
> 1 out of 1 hunk FAILED -- saving rejects to file lucene-2.9.4/contrib/analyzers/smartcn/build.xml.rej
> dmake: Error code 1, while making './unxmaccx.pro/misc/build/so_patched_so_lucene'
>
>
> The rejected patch is:
>
> % cat lucene/unxmaccx.pro/misc/build/lucene-2.9.4/contrib/analyzers/smartcn/build.xml.rej
> ***************
> *** 23,30 ****
> Smart Chinese Analyzer
> </description>
>
> - <property name="javac.source" value="1.4" />
> - <property name="javac.target" value="1.4" />
>
> <property name="build.dir" location="../../../build/contrib/analyzers/smartcn" />
> <property name="dist.dir" location="../../../dist/contrib/analyzers/smartcn" />
> --- 23,30 ----
> Smart Chinese Analyzer
> </description>
>
> + <property name="javac.source" value="1.6" />
> + <property name="javac.target" value="1.6" />
>
> <property name="build.dir" location="../../../build/contrib/analyzers/smartcn" />
> <property name="dist.dir" location="../../../dist/contrib/analyzers/smartcn" />
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
> For additional commands, e-mail: dev-help@openoffice.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org