Permalink
Browse files

addon: remove node-waf, superseded by node-gyp

  • Loading branch information...
1 parent 22804a9 commit de32b38992b8adbf7a6b83f580b2cb60fe7b98af @bnoordhuis bnoordhuis committed Aug 14, 2012
Showing with 0 additions and 13,298 deletions.
  1. +0 −6 configure
  2. +0 −1 doc/api/process.markdown
  3. +0 −54 tools/install.py
  4. +0 −17 tools/node-waf
  5. +0 −159 tools/waf-light
  6. +0 −1,021 tools/wafadmin/Build.py
  7. +0 −387 tools/wafadmin/Configure.py
  8. +0 −76 tools/wafadmin/Constants.py
  9. +0 −210 tools/wafadmin/Environment.py
  10. +0 −134 tools/wafadmin/Logs.py
  11. +0 −693 tools/wafadmin/Node.py
  12. +0 −279 tools/wafadmin/Options.py
  13. +0 −229 tools/wafadmin/Runner.py
  14. +0 −586 tools/wafadmin/Scripting.py
  15. +0 −1,171 tools/wafadmin/Task.py
  16. +0 −588 tools/wafadmin/TaskGen.py
  17. +0 −4 tools/wafadmin/Tools/__init__.py
  18. +0 −36 tools/wafadmin/Tools/ar.py
  19. +0 −100 tools/wafadmin/Tools/cc.py
  20. +0 −625 tools/wafadmin/Tools/ccroot.py
  21. +0 −66 tools/wafadmin/Tools/compiler_cc.py
  22. +0 −61 tools/wafadmin/Tools/compiler_cxx.py
  23. +0 −33 tools/wafadmin/Tools/compiler_d.py
  24. +0 −729 tools/wafadmin/Tools/config_c.py
  25. +0 −104 tools/wafadmin/Tools/cxx.py
  26. +0 −540 tools/wafadmin/Tools/d.py
  27. +0 −64 tools/wafadmin/Tools/dmd.py
  28. +0 −38 tools/wafadmin/Tools/gas.py
  29. +0 −137 tools/wafadmin/Tools/gcc.py
  30. +0 −52 tools/wafadmin/Tools/gdc.py
  31. +0 −111 tools/wafadmin/Tools/gnu_dirs.py
  32. +0 −18 tools/wafadmin/Tools/gob2.py
  33. +0 −134 tools/wafadmin/Tools/gxx.py
  34. +0 −37 tools/wafadmin/Tools/icc.py
  35. +0 −34 tools/wafadmin/Tools/icpc.py
  36. +0 −139 tools/wafadmin/Tools/intltool.py
  37. +0 −330 tools/wafadmin/Tools/libtool.py
  38. +0 −430 tools/wafadmin/Tools/misc.py
  39. +0 −49 tools/wafadmin/Tools/nasm.py
  40. +0 −86 tools/wafadmin/Tools/node_addon.py
  41. +0 −187 tools/wafadmin/Tools/osx.py
  42. +0 −813 tools/wafadmin/Tools/preproc.py
  43. +0 −401 tools/wafadmin/Tools/python.py
  44. +0 −77 tools/wafadmin/Tools/suncc.py
  45. +0 −75 tools/wafadmin/Tools/suncxx.py
  46. +0 −305 tools/wafadmin/Tools/unittestw.py
  47. +0 −45 tools/wafadmin/Tools/winres.py
  48. +0 −77 tools/wafadmin/Tools/xlc.py
  49. +0 −77 tools/wafadmin/Tools/xlcxx.py
  50. +0 −707 tools/wafadmin/Utils.py
  51. +0 −3 tools/wafadmin/__init__.py
  52. +0 −221 tools/wafadmin/ansiterm.py
  53. +0 −620 tools/wafadmin/pproc.py
  54. +0 −122 tools/wafadmin/py3kfixes.py
View
@@ -29,11 +29,6 @@ parser.add_option("--without-npm",
dest="without_npm",
help="Don\'t install the bundled npm package manager")
-parser.add_option("--without-waf",
- action="store_true",
- dest="without_waf",
- help="Don\'t install node-waf")
-
parser.add_option("--without-ssl",
action="store_true",
dest="without_ssl",
@@ -321,7 +316,6 @@ def configure_node(o):
o['variables']['v8_no_strict_aliasing'] = 1 # work around compiler bugs
o['variables']['node_prefix'] = os.path.expanduser(options.prefix or '')
o['variables']['node_install_npm'] = b(not options.without_npm)
- o['variables']['node_install_waf'] = b(not options.without_waf)
o['default_configuration'] = 'Debug' if options.debug else 'Release'
host_arch = host_arch_win() if os.name == 'nt' else host_arch_cc()
@@ -298,7 +298,6 @@ An example of the possible output looks like:
variables:
{ host_arch: 'x64',
node_install_npm: 'true',
- node_install_waf: 'true',
node_prefix: '',
node_shared_v8: 'false',
node_shared_zlib: 'false',
View
@@ -73,59 +73,6 @@ def try_remove(path, dst):
def install(paths, dst): map(lambda path: try_copy(path, dst), paths)
def uninstall(paths, dst): map(lambda path: try_remove(path, dst), paths)
-def waf_files(action):
- action(['tools/node-waf'], 'bin/node-waf')
- action(['tools/wafadmin/ansiterm.py',
- 'tools/wafadmin/Build.py',
- 'tools/wafadmin/Configure.py',
- 'tools/wafadmin/Constants.py',
- 'tools/wafadmin/Environment.py',
- 'tools/wafadmin/__init__.py',
- 'tools/wafadmin/Logs.py',
- 'tools/wafadmin/Node.py',
- 'tools/wafadmin/Options.py',
- 'tools/wafadmin/pproc.py',
- 'tools/wafadmin/py3kfixes.py',
- 'tools/wafadmin/Runner.py',
- 'tools/wafadmin/Scripting.py',
- 'tools/wafadmin/TaskGen.py',
- 'tools/wafadmin/Task.py',
- 'tools/wafadmin/Tools/ar.py',
- 'tools/wafadmin/Tools/cc.py',
- 'tools/wafadmin/Tools/ccroot.py',
- 'tools/wafadmin/Tools/compiler_cc.py',
- 'tools/wafadmin/Tools/compiler_cxx.py',
- 'tools/wafadmin/Tools/compiler_d.py',
- 'tools/wafadmin/Tools/config_c.py',
- 'tools/wafadmin/Tools/cxx.py',
- 'tools/wafadmin/Tools/dmd.py',
- 'tools/wafadmin/Tools/d.py',
- 'tools/wafadmin/Tools/gas.py',
- 'tools/wafadmin/Tools/gcc.py',
- 'tools/wafadmin/Tools/gdc.py',
- 'tools/wafadmin/Tools/gnu_dirs.py',
- 'tools/wafadmin/Tools/gob2.py',
- 'tools/wafadmin/Tools/gxx.py',
- 'tools/wafadmin/Tools/icc.py',
- 'tools/wafadmin/Tools/icpc.py',
- 'tools/wafadmin/Tools/__init__.py',
- 'tools/wafadmin/Tools/intltool.py',
- 'tools/wafadmin/Tools/libtool.py',
- 'tools/wafadmin/Tools/misc.py',
- 'tools/wafadmin/Tools/nasm.py',
- 'tools/wafadmin/Tools/node_addon.py',
- 'tools/wafadmin/Tools/osx.py',
- 'tools/wafadmin/Tools/preproc.py',
- 'tools/wafadmin/Tools/python.py',
- 'tools/wafadmin/Tools/suncc.py',
- 'tools/wafadmin/Tools/suncxx.py',
- 'tools/wafadmin/Tools/unittestw.py',
- 'tools/wafadmin/Tools/winres.py',
- 'tools/wafadmin/Tools/xlc.py',
- 'tools/wafadmin/Tools/xlcxx.py',
- 'tools/wafadmin/Utils.py'],
- 'lib/node/')
-
def update_shebang(path, shebang):
print 'updating shebang of %s' % path
s = open(path, 'r').read()
@@ -186,7 +133,6 @@ def files(action):
# with dtrace support now (oracle's "unbreakable" linux)
action(['src/node.d'], 'lib/dtrace/')
- if variables.get('node_install_waf'): waf_files(action)
if variables.get('node_install_npm'): npm_files(action)
def run(args):
View
@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-import os, sys
-
-
-join = os.path.join
-bindir = os.path.dirname(os.path.realpath(__file__))
-prefix = join(bindir, "..")
-wafdir = join(prefix, "lib", "node")
-
-w = join(wafdir, 'wafadmin')
-t = join(w, 'Tools')
-sys.path = [w, t] + sys.path
-
-import Scripting
-VERSION="1.5.16"
-Scripting.prepare(t, os.getcwd(), VERSION, wafdir)
-sys.exit(0)
View
@@ -1,159 +0,0 @@
-#!/usr/bin/env python
-# encoding: ISO8859-1
-# Thomas Nagy, 2005-2010
-
-"""
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-"""
-
-import os, sys
-if sys.hexversion<0x203000f: raise ImportError("Waf requires Python >= 2.3")
-
-if 'PSYCOWAF' in os.environ:
- try:import psyco;psyco.full()
- except:pass
-
-VERSION="1.5.16"
-REVISION="x"
-INSTALL="x"
-C1='x'
-C2='x'
-cwd = os.getcwd()
-join = os.path.join
-
-WAF='waf'
-def b(x):
- return x
-
-if sys.hexversion>0x300000f:
- WAF='waf3'
- def b(x):
- return x.encode()
-
-def err(m):
- print(('\033[91mError: %s\033[0m' % m))
- sys.exit(1)
-
-def unpack_wafdir(dir):
- f = open(sys.argv[0],'rb')
- c = "corrupted waf (%d)"
- while 1:
- line = f.readline()
- if not line: err("run waf-light from a folder containing wafadmin")
- if line == b('#==>\n'):
- txt = f.readline()
- if not txt: err(c % 1)
- if f.readline()!=b('#<==\n'): err(c % 2)
- break
- if not txt: err(c % 3)
- txt = txt[1:-1].replace(b(C1), b('\n')).replace(b(C2), b('\r'))
-
- import shutil, tarfile
- try: shutil.rmtree(dir)
- except OSError: pass
- try:
- for x in ['Tools', '3rdparty']:
- os.makedirs(join(dir, 'wafadmin', x))
- except OSError:
- err("Cannot unpack waf lib into %s\nMove waf into a writeable directory" % dir)
-
- os.chdir(dir)
- tmp = 't.bz2'
- t = open(tmp,'wb')
- t.write(txt)
- t.close()
-
- t = None
- try:
- t = tarfile.open(tmp)
- except:
- try:
- os.system('bunzip2 t.bz2')
- t = tarfile.open('t')
- except:
- os.chdir(cwd)
- try: shutil.rmtree(dir)
- except OSError: pass
- err("Waf cannot be unpacked, check that bzip2 support is present")
-
- for x in t: t.extract(x)
- t.close()
-
- for x in ['Tools', '3rdparty']:
- os.chmod(join('wafadmin',x), 493)
-
- if sys.hexversion>0x300000f:
- sys.path = [join(dir, 'wafadmin')] + sys.path
- import py3kfixes
- py3kfixes.fixdir(dir)
-
- os.chdir(cwd)
-
-def test(dir):
- try: os.stat(join(dir, 'wafadmin')); return os.path.abspath(dir)
- except OSError: pass
-
-def find_lib():
- name = sys.argv[0]
- base = os.path.dirname(os.path.abspath(name))
-
- #devs use $WAFDIR
- w=test(os.environ.get('WAFDIR', ''))
- if w: return w
-
- #waf-light
- if name.endswith('waf-light'):
- w = test(base)
- if w: return w
- err("waf-light requires wafadmin -> export WAFDIR=/folder")
-
- dir = "/lib/%s-%s-%s/" % (WAF, VERSION, REVISION)
- for i in [INSTALL,'/usr','/usr/local','/opt']:
- w = test(i+dir)
- if w: return w
-
- #waf-local
- s = '.%s-%s-%s'
- if sys.platform == 'win32': s = s[1:]
- dir = join(base, s % (WAF, VERSION, REVISION))
- w = test(dir)
- if w: return w
-
- #unpack
- unpack_wafdir(dir)
- return dir
-
-wafdir = find_lib()
-w = join(wafdir, 'wafadmin')
-t = join(w, 'Tools')
-f = join(w, '3rdparty')
-sys.path = [w, t, f] + sys.path
-
-if __name__ == '__main__':
- import Scripting
- Scripting.prepare(t, cwd, VERSION, wafdir)
-
Oops, something went wrong.

0 comments on commit de32b38

Please sign in to comment.