Removed actions for generating parser-lexer now that they have been checked in. Also removed hooks to pull cygwin - it was only required for flex and bison that are not required anymore. If a developer needs to modify grammar files, he is expected to install cygwin.
Review URL: http://codereview.appspot.com/3177042
git-svn-id: https://angleproject.googlecode.com/svn/trunk@485 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/DEPS b/DEPS
index 9df0213..072737b 100644
--- a/DEPS
+++ b/DEPS
@@ -3,14 +3,6 @@
"http://gyp.googlecode.com/svn/trunk@800",
}
-deps_os = {
- "win": {
- # Cygwin is required for gyp actions, flex, and bison.
- "trunk/third_party/cygwin":
- "http://src.chromium.org/svn/trunk/deps/third_party/cygwin@11984",
- }
-}
-
hooks = [
{
# A change to a .gyp, .gypi, or to GYP itself should run the generator.
diff --git a/src/build_angle.gyp b/src/build_angle.gyp
index 8e14cb4..993e3aa 100644
--- a/src/build_angle.gyp
+++ b/src/build_angle.gyp
@@ -16,11 +16,6 @@
'.',
'../include',
],
- 'variables': {
- 'glslang_lex_source_file': 'compiler/glslang_lex.cpp',
- 'glslang_tab_source_file': 'compiler/glslang_tab.cpp',
- 'glslang_tab_header_file': 'compiler/glslang_tab.h',
- },
'sources': [
'compiler/BaseTypes.h',
'compiler/Common.h',
@@ -29,11 +24,9 @@
'compiler/debug.cpp',
'compiler/debug.h',
'compiler/glslang.h',
- # BEGIN Generated Files
- '<(glslang_lex_source_file)',
- '<(glslang_tab_source_file)',
- '<(glslang_tab_header_file)',
- # END Generated Files
+ 'compiler/glslang_lex.cpp',
+ 'compiler/glslang_tab.cpp',
+ 'compiler/glslang_tab.h',
'compiler/InfoSink.cpp',
'compiler/InfoSink.h',
'compiler/Initialize.cpp',
@@ -93,22 +86,6 @@
'sources': ['compiler/ossource_posix.cpp'],
}],
],
- 'actions': [
- {
- 'action_name': 'flex_glslang',
- 'inputs': ['compiler/glslang.l'],
- 'outputs': ['<(glslang_lex_source_file)'],
- 'action': ['compiler/generate_glslang_lexer.sh'],
- 'message': 'Executing flex on <(_inputs)',
- },
- {
- 'action_name': 'bison_glslang',
- 'inputs': ['compiler/glslang.y'],
- 'outputs': ['<(glslang_tab_source_file)', '<(glslang_tab_header_file)'],
- 'action': ['compiler/generate_glslang_parser.sh'],
- 'message': 'Executing bison on <(_inputs)',
- },
- ],
},
{
'target_name': 'translator_glsl',
