Skip to content
Snippets Groups Projects
Commit db5b1603 authored by murgatroid99's avatar murgatroid99
Browse files

Removed most of the gyp file, and the tests for it

There seems to be a bug in node-gyp (nodejs/node-gyp#752) that prevents
it from working properly with other gyp files.
parent f3f85647
Branches
Tags
No related merge requests found
Source diff could not be displayed: it is too large. Options to address this: view the blob.
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
'targets': [ 'targets': [
% for lib in libs: % for lib in libs:
# TODO: Add C++ targets # TODO: Add C++ targets
% if lib.language == 'c': % if lib.name == 'gpr' or lib.name == 'grpc':
{ {
'target_name': '${lib.name}', 'target_name': '${lib.name}',
'product_prefix': 'lib', 'product_prefix': 'lib',
...@@ -109,23 +109,5 @@ ...@@ -109,23 +109,5 @@
}, },
% endif % endif
% endfor % endfor
% for tgt in targets:
% if tgt.language == 'c':
{
'target_name': '${tgt.name}',
'type': 'executable',
'dependencies': [
% for dep in getattr(tgt, 'deps', []):
'${dep}',
% endfor
],
'sources': [
% for source in tgt.src:
'${source}',
% endfor
]
},
% endif
% endfor
] ]
} }
...@@ -181,45 +181,6 @@ class CLanguage(object): ...@@ -181,45 +181,6 @@ class CLanguage(object):
def __str__(self): def __str__(self):
return self.make_target return self.make_target
def gyp_test_paths(travis, config=None):
binaries = get_c_tests(travis, 'c')
out = []
for target in binaries:
if config is not None and config.build_config in target['exclude_configs']:
continue
binary = 'out/Debug/%s' % target['name']
out.append(binary)
return sorted(out)
class GYPCLanguage(object):
def test_specs(self, config, travis):
return [config.job_spec([binary], [binary])
for binary in gyp_test_paths(travis, config)]
def pre_build_steps(self):
return [['gyp', '--depth=.', '--suffix=-gyp', 'grpc.gyp']]
def make_targets(self):
# HACK(ctiller): force fling_client and fling_server to be built, as fling_test
# needs these
return gyp_test_paths(False) + ['fling_client', 'fling_server']
def build_steps(self):
return []
def makefile_name(self):
return 'Makefile-gyp'
def supports_multi_config(self):
return False
def __str__(self):
return 'gyp'
class NodeLanguage(object): class NodeLanguage(object):
def test_specs(self, config, travis): def test_specs(self, config, travis):
...@@ -230,7 +191,7 @@ class NodeLanguage(object): ...@@ -230,7 +191,7 @@ class NodeLanguage(object):
return [] return []
def make_targets(self): def make_targets(self):
return ['static_c', 'shared_c'] return []
def build_steps(self): def build_steps(self):
return [['tools/run_tests/build_node.sh']] return [['tools/run_tests/build_node.sh']]
...@@ -483,7 +444,6 @@ _DEFAULT = ['opt'] ...@@ -483,7 +444,6 @@ _DEFAULT = ['opt']
_LANGUAGES = { _LANGUAGES = {
'c++': CLanguage('cxx', 'c++'), 'c++': CLanguage('cxx', 'c++'),
'c': CLanguage('c', 'c'), 'c': CLanguage('c', 'c'),
'gyp': GYPCLanguage(),
'node': NodeLanguage(), 'node': NodeLanguage(),
'php': PhpLanguage(), 'php': PhpLanguage(),
'python': PythonLanguage(), 'python': PythonLanguage(),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment