Permalink
Browse files

OS-5657 Remove unused node bindings from platform

Reviewed by: Dave Eddy <dave@daveeddy.com>
Approved by: Joshua M. Clulow <jmc@joyent.com>
  • Loading branch information...
1 parent 1b00ef6 commit 73d8c13dc6b3d6923a4a1a6203517f6cb568ccb5 @melloc melloc committed Jan 30, 2017
Showing with 2 additions and 229,550 deletions.
  1. +0 −6 .gitignore
  2. +2 −150 src/Makefile
  3. +0 −14 src/manifest
  4. +0 −5 src/node-microtime/.travis.yml
  5. +0 −19 src/node-microtime/LICENSE
  6. +0 −71 src/node-microtime/README.md
  7. +0 −8 src/node-microtime/binding.gyp
  8. +0 −5 src/node-microtime/index.js
  9. +0 −18 src/node-microtime/package.json
  10. +0 −61 src/node-microtime/src/microtime.cc
  11. +0 −26 src/node-microtime/test.js
  12. +0 −24 src/node-sqlite3/LICENSE
  13. +0 −24 src/node-sqlite3/Makefile
  14. +0 −105 src/node-sqlite3/README.md
  15. +0 −10,003 src/node-sqlite3/benchmark/insert-transaction.sql
  16. +0 −68 src/node-sqlite3/benchmark/insert.js
  17. +0 −15 src/node-sqlite3/binding.gyp
  18. +0 −3 src/node-sqlite3/configure
  19. +0 −236 src/node-sqlite3/deps/sqlite3/INSTALL
  20. +0 −19 src/node-sqlite3/deps/sqlite3/Makefile.am
  21. +0 −836 src/node-sqlite3/deps/sqlite3/Makefile.in
  22. +0 −32 src/node-sqlite3/deps/sqlite3/README
  23. +0 −7,227 src/node-sqlite3/deps/sqlite3/aclocal.m4
  24. +0 −69 src/node-sqlite3/deps/sqlite3/binding.gyp
  25. +0 −1,463 src/node-sqlite3/deps/sqlite3/config.guess
  26. +0 −1,579 src/node-sqlite3/deps/sqlite3/config.sub
  27. +0 −21,169 src/node-sqlite3/deps/sqlite3/configure
  28. +0 −108 src/node-sqlite3/deps/sqlite3/configure.ac
  29. +0 −530 src/node-sqlite3/deps/sqlite3/depcomp
  30. +0 −323 src/node-sqlite3/deps/sqlite3/install-sh
  31. +0 −6,930 src/node-sqlite3/deps/sqlite3/ltmain.sh
  32. +0 −360 src/node-sqlite3/deps/sqlite3/missing
  33. +0 −2,934 src/node-sqlite3/deps/sqlite3/shell.c
  34. +0 −229 src/node-sqlite3/deps/sqlite3/sqlite3.1
  35. +0 −131,068 src/node-sqlite3/deps/sqlite3/sqlite3.c
  36. +0 −6,757 src/node-sqlite3/deps/sqlite3/sqlite3.h
  37. +0 −13 src/node-sqlite3/deps/sqlite3/sqlite3.pc
  38. +0 −13 src/node-sqlite3/deps/sqlite3/sqlite3.pc.in
  39. +0 −426 src/node-sqlite3/deps/sqlite3/sqlite3ext.h
  40. +0 −439 src/node-sqlite3/deps/sqlite3/tea/Makefile.in
  41. +0 −36 src/node-sqlite3/deps/sqlite3/tea/README
  42. +0 −9 src/node-sqlite3/deps/sqlite3/tea/aclocal.m4
  43. +0 −8,923 src/node-sqlite3/deps/sqlite3/tea/configure
  44. +0 −198 src/node-sqlite3/deps/sqlite3/tea/configure.in
  45. +0 −15 src/node-sqlite3/deps/sqlite3/tea/doc/sqlite3.n
  46. +0 −3,796 src/node-sqlite3/deps/sqlite3/tea/generic/tclsqlite3.c
  47. +0 −6 src/node-sqlite3/deps/sqlite3/tea/license.terms
  48. +0 −7 src/node-sqlite3/deps/sqlite3/tea/pkgIndex.tcl.in
  49. +0 −119 src/node-sqlite3/deps/sqlite3/tea/tclconfig/install-sh
  50. +0 −3,997 src/node-sqlite3/deps/sqlite3/tea/tclconfig/tcl.m4
  51. +0 −420 src/node-sqlite3/deps/sqlite3/tea/win/makefile.vc
  52. +0 −355 src/node-sqlite3/deps/sqlite3/tea/win/nmakehlp.c
  53. +0 −436 src/node-sqlite3/deps/sqlite3/tea/win/rules.vc
  54. +0 −50 src/node-sqlite3/examples/simple-chaining.js
  55. +0 −1 src/node-sqlite3/lib/index.js
  56. +0 −185 src/node-sqlite3/lib/sqlite3.js
  57. +0 −42 src/node-sqlite3/lib/trace.js
  58. +0 −42 src/node-sqlite3/package.json
  59. +0 −1 src/node-sqlite3/sqlite3.js
  60. +0 −90 src/node-sqlite3/src/async.h
  61. +0 −633 src/node-sqlite3/src/database.cc
  62. +0 −183 src/node-sqlite3/src/database.h
  63. +0 −167 src/node-sqlite3/src/macros.h
  64. +0 −106 src/node-sqlite3/src/node_sqlite3.cc
  65. +0 −888 src/node-sqlite3/src/statement.cc
  66. +0 −243 src/node-sqlite3/src/statement.h
  67. +0 −48 src/node-sqlite3/src/threading.h
  68. +0 −34 src/node-sqlite3/test/affected.test.js
  69. +0 −50 src/node-sqlite3/test/blob.test.js
  70. +0 −47 src/node-sqlite3/test/cache.test.js
  71. +0 −38 src/node-sqlite3/test/constants.test.js
  72. +0 −212 src/node-sqlite3/test/database_fail.test.js
  73. +0 −42 src/node-sqlite3/test/each.test.js
  74. +0 −43 src/node-sqlite3/test/exec.test.js
  75. +0 −25 src/node-sqlite3/test/extension.test.js
  76. +0 −74 src/node-sqlite3/test/map.test.js
  77. +0 −33 src/node-sqlite3/test/named_columns.test.js
  78. +0 −60 src/node-sqlite3/test/named_params.test.js
  79. +0 −35 src/node-sqlite3/test/null_error.test.js
  80. +0 −129 src/node-sqlite3/test/open_close.test.js
  81. +0 −112 src/node-sqlite3/test/other_objects.test.js
  82. +0 −38 src/node-sqlite3/test/parallel_insert.test.js
  83. +0 −406 src/node-sqlite3/test/prepare.test.js
  84. +0 −40 src/node-sqlite3/test/profile.test.js
  85. +0 −43 src/node-sqlite3/test/rerun.test.js
  86. +0 −60 src/node-sqlite3/test/scheduling.test.js
  87. +0 −87 src/node-sqlite3/test/serialization.test.js
  88. +0 −26 src/node-sqlite3/test/support/createdb.js
  89. BIN src/node-sqlite3/test/support/elmo.png
  90. +0 −30 src/node-sqlite3/test/support/helper.js
  91. BIN src/node-sqlite3/test/support/prepare.db
  92. +0 −70 src/node-sqlite3/test/support/script.sql
  93. +0 −66 src/node-sqlite3/test/trace.test.js
  94. +0 −53 src/node-sqlite3/test/unicode.test.js
  95. +0 −19 src/node-zsock/LICENSE
  96. +0 −43 src/node-zsock/README.md
  97. +0 −35 src/node-zsock/demo/server.js
  98. +0 −58 src/node-zsock/lib/zsock.js
  99. +0 −10 src/node-zsock/node_modules/v8plus/.npmignore
  100. +0 −18 src/node-zsock/node_modules/v8plus/LICENSE
  101. +0 −86 src/node-zsock/node_modules/v8plus/Makefile.v8plus.defs
  102. +0 −42 src/node-zsock/node_modules/v8plus/Makefile.v8plus.targ
  103. +0 −957 src/node-zsock/node_modules/v8plus/README.md
  104. +0 −5 src/node-zsock/node_modules/v8plus/checkver.h
  105. +0 −32 src/node-zsock/node_modules/v8plus/errno.json
  106. +0 −21 src/node-zsock/node_modules/v8plus/examples/Makefile
  107. +0 −19 src/node-zsock/node_modules/v8plus/examples/errno.json
  108. +0 −457 src/node-zsock/node_modules/v8plus/examples/example.c
  109. +0 −23 src/node-zsock/node_modules/v8plus/examples/example.h
  110. +0 −98 src/node-zsock/node_modules/v8plus/examples/test.js
  111. +0 −187 src/node-zsock/node_modules/v8plus/generrno.js
  112. +0 −19 src/node-zsock/node_modules/v8plus/node_modules/posix-getopt/LICENSE
  113. +0 −244 src/node-zsock/node_modules/v8plus/node_modules/posix-getopt/README.md
  114. +0 −40 src/node-zsock/node_modules/v8plus/node_modules/posix-getopt/examples/examples.js
  115. +0 −304 src/node-zsock/node_modules/v8plus/node_modules/posix-getopt/lib/getopt.js
  116. +0 −21 src/node-zsock/node_modules/v8plus/node_modules/posix-getopt/package.json
  117. +0 −71 src/node-zsock/node_modules/v8plus/node_modules/posix-getopt/tests/test-getopt.js
  118. +0 −74 src/node-zsock/node_modules/v8plus/node_modules/posix-getopt/tests/test-tokenize-optstr.js
  119. +0 −7 src/node-zsock/node_modules/v8plus/origin.js
  120. +0 −21 src/node-zsock/node_modules/v8plus/package.json
  121. +0 −38 src/node-zsock/node_modules/v8plus/v8plus_c_impl.h
  122. +0 −1,357 src/node-zsock/node_modules/v8plus/v8plus_csup.c
  123. +0 −286 src/node-zsock/node_modules/v8plus/v8plus_glue.h
  124. +0 −224 src/node-zsock/node_modules/v8plus/v8plus_impl.h
  125. +0 −399 src/node-zsock/node_modules/v8plus/v8plus_objectwrap.cc
  126. +0 −744 src/node-zsock/node_modules/v8plus/v8plus_subr.cc
  127. +0 −25 src/node-zsock/package.json
  128. +0 −27 src/node-zsock/src/Makefile
  129. +0 −5 src/node-zsock/src/errno.json
  130. +0 −519 src/node-zsock/src/zsock.c
  131. +0 −126 src/node-zsock/tst/zsock.test.js
  132. +0 −19 src/node-zutil/LICENSE
  133. +0 −50 src/node-zutil/README.md
  134. +0 −33 src/node-zutil/demo/example.js
  135. +0 −3 src/node-zutil/lib/zutil.js
  136. +0 −10 src/node-zutil/node_modules/v8plus/.npmignore
  137. +0 −18 src/node-zutil/node_modules/v8plus/LICENSE
  138. +0 −86 src/node-zutil/node_modules/v8plus/Makefile.v8plus.defs
  139. +0 −42 src/node-zutil/node_modules/v8plus/Makefile.v8plus.targ
  140. +0 −957 src/node-zutil/node_modules/v8plus/README.md
  141. +0 −5 src/node-zutil/node_modules/v8plus/checkver.h
  142. +0 −32 src/node-zutil/node_modules/v8plus/errno.json
  143. +0 −21 src/node-zutil/node_modules/v8plus/examples/Makefile
  144. +0 −457 src/node-zutil/node_modules/v8plus/examples/example.c
  145. +0 −23 src/node-zutil/node_modules/v8plus/examples/example.h
  146. +0 −98 src/node-zutil/node_modules/v8plus/examples/test.js
  147. +0 −187 src/node-zutil/node_modules/v8plus/generrno.js
  148. +0 −19 src/node-zutil/node_modules/v8plus/node_modules/posix-getopt/LICENSE
  149. +0 −244 src/node-zutil/node_modules/v8plus/node_modules/posix-getopt/README.md
  150. +0 −40 src/node-zutil/node_modules/v8plus/node_modules/posix-getopt/examples/examples.js
  151. +0 −304 src/node-zutil/node_modules/v8plus/node_modules/posix-getopt/lib/getopt.js
  152. +0 −21 src/node-zutil/node_modules/v8plus/node_modules/posix-getopt/package.json
  153. +0 −71 src/node-zutil/node_modules/v8plus/node_modules/posix-getopt/tests/test-getopt.js
  154. +0 −74 src/node-zutil/node_modules/v8plus/node_modules/posix-getopt/tests/test-tokenize-optstr.js
  155. +0 −7 src/node-zutil/node_modules/v8plus/origin.js
  156. +0 −21 src/node-zutil/node_modules/v8plus/package.json
  157. +0 −38 src/node-zutil/node_modules/v8plus/v8plus_c_impl.h
  158. +0 −1,357 src/node-zutil/node_modules/v8plus/v8plus_csup.c
  159. +0 −286 src/node-zutil/node_modules/v8plus/v8plus_glue.h
  160. +0 −224 src/node-zutil/node_modules/v8plus/v8plus_impl.h
  161. +0 −399 src/node-zutil/node_modules/v8plus/v8plus_objectwrap.cc
  162. +0 −744 src/node-zutil/node_modules/v8plus/v8plus_subr.cc
  163. +0 −25 src/node-zutil/package.json
  164. +0 −27 src/node-zutil/src/Makefile
  165. +0 −148 src/node-zutil/src/zone.c
  166. +0 −321 src/node-zutil/src/zonecfg.c
  167. +0 −71 src/node-zutil/src/zutil_bindings.c
  168. +0 −73 src/node-zutil/tst/zone.test.js
  169. +0 −100 src/node-zutil/tst/zonecfg.test.js
View
@@ -73,13 +73,7 @@ src/diskinfo
src/disklayout
src/mkzpool
src/node-dtrace-provider/build
-src/node-microtime/build
-src/node-sqlite3/build/
src/node-libuuid/build
-src/node-zsock/.lock-wscript
-src/node-zsock/build/
-src/node-zutil/.lock-wscript
-src/node-zutil/build/
src/sdc-on-tty
src/sysinfo_mod.so
src/vm/node_modules/props.js
View
@@ -131,8 +131,7 @@ C_CHECK_TARGETS=\
sysevent.c \
dockerinit/src/dockerexec.c \
dockerinit/src/dockerinit.c \
- dockerinit/src/docker-common.c \
- node-zsock/src/zsock.c
+ dockerinit/src/docker-common.c
#
# Generic flags we apply by default to everything.
@@ -232,79 +231,6 @@ $(DTRACE_PROVIDER.NODE) : LDFLAGS += $(NODE_LDFLAGS)
CLEANFILES += $(DTRACE_PROVIDER.NODE) $(DTRACE_PROVIDER_OBJS)
#
-# The microtime Node add-on follows the same pattern as EXPAT.NODE.
-#
-MICROTIME_OBJDIR = node-microtime/build/Release
-MICROTIME.NODE = $(MICROTIME_OBJDIR)/microtime.node
-
-$(MICROTIME.NODE) : WARN_FLAGS += -Wno-unused -Wno-write-strings -Wno-sign-compare
-$(MICROTIME.NODE) : CPPFLAGS += $(NODE_CPPFLAGS)
-$(MICROTIME.NODE) : CXXFLAGS += $(NODE_CFLAGS)
-$(MICROTIME.NODE) : LDFLAGS += $(NODE_LDFLAGS)
-
-
-#
-# The sqlite3 add-on uses a combination of C + C++ files in multiple
-# directories, and has multiple header directories as well.
-#
-SQLITE3_OBJDIR = node-sqlite3/build/Release
-SQLITE3_SRCDIR = node-sqlite3/src
-SQLITE3_LIBSRCDIR = node-sqlite3/deps/sqlite3
-SQLITE3_BINDINGS.NODE = $(SQLITE3_OBJDIR)/node_sqlite3.node
-
-SQLITE3_SRCS += \
- database.cc \
- node_sqlite3.cc \
- statement.cc
-
-SQLITE3_LIBSRCS += sqlite3.c
-
-SQLITE3_NODEHDRS += \
- async.h \
- macros.h \
- statement.h \
- threading.h
-
-SQLITE3_LIBHDRS += \
- sqlite3.h \
- sqlite3ext.h
-
-SQLITE3_OBJS = \
- $(SQLITE3_SRCS:%.cc=$(SQLITE3_OBJDIR)/%.o) \
- $(SQLITE3_LIBSRCS:%.c=$(SQLITE3_OBJDIR)/%.o)
-SQLITE3_HDRS = \
- $(SQLITE3_NODEHDRS:%=$(SQLITE3_SRCDIR)/%) \
- $(SQLITE3_LIBHDRS:%=$(SQLITE3_LIBSRCDIR)/%)
-CLEANFILES += $(SQLITE3_OBJS)
-
-SQLITE3_FLAGS = \
- -fdata-sections \
- -ffunction-sections \
- -fno-omit-frame-pointer \
- -fno-strict-aliasing \
- -fno-exceptions
-
-$(SQLITE3_BINDINGS.NODE) : WARN_FLAGS = -Wall -Werror
-$(SQLITE3_BINDINGS.NODE) : CPPFLAGS += \
- $(NODE_CPPFLAGS) \
- -I$(SQLITE3_LIBSRCDIR) \
- -D_SQLITE_THREADSAFE=1 \
- -D_SQLITE_ENABLE_FTS3 \
- -D_SQLITE_ENABLE_RTREE \
- -D_LARGEFILE_SOURCE \
- -D_FILE_OFFSET_BITS=64 \
- -D_REENTRANT \
- -D_NDEBUG \
- -D_POSIX_PTHREAD_SEMANTICS
-$(SQLITE3_BINDINGS.NODE) : CFLAGS += \
- $(NODE_CFLAGS) \
- $(SQLITE3_FLAGS)
-$(SQLITE3_BINDINGS.NODE) : LDFLAGS += \
- $(NODE_LDFLAGS) \
- -Wl,-soname=node_sqlite3.node
-$(SQLITE3_BINDINGS.NODE) : LIBS += -lpthread
-
-#
# The libuuid Node add-on follows the same pattern as EXPAT.NODE.
#
UUID_OBJDIR = node-libuuid/build/Release
@@ -318,21 +244,6 @@ $(UUID.NODE) : LDFLAGS += $(NODE_LDFLAGS)
$(UUID.NODE) : LIBS += -luuid
#
-# The zsock Node add-on is based on v8plus, which has its own system of
-# Makefiles.
-#
-ZSOCK_SRCDIR = node-zsock/src
-ZSOCK_V8PLUS_DIR = node-zsock/node_modules/v8plus
-ZSOCK_BINDINGS.NODE = $(ZSOCK_SRCDIR)/../lib/zsock_bindings.node
-
-#
-# Likewise zutil.
-#
-ZUTIL_SRCDIR = node-zutil/src
-ZUTIL_V8PLUS_DIR = node-zutil/node_modules/v8plus
-ZUTIL_BINDINGS.NODE = $(ZUTIL_SRCDIR)/../lib/zutil_bindings.node
-
-#
# Rules for building the nomknod related shared object.
#
NOMKNOD_SRC = nomknod.c
@@ -374,13 +285,9 @@ TARGETS = \
$(KSTAT.NODE) \
$(LOCKFD_BINDING.NODE) \
$(ZONENAME_BINDING.NODE) \
- $(MICROTIME.NODE) \
$(NOMKNOD_TARGS) \
$(SYSLOG.NODE) \
- $(SQLITE3_BINDINGS.NODE) \
- $(UUID.NODE) \
- $(ZSOCK_BINDINGS.NODE) \
- $(ZUTIL_BINDINGS.NODE)
+ $(UUID.NODE)
USR_LIB_TARGETS = \
cryptpass \
@@ -432,33 +339,16 @@ install: all $(SUBDIRS)
cp $(LOCKFD_BINDING.NODE) $(PREFIX_NODE)/node_modules/lockfd_binding.node
cp node-zonename/lib/index.js $(PREFIX_NODE)/node_modules/zonename.js
cp $(ZONENAME_BINDING.NODE) $(PREFIX_NODE)/node_modules/zonename_binding.node
- cp $(MICROTIME.NODE) $(PREFIX_NODE)/node_modules/
rm -rf $(DESTDIR)/usr/vm
cp -PR vm $(DESTDIR)/usr/
mkdir -m 0755 -p $(DESTDIR)/usr/vm/node_modules
- mkdir -p $(PREFIX_NODE)/node_modules/{zsock,zutil}/build/Release
mkdir -p $(DESTDIR)/usr/vm/test/tests
cp -Pr vm/common $(DESTDIR)/usr/vm/test/
mkdir -p $(DESTDIR)/usr/vm/test/tests
cp -Pr vm/tests/*.js $(DESTDIR)/usr/vm/test/tests/
cp -Pr vm/tests/testdata $(DESTDIR)/usr/vm/test/
cp vm/runtest $(DESTDIR)/usr/vm/test/
cp vm/runtests $(DESTDIR)/usr/vm/test/
- cp -Pr node-zsock/{package.json,lib} \
- $(PREFIX_NODE)/node_modules/zsock
- cp -Pr node-zutil/{package.json,lib} \
- $(PREFIX_NODE)/node_modules/zutil
- cp $(SQLITE3_BINDINGS.NODE) \
- $(PREFIX_NODE)/node_modules
- (sed -e "s|var sqlite3.*;|var sqlite3 = module.exports = exports = require('./node_sqlite3');|" | \
- sed -e "s|var trace = require.*;|var trace = require('./sqlite3_trace')|") \
- < node-sqlite3/lib/sqlite3.js \
- > $(PREFIX_NODE)/node_modules/sqlite3.js
- cp node-sqlite3/lib/trace.js $(PREFIX_NODE)/node_modules/sqlite3_trace.js
- cp $(ZSOCK_BINDINGS.NODE) \
- $(PREFIX_NODE)/node_modules/zsock/build/Release
- cp $(ZUTIL_BINDINGS.NODE) \
- $(PREFIX_NODE)/node_modules/zutil/build/Release
cp $(EXPAT.NODE) $(PREFIX_NODE)/node_modules/expat_binding.node
cp $(UUID.NODE) $(PREFIX_NODE)/node_modules/uuid.node
cp $(DTRACE_PROVIDER.NODE) $(PREFIX_NODE)/node_modules/DTraceProviderBindings.node
@@ -590,7 +480,6 @@ $(JSLINT):
clean: $(SUBDIRS)
-rm -f $(TARGETS) $(SMARTDC_TARGETS) $(SMARTDC_LIB_TARGETS) *.o \
$(CLEANFILES)
- -rm -rf node-sqlite3/build
cd $(LOCKFD_SRC_DIR) && $(MAKE) clean
cd $(ZONENAME_SRC_DIR) && $(MAKE) clean
@@ -680,47 +569,10 @@ $(KSTAT.NODE): node-kstat/kstat.cc
@mkdir -p $(KSTAT_OBJDIR)
$(GXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
-$(MICROTIME.NODE): node-microtime/src/microtime.cc
- @mkdir -p $(MICROTIME_OBJDIR)
- $(GXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
-
-$(SQLITE3_OBJDIR)/%.o: $(SQLITE3_SRCDIR)/%.cc $(SQLITE3_HDRS)
- @mkdir -p $(SQLITE3_OBJDIR)
- $(GXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
-
-$(SQLITE3_OBJDIR)/%.o: $(SQLITE3_LIBSRCDIR)/%.c $(SQLITE3_HDRS)
- @mkdir -p $(SQLITE3_OBJDIR)
- $(GCC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
-
-$(SQLITE3_BINDINGS.NODE): $(SQLITE3_OBJS)
- $(GXX) $(LDFLAGS) -o $@ $(SQLITE3_OBJS) $(LIBS)
-
$(UUID.NODE): $(UUID_SRCDIR)/uuid.cc
@mkdir -p $(UUID_OBJDIR)
$(GXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
-$(ZSOCK_BINDINGS.NODE): FRC
- cd $(ZSOCK_SRCDIR) && \
- LD_OPTIONS=-lc \
- $(MAKE) \
- CC=$(GCC) CXX=$(GXX) \
- PREFIX_NODE=$(PREFIX_NODE) \
- NODE_EXEC=$(NODE_EXEC) \
- V8PLUS=$(PWD)/$(ZSOCK_V8PLUS_DIR) \
- CTFCONVERT=$(CTFCONVERT) \
- CTFMERGE=$(CTFMERGE)
-
-$(ZUTIL_BINDINGS.NODE): FRC
- cd $(ZUTIL_SRCDIR) && \
- LD_OPTIONS=-lc \
- $(MAKE) \
- CC=$(GCC) CXX=$(GXX) \
- PREFIX_NODE=$(PREFIX_NODE) \
- NODE_EXEC=$(NODE_EXEC) \
- V8PLUS=$(PWD)/$(ZUTIL_V8PLUS_DIR) \
- CTFCONVERT=$(CTFCONVERT) \
- CTFMERGE=$(CTFMERGE)
-
$(NOMKNOD_32): $(NOMKNOD_SRC)
$(GCC) $(NOMKNOD_FLAGS) $(NOMKNOD_32_FLAGS) -o $@ $<
View
@@ -766,16 +766,6 @@ f usr/vm/lib/metadata/agent.js 0444 root bin
f usr/vm/sbin/metadata 0555 root bin
f usr/vm/smf/system-metadata 0555 root bin
f lib/svc/manifest/system/system-metadata.xml 0444 root bin
-d usr/node/0.10/node_modules/zsock 0555 root bin
-f usr/node/0.10/node_modules/zsock/package.json 0444 root bin
-d usr/node/0.10/node_modules/zsock/lib 0555 root bin
-f usr/node/0.10/node_modules/zsock/lib/zsock.js 0444 root bin
-f usr/node/0.10/node_modules/zsock/lib/zsock_bindings.node 0444 root bin
-d usr/node/0.10/node_modules/zutil 0555 root bin
-f usr/node/0.10/node_modules/zutil/package.json 0444 root bin
-d usr/node/0.10/node_modules/zutil/lib 0555 root bin
-f usr/node/0.10/node_modules/zutil/lib/zutil.js 0444 root bin
-f usr/node/0.10/node_modules/zutil/lib/zutil_bindings.node 0444 root bin
# 0-devpro-stamp
f usr/include/demangle.h 0644 root bin
f usr/lib/libC.so.5 0755 root bin
@@ -828,14 +818,10 @@ f usr/node/0.10/node_modules/getopt.js 0444 root bin
f usr/node/0.10/node_modules/kstat.node 0444 root bin
f usr/node/0.10/node_modules/lockfd.js 0444 root bin
f usr/node/0.10/node_modules/lockfd_binding.node 0444 root bin
-f usr/node/0.10/node_modules/microtime.node 0444 root bin
f usr/node/0.10/node_modules/net-boot-config.js 0444 root bin
f usr/node/0.10/node_modules/onlyif.js 0444 root bin
f usr/node/0.10/node_modules/linestream.js 0444 root bin
f usr/node/0.10/node_modules/sprintf.js 0444 root bin
-f usr/node/0.10/node_modules/sqlite3.js 0444 root bin
-f usr/node/0.10/node_modules/sqlite3_trace.js 0444 root bin
-f usr/node/0.10/node_modules/node_sqlite3.node 0444 root bin
f usr/node/0.10/node_modules/system.js 0444 root bin
f usr/node/0.10/node_modules/uuid.node 0444 root bin
f usr/node/0.10/node_modules/zfs.js 0444 root bin
@@ -1,5 +0,0 @@
-language: node_js
-node_js:
- - "0.6"
- - "0.8"
- - "0.9"
@@ -1,19 +0,0 @@
-Copyright (c) 2011 Wade Simmons <wade@wades.im>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
@@ -1,71 +0,0 @@
-[![Build Status](https://travis-ci.org/wadey/node-microtime.png)](https://travis-ci.org/wadey/node-microtime)
-
-# node-microtime
-
-Date.now() will only give you accuracy in milliseconds. This module calls
-`gettimeofday(2)` to get the time in microseconds and provides it in a few
-different formats. The same warning from that function applies:
-_The resolution of the system clock is hardware dependent, and the time may
-be updated continuously or in ``ticks.''_
-
-# Installation
-
- npm install microtime
-
-* Requires npm >= 1.1.5 (which bundles node-gyp). See https://github.com/wadey/node-microtime/issues/9
-
-# Usage
-
-### microtime.now()
-
-Get the current time in microseconds as an integer. Since JavaScript can only
-represent integer values accurately up to `Math.pow(2, 53)`, this value will
-be accurate up to _Tue, 05 Jun 2255 23:47:34 GMT_.
-
-### microtime.nowDouble()
-
-Get the current time in seconds as a floating point number with microsecond
-accuracy (similar to `time.time()` in Python and `Time.now.to_f` in Ruby).
-
-### microtime.nowStruct()
-
-Get the current time and return as a list with seconds and microseconds (matching the return value of `gettimeofday(2)`).
-
-# Example
-
- > var microtime = require('microtime')
- > microtime.now()
- 1297448895297028
- > microtime.nowDouble()
- 1297448897.600976
- > microtime.nowStruct()
- [ 1297448902, 753875 ]
-
-## Estimating clock resolution
-
-Starting with version 0.1.3, there is a test script that tries to guess the clock resolution. You can run it with `npm test microtime`. Example output:
-
- microtime.now() = 1298960083489806
- microtime.nowDouble() = 1298960083.511521
- microtime.nowStruct() = [ 1298960083, 511587 ]
-
- Guessing clock resolution...
- Clock resolution observed: 1us
-
-## Tested on
-
- Node.js 0.2.6
- - OS X 10.6.6
- - Ubuntu 10.04
-
- Node.js 0.4.1
- - OS X 10.6.6
- - Windows 7 64bit (Cygwin) *
-
- Node.js 0.8.11
- - OS X 10.7.4
- - Travis (linux): https://travis-ci.org/wadey/node-microtime
-
-## Warning for Cygwin users
-
-It appears that Cygwin only implements `gettimeofday(2)` with [millisecond accuracy](http://old.nabble.com/gettimeofday---millisecond-accuracy-p21085475.html).
@@ -1,8 +0,0 @@
-{
- 'targets': [
- {
- 'target_name': 'microtime',
- 'sources': [ 'src/microtime.cc' ]
- }
- ]
-}
@@ -1,5 +0,0 @@
-var binding = require('bindings')('microtime.node')
-
-exports.now = binding.now
-exports.nowDouble = binding.nowDouble
-exports.nowStruct = binding.nowStruct
@@ -1,18 +0,0 @@
-{
- "name": "microtime",
- "version": "0.3.3",
- "description": "Get the current time in microseconds",
- "author": "Wade Simmons <wade@wades.im> (http://wades.im/mons)",
- "homepage": "https://github.com/wadey/node-microtime",
- "repository": "git://github.com/wadey/node-microtime.git",
- "main": "./index",
- "engines": {
- "node": ">= 0.6.0"
- },
- "scripts": {
- "test": "node test.js"
- },
- "dependencies": {
- "bindings": "1.0.0"
- }
-}
Oops, something went wrong.

0 comments on commit 73d8c13

Please sign in to comment.