Re: svn commit: r1839782 - in /openoffice/trunk/main: ./ rsc/ rsc/prj/ rsc/source/parser/ solenv/gbuild/

2018-09-04 Thread Damjan Jovanovic
On Tue, Sep 4, 2018 at 9:27 PM Matthias Seidel 
wrote:

> Am 04.09.2018 um 18:56 schrieb Damjan Jovanovic:
> > On Tue, Sep 4, 2018 at 11:16 AM Matthias Seidel <
> matthias.sei...@hamburg.de>
> > wrote:
> >
> >> Hi Damjan,
> >>
> >> Am 04.09.2018 um 07:43 schrieb Damjan Jovanovic:
> >>> I don't get it, main/sfx2 builds for me on both FreeBSD and Windows.
> >>>
> >>> main/salhelper fails to build on Windows, and it looks like a mission
> to
> >>> fix it :(.
> >> It *is* now in salhelper:
> >>
> >>
> https://ci.apache.org/projects/openoffice/buildlogs/win/main/salhelper/wntmsci12.pro/misc/logs/prj.txt
> >>
> >>
> > I just committed a patch to salhelper that should fix building on
> Windows.
> >
> > And starting a clean rebuild to check for other errors.
>
> Hi Damjan,
>
> I also started a new Windows build...
>
> But the Linux builds still fail in sfx2:
>
> https://ci.apache.org/projects/openoffice/buildlogs/linux64/main/sfx2/unxlngx6.pro/misc/logs/prj.txt
>
> Looks like a syntax error in a resource file?
>
>
I had to make a few more changes in r1840081 to get Windows to build, but
it does build now.

It's possible that porting rsc (our resource compiler) to gbuild, and the
Bison support I had to add to gbuild, broke parsing some resource files.
But I don't understand how Windows and FreeBSD build, but Linux doesn't?


Re: svn commit: r1839782 - in /openoffice/trunk/main: ./ rsc/ rsc/prj/ rsc/source/parser/ solenv/gbuild/

2018-09-04 Thread Matthias Seidel
Am 04.09.2018 um 18:56 schrieb Damjan Jovanovic:
> On Tue, Sep 4, 2018 at 11:16 AM Matthias Seidel 
> wrote:
>
>> Hi Damjan,
>>
>> Am 04.09.2018 um 07:43 schrieb Damjan Jovanovic:
>>> I don't get it, main/sfx2 builds for me on both FreeBSD and Windows.
>>>
>>> main/salhelper fails to build on Windows, and it looks like a mission to
>>> fix it :(.
>> It *is* now in salhelper:
>>
>> https://ci.apache.org/projects/openoffice/buildlogs/win/main/salhelper/wntmsci12.pro/misc/logs/prj.txt
>>
>>
> I just committed a patch to salhelper that should fix building on Windows.
>
> And starting a clean rebuild to check for other errors.

Hi Damjan,

I also started a new Windows build...

But the Linux builds still fail in sfx2:
https://ci.apache.org/projects/openoffice/buildlogs/linux64/main/sfx2/unxlngx6.pro/misc/logs/prj.txt

Looks like a syntax error in a resource file?

Regards,
   Matthias

>
> Regards
> Damjan
>




smime.p7s
Description: S/MIME Cryptographic Signature


Re: svn commit: r1839782 - in /openoffice/trunk/main: ./ rsc/ rsc/prj/ rsc/source/parser/ solenv/gbuild/

2018-09-04 Thread Damjan Jovanovic
On Tue, Sep 4, 2018 at 11:16 AM Matthias Seidel 
wrote:

> Hi Damjan,
>
> Am 04.09.2018 um 07:43 schrieb Damjan Jovanovic:
> > I don't get it, main/sfx2 builds for me on both FreeBSD and Windows.
> >
> > main/salhelper fails to build on Windows, and it looks like a mission to
> > fix it :(.
>
> It *is* now in salhelper:
>
> https://ci.apache.org/projects/openoffice/buildlogs/win/main/salhelper/wntmsci12.pro/misc/logs/prj.txt
>
>
I just committed a patch to salhelper that should fix building on Windows.

And starting a clean rebuild to check for other errors.

Regards
Damjan


Re: svn commit: r1839782 - in /openoffice/trunk/main: ./ rsc/ rsc/prj/ rsc/source/parser/ solenv/gbuild/

2018-09-04 Thread Matthias Seidel
Hi Damjan,

Am 04.09.2018 um 07:43 schrieb Damjan Jovanovic:
> I don't get it, main/sfx2 builds for me on both FreeBSD and Windows.
>
> main/salhelper fails to build on Windows, and it looks like a mission to
> fix it :(.

It *is* now in salhelper:
https://ci.apache.org/projects/openoffice/buildlogs/win/main/salhelper/wntmsci12.pro/misc/logs/prj.txt

Regards,
   Matthias

>
> On Tue, Sep 4, 2018 at 6:16 AM Damjan Jovanovic  wrote:
>
>> Thank you, I am having a look.
>>
>> Damjan
>>
>>
>> On Sat, Sep 1, 2018 at 4:17 PM Matthias Seidel 
>> wrote:
>>
>>> Hi Damjan,
>>>
>>> This one seems to break the Windows build:
>>>
>>> https://ci.apache.org/projects/openoffice/buildlogs/win/main/sfx2/wntmsci12.pro/misc/logs/prj.txt
>>>
>>> Regards,
>>>
>>>Matthias
>>>
>>>
>>> Am 31.08.2018 um 20:54 schrieb dam...@apache.org:
 Author: damjan
 Date: Fri Aug 31 18:54:31 2018
 New Revision: 1839782

 URL: http://svn.apache.org/viewvc?rev=1839782=rev
 Log:
 Implement gbuild functions for building Bison files.

 Port main/rsc to gbuild.

 Patch by: me


 Added:
 openoffice/trunk/main/rsc/Executable_rsc.mk
 openoffice/trunk/main/rsc/Executable_rsc2.mk
 openoffice/trunk/main/rsc/Executable_rscpp.mk
 openoffice/trunk/main/rsc/Makefile   (with props)
 openoffice/trunk/main/rsc/Module_rsc.mk
 openoffice/trunk/main/rsc/Package_inc.mk
 openoffice/trunk/main/rsc/prj/makefile.mk
 openoffice/trunk/main/rsc/source/parser/yyrscyacc.y
   - copied unchanged from r1839781,
>>> openoffice/trunk/main/rsc/source/parser/rscyacc.y
 Removed:
 openoffice/trunk/main/rsc/source/parser/rscyacc.y
 Modified:
 openoffice/trunk/main/Module_ooo.mk
 openoffice/trunk/main/Repository.mk
 openoffice/trunk/main/rsc/prj/build.lst
 openoffice/trunk/main/rsc/prj/d.lst
 openoffice/trunk/main/solenv/gbuild/Executable.mk
 openoffice/trunk/main/solenv/gbuild/LinkTarget.mk
 openoffice/trunk/main/solenv/gbuild/TargetLocations.mk

 Modified: openoffice/trunk/main/Module_ooo.mk
 URL:
>>> http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1839782=1839781=1839782=diff
>>> ==
 --- openoffice/trunk/main/Module_ooo.mk (original)
 +++ openoffice/trunk/main/Module_ooo.mk Fri Aug 31 18:54:31 2018
 @@ -72,6 +72,7 @@ $(eval $(call gb_Module_add_moduledirs,o
   remotebridges \
   reportdesign \
   ridljar \
 + rsc \
   sane \
   sax \
   sc \

 Modified: openoffice/trunk/main/Repository.mk
 URL:
>>> http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1839782=1839781=1839782=diff
>>> ==
 --- openoffice/trunk/main/Repository.mk (original)
 +++ openoffice/trunk/main/Repository.mk Fri Aug 31 18:54:31 2018
 @@ -32,7 +32,10 @@ $(eval $(call gb_Helper_register_executa
   mkunroll \
   rdbedit \
   rdbmaker \
 + rsc \
 + rsc2 \
   rscdep \
 + rscpp \
   so_checksum \
   srvdepy \
   svidl \

 Added: openoffice/trunk/main/rsc/Executable_rsc.mk
 URL:
>>> http://svn.apache.org/viewvc/openoffice/trunk/main/rsc/Executable_rsc.mk?rev=1839782=auto
>>> ==
 --- openoffice/trunk/main/rsc/Executable_rsc.mk (added)
 +++ openoffice/trunk/main/rsc/Executable_rsc.mk Fri Aug 31 18:54:31 2018
 @@ -0,0 +1,52 @@
 +#**
 +#
 +#  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.
 +#
 +#**
 +
 +
 +
 +$(eval $(call gb_Executable_Executable,rsc))
 +
 +$(eval $(call
>>> gb_Executable_add_precompiled_header,rsc,$(SRCDIR)/rsc/inc/pch/precompiled_rsc))
 +
 +$(eval