Re: [PUSHED] Re: Re: [PATCH][REVIEW] gbuild conversion: idlc module -- build problems fixed
Hej Matúš,
you don't have to be scared, just push it ;-)
here is warning fix as a seperate patch.
David
On 13.04.2012 13:39, Matúš Kukan wrote:
On 13 April 2012 12:56, David Ostrovskydavid.ostrov...@gmx.de wrote:
Hi,
Here is the corrected patch.
I fixed the build error with --enable-werror option enabled.
Hmm, I would not push it together.
Warning errors are somehow related to gbuild because there are
different settings but I would push that separately.
I pushed one part as
http://cgit.freedesktop.org/libreoffice/core/commit/?id=99b04ed2be3023bec874fce529d453123f48ac99
Could you please send another patch for the other issue ?
Also I don't want to review it, because it scares me :)
Thanks,
Matus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
From 0116010024850c234b691766824ec3f8456011af Mon Sep 17 00:00:00 2001
From: David Ostrovsky david.ostrov...@gmx.de
Date: Fri, 13 Apr 2012 13:51:27 +0200
Subject: [PATCH] gbuild conversion: idlc module -- build warnings fixed
---
idlc/source/parser.y| 34 +-
idlc/source/preproc/eval.c | 24
idlc/source/wrap_parser.cxx | 32
3 files changed, 41 insertions(+), 49 deletions(-)
delete mode 100644 idlc/source/wrap_parser.cxx
diff --git a/idlc/source/parser.y b/idlc/source/parser.y
index ec1dfc0..11f6eec 100644
--- a/idlc/source/parser.y
+++ b/idlc/source/parser.y
@@ -257,13 +257,34 @@ bool includes(AstDeclaration const * type1, AstDeclaration const * type2) {
}
// Suppress any warnings from generated code:
+// This suppression is not working after gbuild conversion
+// because parser.cxx is compiled drectly and not with wraper-stuff.
+//#if defined __GNUC__
+//#pragma GCC system_header
+//#elif defined __SUNPRO_CC
+//#pragma disable_warn
+//#elif defined _MSC_VER
+//#pragma warning(push, 1)
+//#pragma warning(disable: 4273 4701 4702 4706)
+//#endif
+
+// Suppress the warnings this way
+// borrowed from here:
+// rsc/source/parser/rscyacc.y
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#pragma warning(disable:4129 4273 4701 4702)
+#endif
#if defined __GNUC__
-#pragma GCC system_header
+#define GCC_VERSION (__GNUC__ * 1 \
+ + __GNUC_MINOR__ * 100 \
+ + __GNUC_PATCHLEVEL__)
+/* Diagnostics pragma was introduced with gcc-4.2.1 */
+#if GCC_VERSION = 40201
+#pragma GCC diagnostic ignored -Wwrite-strings
+#endif
#elif defined __SUNPRO_CC
#pragma disable_warn
-#elif defined _MSC_VER
-#pragma warning(push, 1)
-#pragma warning(disable: 4273 4701 4702 4706)
#endif
%}
/*
@@ -601,7 +622,7 @@ forward_dcl :
{
pForward = new AstInterface(*$1, NULL, pScope);
- if ( pDecl = pScope-lookupByName(pForward-getScopedName()) )
+ if ( (pDecl = pScope-lookupByName(pForward-getScopedName())) )
{
if ( (pDecl != pForward)
(pDecl-getNodeType() == NT_interface) )
@@ -3285,6 +3306,9 @@ identifier:
;
%%
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
/*
* Report an error situation discovered in a production
diff --git a/idlc/source/preproc/eval.c b/idlc/source/preproc/eval.c
index 9a1a620..41cc2e3 100644
--- a/idlc/source/preproc/eval.c
+++ b/idlc/source/preproc/eval.c
@@ -262,7 +262,7 @@ long
{
Token *tp;
Nlist *np;
-int ntok, rand;
+int ntok, local_rand;
trp-tp++;
if (kw == KIFDEF || kw == KIFNDEF)
@@ -283,7 +283,7 @@ long
vp = vals;
op = ops;
*op++ = END;
-for (rand = 0, tp = trp-bp + ntok; tp trp-lp; tp++)
+for (local_rand = 0, tp = trp-bp + ntok; tp trp-lp; tp++)
{
switch (tp-type)
{
@@ -298,17 +298,17 @@ long
case NUMBER:
case CCON:
case STRING:
-if (rand)
+if (local_rand)
goto syntax;
*vp++ = tokval(tp);
-rand = 1;
+local_rand = 1;
continue;
/* unary */
case DEFINED:
case TILDE:
case NOT:
-if (rand)
+if (local_rand)
goto syntax;
*op++ = tp-type;
continue;
@@ -318,7 +318,7 @@ long
case MINUS:
case STAR:
case AND:
-if (rand == 0)
+if (local_rand == 0)
{
if (tp-type == MINUS)
*op++ = UMINUS;
@@ -349,22 +349,22 @@ long
case QUEST:
case COLON:
case COMMA:
-if (rand == 0)
+if (local_rand == 0)
goto syntax;
if (evalop(priority[tp-type]) != 0)
return 0;
*op++ = tp-type;
-rand = 0;
+
Re: [PUSHED] Re: Re: [PATCH][REVIEW] gbuild conversion: idlc module -- build problems fixed
On 04/13/2012 01:39 PM, Matúš Kukan wrote: On 13 April 2012 12:56, David Ostrovskydavid.ostrov...@gmx.de wrote: Here is the corrected patch. I fixed the build error with --enable-werror option enabled. Hmm, I would not push it together. Warning errors are somehow related to gbuild because there are different settings but I would push that separately. I pushed one part as http://cgit.freedesktop.org/libreoffice/core/commit/?id=99b04ed2be3023bec874fce529d453123f48ac99 The problem with this is that it needlessly leads to a -- temporarily -- broken master. (Cf. Caolan's recent commits.) Pushing something known-broken is also bad for bisecting. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Fwd: Re: [PUSHED] Re: Re: [PATCH][REVIEW] gbuild conversion: idlc module -- build problems fixed
Hi Matúš,
this patch should fix the missing key in hash on Macos build [1]:
illegal combination app/SDKBIN/URELIB at
/Volumes/TBRAM/core/solenv/bin/macosx-change-install-names.pl line 70,IN
line 2.
Unfortunatelly I don't have Mac and can not test it ;-(
Could somebody with Mac try to build LO wth idlc converted?
Thanks
David
[1]
http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTERfull-log=1334322010.10061
Original Message
Subject: Re: [PUSHED] Re: Re: [PATCH][REVIEW] gbuild conversion: idlc
module -- build problems fixed
Date: Fri, 13 Apr 2012 13:57:55 +0200
From: David Ostrovsky david.ostrov...@gmx.de
To: Matúš Kukan matus.ku...@gmail.com, Libreoffice-dev
libreoffice@lists.freedesktop.org
Hej Matú?,
you don't have to be scared, just push it ;-)
here is warning fix as a seperate patch.
David
On 13.04.2012 13:39, Matú? Kukan wrote:
On 13 April 2012 12:56, David Ostrovskydavid.ostrov...@gmx.de wrote:
Hi,
Here is the corrected patch.
I fixed the build error with --enable-werror option enabled.
Hmm, I would not push it together.
Warning errors are somehow related to gbuild because there are
different settings but I would push that separately.
I pushed one part as
http://cgit.freedesktop.org/libreoffice/core/commit/?id=99b04ed2be3023bec874fce529d453123f48ac99
Could you please send another patch for the other issue ?
Also I don't want to review it, because it scares me :)
Thanks,
Matus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
From c6f96431ccab619cb7d8fb460dda195dd9b9c2ff Mon Sep 17 00:00:00 2001
From: David Ostrovsky david.ostrov...@gmx.de
Date: Fri, 13 Apr 2012 15:50:38 +0200
Subject: [PATCH] gbuild conversion: idlc module fix macos build
---
solenv/bin/macosx-change-install-names.pl |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl
index 91bea7e..ad0318a 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -53,7 +53,7 @@ sub action($$$)
('app/UREBIN/URELIB' = '@executable_path/../lib',
'app/OOO/URELIB' = '@executable_path/../ure-link/lib',
'app/OOO/OOO' = '@executable_path',
- 'app/SDK/URELIB' = '@executable_path/../../ure-link/lib',
+ 'app/SDKBIN/URELIB' = '@executable_path/../../ure-link/lib',
'app/NONE/URELIB' = '@__VIA_LIBRARY_PATH__',
'app/NONE/OOO' = '@__VIA_LIBRARY_PATH__',
'app/NONE/NONE' = '@__VIA_LIBRARY_PATH__',
--
1.7.5.4
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Re: [PUSHED] Re: Re: [PATCH][REVIEW] gbuild conversion: idlc module -- build problems fixed
On 13 April 2012 15:58, David Ostrovsky d.ostrov...@idaia.de wrote: Hi Matúš, this patch should fix the missing key in hash on Macos build [1]: illegal combination app/SDKBIN/URELIB at /Volumes/TBRAM/core/solenv/bin/macosx-change-install-names.pl line 70, IN line 2. Nice catch, I think it will help, pushed. Unfortunatelly I don't have Mac and can not test it ;-( We'll see. Thanks, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
