Permalink
Browse files

Remove SCONS deprecate WAF

We keep around WAF for node-waf only.

We need great diligence by people over the next couple weeks to work out all
the kinks in the GYP build system. We realize that it is currently several
times slower than the WAF build. Please lend a hand.

Fixes #1504
Fixes #1500
  • Loading branch information...
1 parent 3222a04 commit 14b04b06b4a7f31b3b489abba5e1467678f0f6be @ry ry committed Nov 15, 2011
Showing with 445 additions and 47,961 deletions.
  1. +203 −60 Makefile
  2. +0 −319 Makefile-gyp
  3. +242 −16 configure
  4. +0 −247 configure-gyp
  5. +0 −25 tools/scons/scons-LICENSE
  6. +0 −204 tools/scons/scons-README
  7. +0 −1,147 tools/scons/scons-local-1.2.0/SCons/Action.py
  8. +0 −844 tools/scons/scons-local-1.2.0/SCons/Builder.py
  9. +0 −217 tools/scons/scons-local-1.2.0/SCons/CacheDir.py
  10. +0 −778 tools/scons/scons-local-1.2.0/SCons/Conftest.py
  11. +0 −216 tools/scons/scons-local-1.2.0/SCons/Debug.py
  12. +0 −463 tools/scons/scons-local-1.2.0/SCons/Defaults.py
  13. +0 −2,300 tools/scons/scons-local-1.2.0/SCons/Environment.py
  14. +0 −198 tools/scons/scons-local-1.2.0/SCons/Errors.py
  15. +0 −393 tools/scons/scons-local-1.2.0/SCons/Executor.py
  16. +0 −429 tools/scons/scons-local-1.2.0/SCons/Job.py
  17. +0 −286 tools/scons/scons-local-1.2.0/SCons/Memoize.py
  18. +0 −147 tools/scons/scons-local-1.2.0/SCons/Node/Alias.py
  19. +0 −3,075 tools/scons/scons-local-1.2.0/SCons/Node/FS.py
  20. +0 −119 tools/scons/scons-local-1.2.0/SCons/Node/Python.py
  21. +0 −1,330 tools/scons/scons-local-1.2.0/SCons/Node/__init__.py
  22. +0 −44 tools/scons/scons-local-1.2.0/SCons/Options/BoolOption.py
  23. +0 −44 tools/scons/scons-local-1.2.0/SCons/Options/EnumOption.py
  24. +0 −44 tools/scons/scons-local-1.2.0/SCons/Options/ListOption.py
  25. +0 −44 tools/scons/scons-local-1.2.0/SCons/Options/PackageOption.py
  26. +0 −70 tools/scons/scons-local-1.2.0/SCons/Options/PathOption.py
  27. +0 −68 tools/scons/scons-local-1.2.0/SCons/Options/__init__.py
  28. +0 −226 tools/scons/scons-local-1.2.0/SCons/PathList.py
  29. +0 −216 tools/scons/scons-local-1.2.0/SCons/Platform/__init__.py
  30. +0 −65 tools/scons/scons-local-1.2.0/SCons/Platform/aix.py
  31. +0 −49 tools/scons/scons-local-1.2.0/SCons/Platform/cygwin.py
  32. +0 −40 tools/scons/scons-local-1.2.0/SCons/Platform/darwin.py
  33. +0 −40 tools/scons/scons-local-1.2.0/SCons/Platform/hpux.py
  34. +0 −38 tools/scons/scons-local-1.2.0/SCons/Platform/irix.py
  35. +0 −49 tools/scons/scons-local-1.2.0/SCons/Platform/os2.py
  36. +0 −258 tools/scons/scons-local-1.2.0/SCons/Platform/posix.py
  37. +0 −44 tools/scons/scons-local-1.2.0/SCons/Platform/sunos.py
  38. +0 −324 tools/scons/scons-local-1.2.0/SCons/Platform/win32.py
  39. +0 −1,012 tools/scons/scons-local-1.2.0/SCons/SConf.py
  40. +0 −375 tools/scons/scons-local-1.2.0/SCons/SConsign.py
  41. +0 −126 tools/scons/scons-local-1.2.0/SCons/Scanner/C.py
  42. +0 −68 tools/scons/scons-local-1.2.0/SCons/Scanner/D.py
  43. +0 −105 tools/scons/scons-local-1.2.0/SCons/Scanner/Dir.py
  44. +0 −314 tools/scons/scons-local-1.2.0/SCons/Scanner/Fortran.py
  45. +0 −42 tools/scons/scons-local-1.2.0/SCons/Scanner/IDL.py
  46. +0 −334 tools/scons/scons-local-1.2.0/SCons/Scanner/LaTeX.py
  47. +0 −97 tools/scons/scons-local-1.2.0/SCons/Scanner/Prog.py
  48. +0 −49 tools/scons/scons-local-1.2.0/SCons/Scanner/RC.py
  49. +0 −406 tools/scons/scons-local-1.2.0/SCons/Scanner/__init__.py
  50. +0 −376 tools/scons/scons-local-1.2.0/SCons/Script/Interactive.py
  51. +0 −1,321 tools/scons/scons-local-1.2.0/SCons/Script/Main.py
  52. +0 −940 tools/scons/scons-local-1.2.0/SCons/Script/SConsOptions.py
  53. +0 −632 tools/scons/scons-local-1.2.0/SCons/Script/SConscript.py
  54. +0 −408 tools/scons/scons-local-1.2.0/SCons/Script/__init__.py
  55. +0 −57 tools/scons/scons-local-1.2.0/SCons/Sig.py
  56. +0 −884 tools/scons/scons-local-1.2.0/SCons/Subst.py
  57. +0 −985 tools/scons/scons-local-1.2.0/SCons/Taskmaster.py
  58. +0 −55 tools/scons/scons-local-1.2.0/SCons/Tool/386asm.py
  59. +0 −59 tools/scons/scons-local-1.2.0/SCons/Tool/BitKeeper.py
  60. +0 −67 tools/scons/scons-local-1.2.0/SCons/Tool/CVS.py
  61. +0 −241 tools/scons/scons-local-1.2.0/SCons/Tool/FortranCommon.py
  62. +0 −317 tools/scons/scons-local-1.2.0/SCons/Tool/JavaCommon.py
  63. +0 −98 tools/scons/scons-local-1.2.0/SCons/Tool/Perforce.py
  64. +0 −132 tools/scons/scons-local-1.2.0/SCons/Tool/PharLapCommon.py
  65. +0 −58 tools/scons/scons-local-1.2.0/SCons/Tool/RCS.py
  66. +0 −58 tools/scons/scons-local-1.2.0/SCons/Tool/SCCS.py
  67. +0 −65 tools/scons/scons-local-1.2.0/SCons/Tool/Subversion.py
  68. +0 −667 tools/scons/scons-local-1.2.0/SCons/Tool/__init__.py
  69. +0 −76 tools/scons/scons-local-1.2.0/SCons/Tool/aixc++.py
  70. +0 −68 tools/scons/scons-local-1.2.0/SCons/Tool/aixcc.py
  71. +0 −74 tools/scons/scons-local-1.2.0/SCons/Tool/aixf77.py
  72. +0 −70 tools/scons/scons-local-1.2.0/SCons/Tool/aixlink.py
  73. +0 −65 tools/scons/scons-local-1.2.0/SCons/Tool/applelink.py
  74. +0 −57 tools/scons/scons-local-1.2.0/SCons/Tool/ar.py
  75. +0 −72 tools/scons/scons-local-1.2.0/SCons/Tool/as.py
  76. +0 −76 tools/scons/scons-local-1.2.0/SCons/Tool/bcc32.py
  77. +0 −93 tools/scons/scons-local-1.2.0/SCons/Tool/c++.py
  78. +0 −108 tools/scons/scons-local-1.2.0/SCons/Tool/cc.py
  79. +0 −52 tools/scons/scons-local-1.2.0/SCons/Tool/cvf.py
  80. +0 −44 tools/scons/scons-local-1.2.0/SCons/Tool/default.py
  81. +0 −218 tools/scons/scons-local-1.2.0/SCons/Tool/dmd.py
  82. +0 −58 tools/scons/scons-local-1.2.0/SCons/Tool/dvi.py
  83. +0 −119 tools/scons/scons-local-1.2.0/SCons/Tool/dvipdf.py
  84. +0 −88 tools/scons/scons-local-1.2.0/SCons/Tool/dvips.py
  85. +0 −56 tools/scons/scons-local-1.2.0/SCons/Tool/f77.py
  86. +0 −56 tools/scons/scons-local-1.2.0/SCons/Tool/f90.py
  87. +0 −57 tools/scons/scons-local-1.2.0/SCons/Tool/f95.py
  88. +0 −92 tools/scons/scons-local-1.2.0/SCons/Tool/filesystem.py
  89. +0 −57 tools/scons/scons-local-1.2.0/SCons/Tool/fortran.py
  90. +0 −84 tools/scons/scons-local-1.2.0/SCons/Tool/g++.py
  91. +0 −67 tools/scons/scons-local-1.2.0/SCons/Tool/g77.py
  92. +0 −47 tools/scons/scons-local-1.2.0/SCons/Tool/gas.py
  93. +0 −74 tools/scons/scons-local-1.2.0/SCons/Tool/gcc.py
  94. +0 −58 tools/scons/scons-local-1.2.0/SCons/Tool/gfortran.py
  95. +0 −57 tools/scons/scons-local-1.2.0/SCons/Tool/gnulink.py
  96. +0 −75 tools/scons/scons-local-1.2.0/SCons/Tool/gs.py
  97. +0 −79 tools/scons/scons-local-1.2.0/SCons/Tool/hpc++.py
  98. +0 −47 tools/scons/scons-local-1.2.0/SCons/Tool/hpcc.py
  99. +0 −71 tools/scons/scons-local-1.2.0/SCons/Tool/hplink.py
  100. +0 −53 tools/scons/scons-local-1.2.0/SCons/Tool/icc.py
  101. +0 −46 tools/scons/scons-local-1.2.0/SCons/Tool/icl.py
  102. +0 −66 tools/scons/scons-local-1.2.0/SCons/Tool/ifl.py
  103. +0 −83 tools/scons/scons-local-1.2.0/SCons/Tool/ifort.py
  104. +0 −53 tools/scons/scons-local-1.2.0/SCons/Tool/ilink.py
  105. +0 −54 tools/scons/scons-local-1.2.0/SCons/Tool/ilink32.py
  106. +0 −223 tools/scons/scons-local-1.2.0/SCons/Tool/install.py
  107. +0 −482 tools/scons/scons-local-1.2.0/SCons/Tool/intelc.py
  108. +0 −104 tools/scons/scons-local-1.2.0/SCons/Tool/jar.py
  109. +0 −228 tools/scons/scons-local-1.2.0/SCons/Tool/javac.py
  110. +0 −132 tools/scons/scons-local-1.2.0/SCons/Tool/javah.py
  111. +0 −76 tools/scons/scons-local-1.2.0/SCons/Tool/latex.py
  112. +0 −93 tools/scons/scons-local-1.2.0/SCons/Tool/lex.py
  113. +0 −112 tools/scons/scons-local-1.2.0/SCons/Tool/link.py
  114. +0 −105 tools/scons/scons-local-1.2.0/SCons/Tool/linkloc.py
  115. +0 −57 tools/scons/scons-local-1.2.0/SCons/Tool/m4.py
  116. +0 −71 tools/scons/scons-local-1.2.0/SCons/Tool/masm.py
  117. +0 −90 tools/scons/scons-local-1.2.0/SCons/Tool/midl.py
  118. +0 −151 tools/scons/scons-local-1.2.0/SCons/Tool/mingw.py
  119. +0 −76 tools/scons/scons-local-1.2.0/SCons/Tool/mslib.py
  120. +0 −249 tools/scons/scons-local-1.2.0/SCons/Tool/mslink.py
  121. +0 −766 tools/scons/scons-local-1.2.0/SCons/Tool/msvc.py
  122. +0 −1,815 tools/scons/scons-local-1.2.0/SCons/Tool/msvs.py
  123. +0 −202 tools/scons/scons-local-1.2.0/SCons/Tool/mwcc.py
  124. +0 −101 tools/scons/scons-local-1.2.0/SCons/Tool/mwld.py
  125. +0 −66 tools/scons/scons-local-1.2.0/SCons/Tool/nasm.py
  126. +0 −306 tools/scons/scons-local-1.2.0/SCons/Tool/packaging/__init__.py
  127. +0 −179 tools/scons/scons-local-1.2.0/SCons/Tool/packaging/ipk.py
  128. +0 −521 tools/scons/scons-local-1.2.0/SCons/Tool/packaging/msi.py
  129. +0 −362 tools/scons/scons-local-1.2.0/SCons/Tool/packaging/rpm.py
  130. +0 −37 tools/scons/scons-local-1.2.0/SCons/Tool/packaging/src_tarbz2.py
  131. +0 −37 tools/scons/scons-local-1.2.0/SCons/Tool/packaging/src_targz.py
  132. +0 −37 tools/scons/scons-local-1.2.0/SCons/Tool/packaging/src_zip.py
  133. +0 −38 tools/scons/scons-local-1.2.0/SCons/Tool/packaging/tarbz2.py
  134. +0 −38 tools/scons/scons-local-1.2.0/SCons/Tool/packaging/targz.py
  135. +0 −38 tools/scons/scons-local-1.2.0/SCons/Tool/packaging/zip.py
  136. +0 −72 tools/scons/scons-local-1.2.0/SCons/Tool/pdf.py
  137. +0 −75 tools/scons/scons-local-1.2.0/SCons/Tool/pdflatex.py
  138. +0 −99 tools/scons/scons-local-1.2.0/SCons/Tool/pdftex.py
  139. +0 −330 tools/scons/scons-local-1.2.0/SCons/Tool/qt.py
  140. +0 −115 tools/scons/scons-local-1.2.0/SCons/Tool/rmic.py
  141. +0 −64 tools/scons/scons-local-1.2.0/SCons/Tool/rpcgen.py
  142. +0 −126 tools/scons/scons-local-1.2.0/SCons/Tool/rpm.py
  143. +0 −62 tools/scons/scons-local-1.2.0/SCons/Tool/sgiar.py
  144. +0 −52 tools/scons/scons-local-1.2.0/SCons/Tool/sgic++.py
  145. +0 −47 tools/scons/scons-local-1.2.0/SCons/Tool/sgicc.py
  146. +0 −57 tools/scons/scons-local-1.2.0/SCons/Tool/sgilink.py
  147. +0 −61 tools/scons/scons-local-1.2.0/SCons/Tool/sunar.py
  148. +0 −100 tools/scons/scons-local-1.2.0/SCons/Tool/sunc++.py
  149. +0 −52 tools/scons/scons-local-1.2.0/SCons/Tool/suncc.py
  150. +0 −57 tools/scons/scons-local-1.2.0/SCons/Tool/sunf77.py
  151. +0 −58 tools/scons/scons-local-1.2.0/SCons/Tool/sunf90.py
  152. +0 −58 tools/scons/scons-local-1.2.0/SCons/Tool/sunf95.py
  153. +0 −71 tools/scons/scons-local-1.2.0/SCons/Tool/sunlink.py
  154. +0 −118 tools/scons/scons-local-1.2.0/SCons/Tool/swig.py
  155. +0 −67 tools/scons/scons-local-1.2.0/SCons/Tool/tar.py
  156. +0 −661 tools/scons/scons-local-1.2.0/SCons/Tool/tex.py
  157. +0 −47 tools/scons/scons-local-1.2.0/SCons/Tool/tlib.py
  158. +0 −94 tools/scons/scons-local-1.2.0/SCons/Tool/wix.py
  159. +0 −125 tools/scons/scons-local-1.2.0/SCons/Tool/yacc.py
  160. +0 −94 tools/scons/scons-local-1.2.0/SCons/Tool/zip.py
  161. +0 −1,577 tools/scons/scons-local-1.2.0/SCons/Util.py
  162. +0 −85 tools/scons/scons-local-1.2.0/SCons/Variables/BoolVariable.py
  163. +0 −101 tools/scons/scons-local-1.2.0/SCons/Variables/EnumVariable.py
  164. +0 −133 tools/scons/scons-local-1.2.0/SCons/Variables/ListVariable.py
  165. +0 −103 tools/scons/scons-local-1.2.0/SCons/Variables/PackageVariable.py
  166. +0 −141 tools/scons/scons-local-1.2.0/SCons/Variables/PathVariable.py
  167. +0 −304 tools/scons/scons-local-1.2.0/SCons/Variables/__init__.py
  168. +0 −193 tools/scons/scons-local-1.2.0/SCons/Warnings.py
  169. +0 −43 tools/scons/scons-local-1.2.0/SCons/__init__.py
  170. +0 −244 tools/scons/scons-local-1.2.0/SCons/compat/__init__.py
  171. +0 −92 tools/scons/scons-local-1.2.0/SCons/compat/_scons_UserString.py
  172. +0 −85 tools/scons/scons-local-1.2.0/SCons/compat/_scons_hashlib.py
  173. +0 −118 tools/scons/scons-local-1.2.0/SCons/compat/_scons_itertools.py
  174. +0 −1,719 tools/scons/scons-local-1.2.0/SCons/compat/_scons_optparse.py
  175. +0 −577 tools/scons/scons-local-1.2.0/SCons/compat/_scons_sets.py
  176. +0 −170 tools/scons/scons-local-1.2.0/SCons/compat/_scons_sets15.py
  177. +0 −319 tools/scons/scons-local-1.2.0/SCons/compat/_scons_shlex.py
  178. +0 −1,290 tools/scons/scons-local-1.2.0/SCons/compat/_scons_subprocess.py
  179. +0 −376 tools/scons/scons-local-1.2.0/SCons/compat/_scons_textwrap.py
  180. +0 −181 tools/scons/scons-local-1.2.0/SCons/compat/builtins.py
  181. +0 −592 tools/scons/scons-local-1.2.0/SCons/cpp.py
  182. +0 −219 tools/scons/scons-local-1.2.0/SCons/dblite.py
  183. +0 −71 tools/scons/scons-local-1.2.0/SCons/exitfuncs.py
  184. +0 −1,513 tools/scons/scons-time.py
  185. +0 −165 tools/scons/scons.py
  186. +0 −502 tools/scons/sconsign.py
View
263 Makefile
@@ -1,35 +1,20 @@
-WAF=python tools/waf-light
+BUILDTYPE ?= Release
-web_root = node@nodejs.org:~/web/nodejs.org/
+all: out/Makefile
+ tools/gyp_node -f make
+ $(MAKE) -C out BUILDTYPE=$(BUILDTYPE)
+ -ln -fs out/Release/node node
+ -ln -fs out/Debug/node node_g
-#
-# Because we recursively call make from waf we need to make sure that we are
-# using the correct make. Not all makes are GNU Make, but this likely only
-# works with gnu make. To deal with this we remember how the user invoked us
-# via a make builtin variable and use that in all subsequent operations
-#
-export NODE_MAKE := $(MAKE)
-
-all: program
- @-[ -f out/Release/node ] && ls -lh out/Release/node
-
-all-progress:
- @$(WAF) -p build
-
-program:
- @$(WAF) --product-type=program build
-
-staticlib:
- @$(WAF) --product-type=cstaticlib build
+out/Release/node: all
-dynamiclib:
- @$(WAF) --product-type=cshlib build
+out/Makefile: node.gyp deps/uv/uv.gyp
-install:
- @$(WAF) install
+clean:
+ rm -rf out
-uninstall:
- @$(WAF) uninstall
+distclean:
+ rm -rf out
test: all
python tools/test.py --mode=release simple message
@@ -67,8 +52,194 @@ test-pummel: all
test-internet: all
python tools/test.py internet
+UVTEST += simple/test-assert
+UVTEST += simple/test-buffer
+UVTEST += simple/test-c-ares
+UVTEST += simple/test-chdir
+UVTEST += simple/test-delayed-require
+UVTEST += simple/test-eio-race2
+UVTEST += simple/test-eio-race4
+UVTEST += simple/test-event-emitter-add-listeners
+UVTEST += simple/test-event-emitter-modify-in-emit
+UVTEST += simple/test-event-emitter-num-args
+UVTEST += simple/test-event-emitter-once
+UVTEST += simple/test-event-emitter-remove-all-listeners
+UVTEST += simple/test-event-emitter-remove-listeners
+UVTEST += simple/test-exception-handler
+UVTEST += simple/test-exception-handler2
+UVTEST += simple/test-exception-handler
+UVTEST += simple/test-executable-path
+UVTEST += simple/test-file-read-noexist
+UVTEST += simple/test-file-write-stream
+UVTEST += simple/test-fs-fsync
+UVTEST += simple/test-fs-open
+UVTEST += simple/test-fs-readfile-empty
+UVTEST += simple/test-fs-read-file-sync
+UVTEST += simple/test-fs-read-file-sync-hostname
+UVTEST += simple/test-fs-sir-writes-alot
+UVTEST += simple/test-fs-write
+UVTEST += simple/test-fs-write-buffer
+UVTEST += simple/test-fs-write-file
+UVTEST += simple/test-fs-write-file-buffer
+UVTEST += simple/test-fs-write-stream
+UVTEST += simple/test-fs-write-stream-end
+UVTEST += simple/test-fs-write-sync
+UVTEST += simple/test-global
+UVTEST += simple/test-http
+UVTEST += simple/test-http-1.0
+UVTEST += simple/test-http-abort-client
+UVTEST += simple/test-http-allow-req-after-204-res
+UVTEST += simple/test-http-blank-header
+UVTEST += simple/test-http-buffer-sanity
+UVTEST += simple/test-http-cat
+UVTEST += simple/test-http-chunked
+UVTEST += simple/test-http-client-abort
+UVTEST += simple/test-http-client-parse-error
+UVTEST += simple/test-http-client-race
+UVTEST += simple/test-http-client-race-2
+UVTEST += simple/test-http-client-upload
+UVTEST += simple/test-http-client-upload-buf
+UVTEST += simple/test-http-contentLength0
+UVTEST += simple/test-http-default-encoding
+UVTEST += simple/test-http-dns-fail
+UVTEST += simple/test-http-eof-on-connect
+UVTEST += simple/test-http-exceptions
+UVTEST += simple/test-http-expect-continue
+UVTEST += simple/test-http-extra-response
+UVTEST += simple/test-http-head-request
+UVTEST += simple/test-http-head-response-has-no-body
+UVTEST += simple/test-http-keep-alive
+UVTEST += simple/test-http-keep-alive-close-on-header
+UVTEST += simple/test-http-malformed-request
+UVTEST += simple/test-http-many-keep-alive-connections
+UVTEST += simple/test-http-mutable-headers
+UVTEST += simple/test-http-parser
+UVTEST += simple/test-http-proxy
+UVTEST += simple/test-http-request-end
+UVTEST += simple/test-http-response-close
+UVTEST += simple/test-http-response-readable
+UVTEST += simple/test-http-unix-socket
+UVTEST += simple/test-http-server
+UVTEST += simple/test-http-server-multiheaders
+UVTEST += simple/test-http-set-cookies
+UVTEST += simple/test-http-set-timeout
+UVTEST += simple/test-http-set-trailers
+UVTEST += simple/test-http-upgrade-agent
+UVTEST += simple/test-http-upgrade-client
+UVTEST += simple/test-http-upgrade-client2
+UVTEST += simple/test-http-upgrade-server
+UVTEST += simple/test-http-upgrade-server2
+UVTEST += simple/test-http-wget
+UVTEST += simple/test-http-write-empty-string
+UVTEST += simple/test-http-wget
+UVTEST += simple/test-mkdir-rmdir
+UVTEST += simple/test-net-binary
+UVTEST += simple/test-net-pingpong
+UVTEST += simple/test-net-can-reset-timeout
+UVTEST += simple/test-net-connect-buffer
+UVTEST += simple/test-net-connect-timeout
+UVTEST += simple/test-net-create-connection
+UVTEST += simple/test-net-eaddrinuse
+UVTEST += simple/test-net-isip
+UVTEST += simple/test-net-keepalive
+UVTEST += simple/test-net-pingpong
+UVTEST += simple/test-net-reconnect
+UVTEST += simple/test-net-remote-address-port
+UVTEST += simple/test-net-server-bind
+UVTEST += simple/test-net-server-max-connections
+UVTEST += simple/test-net-server-try-ports
+UVTEST += simple/test-net-stream
+UVTEST += simple/test-net-socket-timeout
+UVTEST += simple/test-next-tick
+UVTEST += simple/test-next-tick-doesnt-hang
+UVTEST += simple/test-next-tick-errors
+UVTEST += simple/test-next-tick-ordering
+UVTEST += simple/test-next-tick-ordering2
+UVTEST += simple/test-next-tick-starvation
+UVTEST += simple/test-module-load-list
+UVTEST += simple/test-path
+UVTEST += simple/test-pipe-stream
+UVTEST += simple/test-pump-file2tcp
+UVTEST += simple/test-pump-file2tcp-noexist
+UVTEST += simple/test-punycode
+UVTEST += simple/test-querystring
+UVTEST += simple/test-readdir
+UVTEST += simple/test-readdouble
+UVTEST += simple/test-readfloat
+UVTEST += simple/test-readint
+UVTEST += simple/test-readuint
+UVTEST += simple/test-regress-GH-819
+UVTEST += simple/test-regress-GH-897
+UVTEST += simple/test-regression-object-prototype
+UVTEST += simple/test-require-cache
+UVTEST += simple/test-require-cache-without-stat
+UVTEST += simple/test-require-exceptions
+UVTEST += simple/test-require-resolve
+UVTEST += simple/test-script-context
+UVTEST += simple/test-script-new
+UVTEST += simple/test-script-static-context
+UVTEST += simple/test-script-static-new
+UVTEST += simple/test-script-static-this
+UVTEST += simple/test-script-this
+UVTEST += simple/test-stream-pipe-cleanup
+UVTEST += simple/test-stream-pipe-error-handling
+UVTEST += simple/test-stream-pipe-event
+UVTEST += simple/test-stream-pipe-multi
+UVTEST += simple/test-string-decoder
+UVTEST += simple/test-sys
+UVTEST += simple/test-tcp-wrap
+UVTEST += simple/test-tcp-wrap-connect
+UVTEST += simple/test-tcp-wrap-listen
+UVTEST += simple/test-timers-linked-list
+UVTEST += simple/test-tty-stdout-end
+UVTEST += simple/test-url
+UVTEST += simple/test-utf8-scripts
+UVTEST += simple/test-vm-create-context-circular-reference
+UVTEST += simple/test-writedouble
+UVTEST += simple/test-writefloat
+UVTEST += simple/test-writeint
+UVTEST += simple/test-writeuint
+UVTEST += simple/test-zerolengthbufferbug
+UVTEST += pummel/test-http-client-reconnect-bug
+UVTEST += pummel/test-http-upload-timeout
+UVTEST += pummel/test-net-many-clients
+UVTEST += pummel/test-net-pause
+UVTEST += pummel/test-net-pingpong-delay
+UVTEST += pummel/test-net-timeout
+UVTEST += pummel/test-timers
+UVTEST += pummel/test-timer-wrap
+UVTEST += pummel/test-timer-wrap2
+UVTEST += pummel/test-vm-memleak
+UVTEST += internet/test-dns
+UVTEST += simple/test-tls-client-abort
+UVTEST += simple/test-tls-client-verify
+UVTEST += simple/test-tls-connect
+#UVTEST += simple/test-tls-ext-key-usage # broken
+UVTEST += simple/test-tls-junk-closes-server
+UVTEST += simple/test-tls-npn-server-client
+UVTEST += simple/test-tls-request-timeout
+#UVTEST += simple/test-tls-securepair-client # broken
+UVTEST += simple/test-tls-securepair-server
+#UVTEST += simple/test-tls-server-verify # broken
+UVTEST += simple/test-tls-set-encoding
+
+# child_process
+UVTEST += simple/test-child-process-exit-code
+UVTEST += simple/test-child-process-buffering
+UVTEST += simple/test-child-process-exec-cwd
+UVTEST += simple/test-child-process-cwd
+UVTEST += simple/test-child-process-env
+UVTEST += simple/test-child-process-stdin
+UVTEST += simple/test-child-process-ipc
+UVTEST += simple/test-child-process-deprecated-api
+
+
+test-uv: all
+ NODE_USE_UV=1 python tools/test.py $(UVTEST)
+
+test-uv-debug: all
+ NODE_USE_UV=1 python tools/test.py --mode=debug $(UVTEST)
-out/Release/node: all
apidoc_sources = $(wildcard doc/api/*.markdown)
apidocs = $(addprefix out/,$(apidoc_sources:.markdown=.html))
@@ -89,10 +260,7 @@ website_files = \
out/doc/favicon.ico \
out/doc/pipe.css
-doc: doc
-
-out/doc: out/Release/node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs)
-
+doc: out/Release/node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs)
$(apidoc_dirs):
mkdir -p $@
@@ -117,31 +285,11 @@ docopen: out/doc/api/all.html
docclean:
-rm -rf out/doc
-clean:
- $(WAF) clean
- -find tools -name "*.pyc" | xargs rm -f
-
-distclean: docclean
- -find tools -name "*.pyc" | xargs rm -f
- -rm -rf dist-osx
- -rm -rf out/ node node_g
-
-check:
- @tools/waf-light check
-
-VERSION=v$(shell python tools/getnodeversion.py)
+VERSION=$(shell git describe)
TARNAME=node-$(VERSION)
-TARBALL=$(TARNAME).tar.gz
-PKG=dist-osx/$(TARNAME).pkg
#dist: doc/node.1 doc/api
-dist: $(TARBALL) $(PKG)
-
-$(PKG):
- -rm -rf dist-osx
- tools/osx-dist.sh
-
-$(TARBALL): out/doc
+dist: doc
git archive --format=tar --prefix=$(TARNAME)/ HEAD | tar xf -
mkdir -p $(TARNAME)/doc
cp doc/node.1 $(TARNAME)/doc/node.1
@@ -152,11 +300,6 @@ $(TARBALL): out/doc
rm -rf $(TARNAME)
gzip -f -9 $(TARNAME).tar
-dist-upload: $(TARBALL) $(PKG)
- ssh node@nodejs.org mkdir -p web/nodejs.org/dist/$(VERSION)
- scp $(TARBALL) node@nodejs.org:~/web/nodejs.org/dist/$(VERSION)/$(TARBALL)
- scp $(PKG) node@nodejs.org:~/web/nodejs.org/dist/$(VERSION)/$(TARNAME).pkg
-
bench:
benchmark/http_simple_bench.sh
@@ -173,4 +316,4 @@ cpplint:
lint: jslint cpplint
-.PHONY: lint cpplint jslint bench clean docopen docclean doc dist distclean dist-upload check uninstall install all program staticlib dynamiclib test test-all website-upload
+.PHONY: lint cpplint jslint bench clean docopen docclean doc dist distclean check uninstall install all program staticlib dynamiclib test test-all website-upload
Oops, something went wrong.

0 comments on commit 14b04b0

Please sign in to comment.