From 3a9627e1584981278e3559024a4f0fcbb7903cb6 Mon Sep 17 00:00:00 2001 From: David Siegel Date: Tue, 14 Feb 2012 19:28:03 +0100 Subject: [PATCH] [gyp] still trying to get comfy with this big pythonic dictionary discomvobulator --- configure | 35 ----------------------------------- dns_sd.gyp | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 35 deletions(-) delete mode 100755 configure diff --git a/configure b/configure deleted file mode 100755 index 400a3007..00000000 --- a/configure +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env python -import os, sys, optparse - -parser = optparse.OptionParser() - -parser.add_option('--node-tree', - action='store', - dest='node_tree', - help='path to the node build tree') - -(options, args) = parser.parse_args() - -script_dir = os.path.dirname(__file__) -node_root = options.node_tree - -sys.path.insert(0, os.path.join(node_root, 'tools', 'gyp', 'pylib')) -import gyp - -if __name__ == '__main__': - addon_gypi = os.path.join(node_root, 'tools', 'addon.gypi') - common_gypi = os.path.join(node_root, 'common.gypi') - args.extend(['-I', addon_gypi]) - args.extend(['-I', common_gypi]) - args.extend(['-Dlibrary=shared_library']) - args.extend(['-Dvisibility=default']) - args.extend(['--depth=.']); - - args.extend(['--generator-output', 'out', '-Goutput_dir=.', '-f', 'make']) - - gyp_args = list(args) - rc = gyp.main(gyp_args) - if rc != 0: - print 'Error running GYP' - sys.exit(rc) - diff --git a/dns_sd.gyp b/dns_sd.gyp index 4e1483e7..bdb78aaa 100644 --- a/dns_sd.gyp +++ b/dns_sd.gyp @@ -34,6 +34,48 @@ 'ClCompile': { 'ExceptionHandling': 'Sync' } , 'Link' : { 'IgnoreSpecificDefaultLibraries': [ 'LIBCMT' ] } } + , 'configurations': { + 'Release': { + 'xcode_settings': { 'GCC_OPTIMIZATION_LEVEL': 3 } + } + , 'Debug': { + 'xcode_settings': { 'GCC_OPTIMIZATION_LEVEL': 0 } + } + , 'Coverage': { + 'xcode_settings': { + 'GCC_OPTIMIZATION_LEVEL': 0 + , 'OTHER_LDFLAGS': ['--coverage'] + , 'OTHER_CFLAGS': ['--coverage'] + } + } + } + , 'actions': [ { + 'action_name': 'jslib' + , 'inputs': [ 'lib/advertisement.js' + , 'lib/browser.js' + , 'lib/io_watcher.js' + , 'lib/mdns.js' + , 'lib/mdns_service.js' + , 'lib/mdns_test.js' + , 'lib/resolver_sequence_tasks.js' + , 'lib/service_type.js' + ] + , 'outputs': [ '<(PRODUCT_DIR)/advertisement.js' + , '<(PRODUCT_DIR)/browser.js' + , '<(PRODUCT_DIR)/io_watcher.js' + , '<(PRODUCT_DIR)/mdns.js' + , '<(PRODUCT_DIR)/mdns_service.js' + , '<(PRODUCT_DIR)/mdns_test.js' + , '<(PRODUCT_DIR)/resolver_sequence_tasks.js' + , '<(PRODUCT_DIR)/service_type.js' + ] + , 'conditions': [ + [ 'OS=="win"', + { 'action': ['xcopy', '/e', '/f', '/y', '<@(_inputs)', '<(PRODUCT_DIR)'] } + , { 'action': ['cp', '-v', '<@(_inputs)', '<(PRODUCT_DIR)'] } + ] + ] + }] } ] }