I've added back the deleted map file I forgot to revert, and have forced a
rebuild on the Windows bot.

On Tue, Mar 13, 2018 at 3:52 PM, Matthias Seidel <matthias.sei...@hamburg.de
> wrote:

> Am 13.03.2018 um 04:19 schrieb Damjan Jovanovic:
> > Hi
> >
> > Thank you.
> >
> > Fiddling with the main/cppuhelper/source/makefile.mk to reintroduce the
> map
> > file while keeping the other changes did not help, so it doesn't seem
> like
> > a case of exporting a symbol that wasn't exported before.
> >
> > I've reverted all the changes to main/cppuhelper in r1826602 while I
> > investigate further. This should hopefully get AOO building again.
>
> Unfortunately not:
>
> ERROR: error 65280 occurred while making
> /cygdrive/e/slave14/aoo-win7/build/main/cppuhelper/source
>
> https://ci.apache.org/projects/openoffice/buildlogs/
> win/main/svtools/wntmsci12.pro/misc/logs/prj.txt
>
> >
> > Oddly I think only the Windows build was affected by this.
>
> Yes, it seems to be Windows only.
>
> Regards,
>    Matthias
>
> >
> > Damjan
> >
> >
> > On Sun, Mar 11, 2018 at 10:01 PM, Matthias Seidel <
> > matthias.sei...@hamburg.de> wrote:
> >
> >> Hi Damjan,
> >>
> >> Maybe you already have seen it (buildbot revision 1826428):
> >>
> >> "ERROR: error 65280 occurred while making
> >> /cygdrive/e/slave14/aoo-win7/build/main/svtools/prj"
> >>
> >> https://ci.apache.org/projects/openoffice/buildlogs/
> >> win/main/svtools/wntmsci12.pro/misc/logs/prj.txt
> >>
> >> Regards,
> >>
> >>    Matthias
> >>
> >>
> >> Am 10.03.2018 um 19:18 schrieb Matthias Seidel:
> >>> Hi Damjan,
> >>>
> >>> I think your last commit [1] breaks the Win32 build:
> >>>
> >>> "ERROR: error 65280 occurred while making
> >>> /cygdrive/c/Source/aoo/main/cppuhelper/source" in my local build.
> >>>
> >>> See a more detailed log from our buildbot:
> >>>
> >>> https://ci.apache.org/projects/openoffice/buildlogs/
> >> win/main/cppuhelper/wntmsci12.pro/misc/logs/source.txt
> >>> Regards,
> >>>
> >>>   Matthias
> >>>
> >>> [1] https://svn.apache.org/viewvc?view=revision&revision=1826398
> >>>
> >>>
> >>> Am 05.03.2018 um 21:19 schrieb Damjan Jovanovic:
> >>>> On Mon, Mar 5, 2018 at 3:29 PM, Patricia Shanahan <p...@acm.org>
> wrote:
> >>>>
> >>>>> On 3/4/2018 11:27 PM, Damjan Jovanovic wrote:
> >>>>> ...
> >>>>>
> >>>>>> But there is a simple way to both keep the 64->32 bit building
> working
> >>>>>> while making the 64 bit changes in trunk, and still get the benefits
> >> of
> >>>>>> testing. The changes involved to enable the 64 bit build environment
> >>>>>> amount
> >>>>>> to 1 relatively small patch affecting only 5 files, and without this
> >> patch
> >>>>>> it will still build 32 bit binaries on 64 bit Windows. Thus this
> >> patch can
> >>>>>> be maintained out-of-tree while patching modules to build on Win64,
> >> and
> >>>>>> those building without this patch will end up automatically testing
> >>>>>> whether
> >>>>>> any of the (small and relatively safe) module changes broke the
> Win32
> >>>>>> build.
> >>>>>>
> >>>>> ...
> >>>>>
> >>>>> In general, I favor keeping things checked in, but in keep the patch
> >> that
> >>>>> breaks 64->32 in its own branch. The remaining changes can go in the
> >> trunk.
> >>>>>
> >>>> The patch affects 4 files and is only 254 lines long in total, so I've
> >> just
> >>>> placed it into main/solenv/win64/win64.patch together with a readme
> file
> >>>> referring people to the wiki page (
> >>>> https://wiki.openoffice.org/wiki/Win64_port) where I've described how
> >> to
> >>>> apply it and start the Win64 build.
> >>>>
> >>
> >>
>
>
>

Reply via email to