[libgda/wip/meson] Meson: sql-parser, lemon don't use exit code for conflicts



commit 7baff30bfbf382408219cf7902047e69f4d9e95e
Author: Daniel Espinosa <esodan gmail com>
Date:   Thu Jun 14 17:58:18 2018 -0500

    Meson: sql-parser, lemon don't use exit code for conflicts

 libgda/sql-parser/lemon.c     | 3 ++-
 libgda/sql-parser/meson.build | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/libgda/sql-parser/lemon.c b/libgda/sql-parser/lemon.c
index 5e8f48e9a..ed241f2a2 100644
--- a/libgda/sql-parser/lemon.c
+++ b/libgda/sql-parser/lemon.c
@@ -1557,7 +1557,8 @@ int main(int argc, char **argv)
     free (output_dir);
 
   /* return 0 on success, 1 on failure. */
-  exitcode = ((lem.errorcnt > 0) || (lem.nconflict > 0)) ? 1 : 0;
+  /* Remove conficts output as exit code:  || (lem.nconflict > 0) */
+  exitcode = ((lem.errorcnt > 0)) ? 1 : 0;
   successful_exit = (exitcode == 0);
   exit(exitcode);
   return (exitcode);
diff --git a/libgda/sql-parser/meson.build b/libgda/sql-parser/meson.build
index 43e87fa53..d348029bd 100644
--- a/libgda/sql-parser/meson.build
+++ b/libgda/sql-parser/meson.build
@@ -35,6 +35,7 @@ gendef_exe = executable('gen_def', 'gen_def.c',
 
 lemon_parserc = custom_target('lemon-parser_c',
        command : [lemon_exe, '-d', '-h',
+       '-o'+meson.current_build_dir(),
        '-T'+'@INPUT0@', '@INPUT1@'],
        input : ['lempar.c', 'parser.y'],
        output : ['parser.c'],
@@ -44,6 +45,7 @@ lemon_parserc = custom_target('lemon-parser_c',
 
 lemon_parserh = custom_target('lemon-parser_h',
        command : [lemon_exe, '-d', '-z',
+       '-o'+meson.current_build_dir(),
        '-T'+'@INPUT0@', '@INPUT1@'],
        input : ['lempar.c', 'parser.y'],
        output : ['parser.h'],
@@ -52,6 +54,7 @@ lemon_parserh = custom_target('lemon-parser_h',
 
 lemon_delimiterc = custom_target('lemon-delimiter_c',
        command : [lemon_exe, '-q', '-d', '-h',
+       '-o'+meson.current_build_dir(),
        '-T'+'@INPUT0@', '@INPUT1@'],
        input : ['lempar.c', 'delimiter.y'],
        output : ['delimiter.c'],
@@ -60,6 +63,7 @@ lemon_delimiterc = custom_target('lemon-delimiter_c',
 
 lemon_delimiterh = custom_target('lemon-delimiter_h',
        command : [lemon_exe, '-q', '-d', '-z',
+       '-o'+meson.current_build_dir(),
        '-T'+'@INPUT0@', '@INPUT1@'],
        input : ['lempar.c', 'delimiter.y'],
        output : ['delimiter.h'],


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]