The script for flex and bison was not being generated properly on linux. Extra…

The script for flex and bison was not being generated properly on linux. Extra quotes were being generated in the command-line around output-file path. This change gets around the problem by expanding string variables instead of list. This has another nice side effect that output file path need not be repeated twice. Review URL: http://codereview.appspot.com/1163041 git-svn-id: https://angleproject.googlecode.com/svn/trunk@253 736b8ea6-26fd-11df-bfd4-992fa37f6226

The script for flex and bison was not being generated properly on linux. Extra…
92680f9c · alokp@chromium.org · 616ffcf4 · 92680f9c
Commit 92680f9c authored May 10, 2010 by alokp@chromium.org
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 10 deletions

build_angle.gyp src/build_angle.gyp +14 -10

No files found.
--- a/src/build_angle.gyp
+++ b/src/build_angle.gyp
@@ -11,6 +11,11 @@
        '.',
        '../include',
      ],
+      'variables': {
+        'glslang_cpp_file': '<(INTERMEDIATE_DIR)/glslang.cpp',
+        'glslang_tab_cpp_file': '<(INTERMEDIATE_DIR)/glslang_tab.cpp',
+        'glslang_tab_h_file': '<(INTERMEDIATE_DIR)/glslang_tab.h',
+      },
      'sources': [
        'common/angleutils.h',
        'common/debug.cpp',
@@ -67,9 +72,9 @@
        'compiler/preprocessor/tokens.c',
        'compiler/preprocessor/tokens.h',
        # Generated files
-        '<(INTERMEDIATE_DIR)/Gen_glslang.cpp',
-        '<(INTERMEDIATE_DIR)/Gen_glslang_tab.cpp',
-        '<(INTERMEDIATE_DIR)/glslang_tab.h',
+        '<(glslang_cpp_file)',
+        '<(glslang_tab_cpp_file)',
+        '<(glslang_tab_h_file)',
      ],
      'conditions': [
        ['OS=="win"', {
@@ -82,25 +87,25 @@
        {
          'action_name': 'flex_glslang',
          'inputs': ['compiler/glslang.l'],
-          'outputs': ['<(INTERMEDIATE_DIR)/Gen_glslang.cpp'],
+          'outputs': ['<(glslang_cpp_file)'],
          'action': [
            'flex',
            '--noline',
            '--nounistd',
-            '--outfile=<(_outputs)',
+            '--outfile=<(glslang_cpp_file)',
            '<(_inputs)',
          ],
        },
        {
          'action_name': 'bison_glslang',
          'inputs': ['compiler/glslang.y'],
-          'outputs': ['<(INTERMEDIATE_DIR)/Gen_glslang_tab.cpp'],
+          'outputs': ['<(glslang_tab_cpp_file)', '<(glslang_tab_h_file)'],
          'action': [
            'bison',
            '--no-lines',
-            '--defines=<(INTERMEDIATE_DIR)/glslang_tab.h',
+            '--defines=<(glslang_tab_h_file)',
            '--skeleton=yacc.c',
-            '--output=<(_outputs)',
+            '--output=<(glslang_tab_cpp_file)',
            '<(_inputs)',
          ],
        },
@@ -229,4 +234,4 @@
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
\ No newline at end of file
+# vim: set expandtab tabstop=2 shiftwidth=2: