Browse Source

Clean up c-ares platform includes, add support for a few more

v0.7.4-release
Ryan Dahl 15 years ago
parent
commit
9ea8c9f2b0
  1. 0
      deps/c-ares/darwin-x86_64/ares_build.h
  2. 0
      deps/c-ares/darwin-x86_64/ares_config.h
  3. 0
      deps/c-ares/darwin-x86_64/ares_setup.h
  4. 0
      deps/c-ares/freebsd-x86/ares_build.h
  5. 0
      deps/c-ares/freebsd-x86/ares_config.h
  6. 0
      deps/c-ares/freebsd-x86/ares_setup.h
  7. 0
      deps/c-ares/freebsd-x86_64/ares_build.h
  8. 0
      deps/c-ares/freebsd-x86_64/ares_config.h
  9. 0
      deps/c-ares/freebsd-x86_64/ares_setup.h
  10. 0
      deps/c-ares/linux-x86/ares_build.h
  11. 0
      deps/c-ares/linux-x86/ares_config.h
  12. 0
      deps/c-ares/linux-x86/ares_setup.h
  13. 0
      deps/c-ares/sunos-x86/ares_build.h
  14. 0
      deps/c-ares/sunos-x86/ares_config.h
  15. 0
      deps/c-ares/sunos-x86/ares_setup.h
  16. 15
      deps/c-ares/wscript
  17. 23
      wscript

0
deps/c-ares/freebsd_amd64/ares_build.h → deps/c-ares/darwin-x86_64/ares_build.h

0
deps/c-ares/mac/ares_config.h → deps/c-ares/darwin-x86_64/ares_config.h

0
deps/c-ares/freebsd_amd64/ares_setup.h → deps/c-ares/darwin-x86_64/ares_setup.h

0
deps/c-ares/freebsd_i386/ares_build.h → deps/c-ares/freebsd-x86/ares_build.h

0
deps/c-ares/freebsd_i386/ares_config.h → deps/c-ares/freebsd-x86/ares_config.h

0
deps/c-ares/freebsd_i386/ares_setup.h → deps/c-ares/freebsd-x86/ares_setup.h

0
deps/c-ares/mac/ares_build.h → deps/c-ares/freebsd-x86_64/ares_build.h

0
deps/c-ares/freebsd_amd64/ares_config.h → deps/c-ares/freebsd-x86_64/ares_config.h

0
deps/c-ares/linux/ares_setup.h → deps/c-ares/freebsd-x86_64/ares_setup.h

0
deps/c-ares/linux/ares_build.h → deps/c-ares/linux-x86/ares_build.h

0
deps/c-ares/linux/ares_config.h → deps/c-ares/linux-x86/ares_config.h

0
deps/c-ares/mac/ares_setup.h → deps/c-ares/linux-x86/ares_setup.h

0
deps/c-ares/solaris/ares_build.h → deps/c-ares/sunos-x86/ares_build.h

0
deps/c-ares/solaris/ares_config.h → deps/c-ares/sunos-x86/ares_config.h

0
deps/c-ares/solaris/ares_setup.h → deps/c-ares/sunos-x86/ares_setup.h

15
deps/c-ares/wscript

@ -19,20 +19,7 @@ def build(bld):
cares.source = bld.path.ant_glob('*.c') cares.source = bld.path.ant_glob('*.c')
cares.target = 'cares' cares.target = 'cares'
cares.name = 'cares' cares.name = 'cares'
cares.includes = '.' cares.includes = '. ./' + bld.env['DEST_OS'] + '-' + bld.env['DEST_CPU']
if PLATFORM_IS_DARWIN:
cares.includes += ' ./mac/'
elif PLATFORM_IS_LINUX:
cares.includes += ' ./linux/'
elif PLATFORM_IS_SOLARIS:
cares.includes += ' ./solaris/'
elif PLATFORM_IS_FREEBSD:
if MACHINE_IS_AMD64:
cares.includes += ' ./freebsd_amd64/'
elif MACHINE_IS_I386:
cares.includes += ' ./freebsd_i386/'
cares.install_path = None cares.install_path = None
if bld.env["USE_DEBUG"]: if bld.env["USE_DEBUG"]:
cares.clone("debug"); cares.clone("debug");

23
wscript

@ -5,7 +5,6 @@ import sys, os, shutil
from Utils import cmd_output from Utils import cmd_output
from os.path import join, dirname, abspath from os.path import join, dirname, abspath
from logging import fatal from logging import fatal
import platform
cwd = os.getcwd() cwd = os.getcwd()
VERSION="0.1.33" VERSION="0.1.33"
@ -16,13 +15,6 @@ import js2c
srcdir = '.' srcdir = '.'
blddir = 'build' blddir = 'build'
PLATFORM_IS_DARWIN = platform.platform().find('Darwin') == 0
PLATFORM_IS_LINUX = platform.platform().find('Linux') == 0
PLATFORM_IS_SOLARIS = platform.platform().find('Sun') == 0
PLATFORM_IS_FREEBSD = platform.platform().find('FreeBSD') == 0
MACHINE_IS_AMD64 = platform.machine().find('amd64') == 0
MACHINE_IS_I386 = platform.machine().find('i386') == 0
def set_options(opt): def set_options(opt):
# the gcc module provides a --debug-level option # the gcc module provides a --debug-level option
opt.tool_options('compiler_cxx') opt.tool_options('compiler_cxx')
@ -311,6 +303,9 @@ def build_v8(bld):
bld.install_files('${PREFIX}/include/node/', 'deps/v8/include/*.h') bld.install_files('${PREFIX}/include/node/', 'deps/v8/include/*.h')
def build(bld): def build(bld):
print "DEST_OS: " + bld.env['DEST_OS']
print "DEST_CPU: " + bld.env['DEST_CPU']
if not bld.env["USE_SYSTEM"]: if not bld.env["USE_SYSTEM"]:
bld.add_subdirs('deps/libeio deps/libev deps/c-ares') bld.add_subdirs('deps/libeio deps/libev deps/c-ares')
build_udns(bld) build_udns(bld)
@ -443,17 +438,7 @@ def build(bld):
deps/coupling deps/coupling
""" """
if PLATFORM_IS_DARWIN: node.includes += ' deps/c-ares/' + bld.env['DEST_OS'] + '-' + bld.env['DEST_CPU']
node.includes += ' deps/c-ares/mac/'
elif PLATFORM_IS_LINUX:
node.includes += ' deps/c-ares/linux/'
elif PLATFORM_IS_SOLARIS:
node.includes += ' deps/c-ares/solaris/'
elif PLATFORM_IS_FREEBSD:
if MACHINE_IS_AMD64:
node.includes += ' deps/c-ares/freebsd_amd64/'
elif MACHINE_IS_I386:
node.includes += ' deps/c-ares/freebsd_i386/'
node.add_objects = 'cares ev eio evcom http_parser coupling' node.add_objects = 'cares ev eio evcom http_parser coupling'

Loading…
Cancel
Save