Browse Source

Better 'make' output

Removes 'make all-debug' since it is unnecessary now.
v0.7.4-release
Ryan Dahl 15 years ago
parent
commit
ef9f4046c9
  1. 4
      Makefile
  2. 12
      wscript

4
Makefile

@ -1,12 +1,8 @@
WAF=python tools/waf-light WAF=python tools/waf-light
all: all:
echo $(WAF)
@$(WAF) build @$(WAF) build
all-debug:
@$(WAF) -v build
all-progress: all-progress:
@$(WAF) -p build @$(WAF) -p build

12
wscript

@ -16,6 +16,7 @@ srcdir = '.'
blddir = 'build' blddir = 'build'
jobs=1 jobs=1
if os.environ.has_key('JOBS'): if os.environ.has_key('JOBS'):
jobs = int(os.environ['JOBS']) jobs = int(os.environ['JOBS'])
@ -237,7 +238,16 @@ 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):
## This snippet is to show full commands as WAF executes
import Build
old = Build.BuildContext.exec_command
def exec_command(self, cmd, **kw):
if isinstance(cmd, list): print(" ".join(cmd))
return old(self, cmd, **kw)
Build.BuildContext.exec_command = exec_command
Options.options.jobs=jobs Options.options.jobs=jobs
print "DEST_OS: " + bld.env['DEST_OS'] print "DEST_OS: " + bld.env['DEST_OS']
print "DEST_CPU: " + bld.env['DEST_CPU'] print "DEST_CPU: " + bld.env['DEST_CPU']
print "Parallel Jobs: " + str(Options.options.jobs) print "Parallel Jobs: " + str(Options.options.jobs)
@ -409,8 +419,6 @@ def build(bld):
bld.install_files('${PREFIX}/share/man/man1/', 'doc/node.1') bld.install_files('${PREFIX}/share/man/man1/', 'doc/node.1')
bld.install_files('${PREFIX}/bin/', 'bin/*', chmod=0755) bld.install_files('${PREFIX}/bin/', 'bin/*', chmod=0755)
# Why am I using two lines? Because WAF SUCKS.
bld.install_files('${PREFIX}/lib/node/wafadmin', 'tools/wafadmin/*.py') bld.install_files('${PREFIX}/lib/node/wafadmin', 'tools/wafadmin/*.py')
bld.install_files('${PREFIX}/lib/node/wafadmin/Tools', 'tools/wafadmin/Tools/*.py') bld.install_files('${PREFIX}/lib/node/wafadmin/Tools', 'tools/wafadmin/Tools/*.py')

Loading…
Cancel
Save