bson 0.2.18 → 0.2.22

package/.travis.yml

@@ -1,4 +1,4 @@
 language: node_js
 node_js:
   - 0.10 # development version of 0.8, may be unstable
-  - 0.11
+  - 0.12

package/HISTORY

@@ -1,4 +1,16 @@
-0.2.18 2014-01-20
+0.2.22 2015-07-23
+-----------------
+- Updated Nan to 1.8.x to support io.js and node 0.12.0
+
+0.2.21 2015-03-21
+-----------------
+- Updated Nan to 1.7.0 to support io.js and node 0.12.0
+
+0.2.19 2015-02-16
+-----------------
+- Updated Nan to 1.6.2 to support io.js and node 0.12.0
+
+0.2.18 2015-01-20
 -----------------
 - Updated Nan to 1.5.1 to support io.js
 

package/build/Makefile

@@ -49,15 +49,7 @@ LDFLAGS.target ?= $(LDFLAGS)
 AR.target ?= $(AR)
 
 # C++ apps need to be linked with g++.
-#
-# Note: flock is used to seralize linking. Linking is a memory-intensive
-# process so running parallel links can often lead to thrashing.  To disable
-# the serialization, override LINK via an envrionment variable as follows:
-#
-#   export LINK=g++
-#
-# This will allow make to invoke N linker processes as specified in -jN.
-LINK ?= ./gyp-mac-tool flock $(builddir)/linker.lock $(CXX.target)
+LINK ?= $(CXX.target)
 
 # TODO(evan): move all cross-compilation logic to gyp-time so we don't need
 # to replicate this environment fallback in make as well.
@@ -334,8 +326,8 @@ ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
 endif
 
 quiet_cmd_regen_makefile = ACTION Regenerating $@
-cmd_regen_makefile = cd $(srcdir); /usr/local/lib/node_modules/pangyp/gyp/gyp_main.py -fmake --ignore-environment "--toplevel-dir=." -I/Users/ck/coding/projects/js-bson/build/config.gypi -I/usr/local/lib/node_modules/pangyp/addon.gypi -I/Users/ck/.node-gyp/1.0.2/common.gypi "--depth=." "-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/Users/ck/.node-gyp/1.0.2" "-Dmodule_root_dir=/Users/ck/coding/projects/js-bson" binding.gyp
-Makefile: $(srcdir)/../../../.node-gyp/1.0.2/common.gypi $(srcdir)/build/config.gypi $(srcdir)/binding.gyp $(srcdir)/../../../../../usr/local/lib/node_modules/pangyp/addon.gypi
+cmd_regen_makefile = cd $(srcdir); /usr/local/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "--toplevel-dir=." -I/Users/christkv/coding/projects/js-bson/build/config.gypi -I/usr/local/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/Users/christkv/.node-gyp/2.3.3/common.gypi "--depth=." "-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/Users/christkv/.node-gyp/2.3.3" "-Dmodule_root_dir=/Users/christkv/coding/projects/js-bson" binding.gyp
+Makefile: $(srcdir)/../../../.node-gyp/2.3.3/common.gypi $(srcdir)/../../../../../usr/local/lib/node_modules/npm/node_modules/node-gyp/addon.gypi $(srcdir)/build/config.gypi $(srcdir)/binding.gyp
 	$(call do_cmd,regen_makefile)
 
 # "all" is a concatenation of the "all" targets from all the included

package/build/Release/.deps/Release/bson.node.d

@@ -1 +1 @@
-cmd_Release/bson.node := ./gyp-mac-tool flock ./Release/linker.lock c++ -bundle -Wl,-search_paths_first -mmacosx-version-min=10.5 -arch x86_64 -L./Release  -o Release/bson.node Release/obj.target/bson/ext/bson.o -undefined dynamic_lookup
+cmd_Release/bson.node := c++ -bundle -undefined dynamic_lookup -Wl,-search_paths_first -mmacosx-version-min=10.5 -arch x86_64 -L./Release  -o Release/bson.node Release/obj.target/bson/ext/bson.o 

package/build/Release/.deps/Release/obj.target/bson/ext/bson.o.d

@@ -1,36 +1,38 @@
-cmd_Release/obj.target/bson/ext/bson.o := c++ '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DBUILDING_NODE_EXTENSION' -I/Users/ck/.node-gyp/1.0.2/src -I/Users/ck/.node-gyp/1.0.2/deps/uv/include -I/Users/ck/.node-gyp/1.0.2/deps/v8/include -I../node_modules/nan  -Os -gdwarf-2 -mmacosx-version-min=10.5 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++0x -fno-rtti -fno-threadsafe-statics -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/bson/ext/bson.o.d.raw  -c -o Release/obj.target/bson/ext/bson.o ../ext/bson.cc
+cmd_Release/obj.target/bson/ext/bson.o := c++ '-DNODE_GYP_MODULE_NAME=bson' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DBUILDING_NODE_EXTENSION' -I/Users/christkv/.node-gyp/2.3.3/src -I/Users/christkv/.node-gyp/2.3.3/deps/uv/include -I/Users/christkv/.node-gyp/2.3.3/deps/v8/include -I../node_modules/nan  -Os -gdwarf-2 -mmacosx-version-min=10.5 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++0x -fno-rtti -fno-threadsafe-statics -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/bson/ext/bson.o.d.raw  -c -o Release/obj.target/bson/ext/bson.o ../ext/bson.cc
 Release/obj.target/bson/ext/bson.o: ../ext/bson.cc \
-  /Users/ck/.node-gyp/1.0.2/deps/v8/include/v8.h \
-  /Users/ck/.node-gyp/1.0.2/deps/v8/include/v8config.h \
-  /Users/ck/.node-gyp/1.0.2/src/node.h \
-  /Users/ck/.node-gyp/1.0.2/src/node_version.h \
-  /Users/ck/.node-gyp/1.0.2/src/node_buffer.h \
-  /Users/ck/.node-gyp/1.0.2/src/smalloc.h ../ext/bson.h \
-  /Users/ck/.node-gyp/1.0.2/src/node_object_wrap.h \
+  /Users/christkv/.node-gyp/2.3.3/deps/v8/include/v8.h \
+  /Users/christkv/.node-gyp/2.3.3/deps/v8/include/v8-version.h \
+  /Users/christkv/.node-gyp/2.3.3/deps/v8/include/v8config.h \
+  /Users/christkv/.node-gyp/2.3.3/src/node.h \
+  /Users/christkv/.node-gyp/2.3.3/src/node_version.h \
+  /Users/christkv/.node-gyp/2.3.3/src/node_buffer.h \
+  /Users/christkv/.node-gyp/2.3.3/src/smalloc.h ../ext/bson.h \
+  /Users/christkv/.node-gyp/2.3.3/src/node_object_wrap.h \
   ../node_modules/nan/nan.h \
-  /Users/ck/.node-gyp/1.0.2/deps/uv/include/uv.h \
-  /Users/ck/.node-gyp/1.0.2/deps/uv/include/uv-errno.h \
-  /Users/ck/.node-gyp/1.0.2/deps/uv/include/uv-version.h \
-  /Users/ck/.node-gyp/1.0.2/deps/uv/include/uv-unix.h \
-  /Users/ck/.node-gyp/1.0.2/deps/uv/include/uv-threadpool.h \
-  /Users/ck/.node-gyp/1.0.2/deps/uv/include/uv-darwin.h \
+  /Users/christkv/.node-gyp/2.3.3/deps/uv/include/uv.h \
+  /Users/christkv/.node-gyp/2.3.3/deps/uv/include/uv-errno.h \
+  /Users/christkv/.node-gyp/2.3.3/deps/uv/include/uv-version.h \
+  /Users/christkv/.node-gyp/2.3.3/deps/uv/include/uv-unix.h \
+  /Users/christkv/.node-gyp/2.3.3/deps/uv/include/uv-threadpool.h \
+  /Users/christkv/.node-gyp/2.3.3/deps/uv/include/uv-darwin.h \
   ../node_modules/nan/nan_new.h \
   ../node_modules/nan/nan_implementation_12_inl.h
 ../ext/bson.cc:
-/Users/ck/.node-gyp/1.0.2/deps/v8/include/v8.h:
-/Users/ck/.node-gyp/1.0.2/deps/v8/include/v8config.h:
-/Users/ck/.node-gyp/1.0.2/src/node.h:
-/Users/ck/.node-gyp/1.0.2/src/node_version.h:
-/Users/ck/.node-gyp/1.0.2/src/node_buffer.h:
-/Users/ck/.node-gyp/1.0.2/src/smalloc.h:
+/Users/christkv/.node-gyp/2.3.3/deps/v8/include/v8.h:
+/Users/christkv/.node-gyp/2.3.3/deps/v8/include/v8-version.h:
+/Users/christkv/.node-gyp/2.3.3/deps/v8/include/v8config.h:
+/Users/christkv/.node-gyp/2.3.3/src/node.h:
+/Users/christkv/.node-gyp/2.3.3/src/node_version.h:
+/Users/christkv/.node-gyp/2.3.3/src/node_buffer.h:
+/Users/christkv/.node-gyp/2.3.3/src/smalloc.h:
 ../ext/bson.h:
-/Users/ck/.node-gyp/1.0.2/src/node_object_wrap.h:
+/Users/christkv/.node-gyp/2.3.3/src/node_object_wrap.h:
 ../node_modules/nan/nan.h:
-/Users/ck/.node-gyp/1.0.2/deps/uv/include/uv.h:
-/Users/ck/.node-gyp/1.0.2/deps/uv/include/uv-errno.h:
-/Users/ck/.node-gyp/1.0.2/deps/uv/include/uv-version.h:
-/Users/ck/.node-gyp/1.0.2/deps/uv/include/uv-unix.h:
-/Users/ck/.node-gyp/1.0.2/deps/uv/include/uv-threadpool.h:
-/Users/ck/.node-gyp/1.0.2/deps/uv/include/uv-darwin.h:
+/Users/christkv/.node-gyp/2.3.3/deps/uv/include/uv.h:
+/Users/christkv/.node-gyp/2.3.3/deps/uv/include/uv-errno.h:
+/Users/christkv/.node-gyp/2.3.3/deps/uv/include/uv-version.h:
+/Users/christkv/.node-gyp/2.3.3/deps/uv/include/uv-unix.h:
+/Users/christkv/.node-gyp/2.3.3/deps/uv/include/uv-threadpool.h:
+/Users/christkv/.node-gyp/2.3.3/deps/uv/include/uv-darwin.h:
 ../node_modules/nan/nan_new.h:
 ../node_modules/nan/nan_implementation_12_inl.h:

package/build/bson.target.mk

@@ -3,6 +3,7 @@
 TOOLSET := target
 TARGET := bson
 DEFS_Debug := \
+	'-DNODE_GYP_MODULE_NAME=bson' \
 	'-D_DARWIN_USE_64_BIT_INODE=1' \
 	'-D_LARGEFILE_SOURCE' \
 	'-D_FILE_OFFSET_BITS=64' \
@@ -39,12 +40,13 @@ CFLAGS_OBJC_Debug :=
 CFLAGS_OBJCC_Debug :=
 
 INCS_Debug := \
-	-I/Users/ck/.node-gyp/1.0.2/src \
-	-I/Users/ck/.node-gyp/1.0.2/deps/uv/include \
-	-I/Users/ck/.node-gyp/1.0.2/deps/v8/include \
+	-I/Users/christkv/.node-gyp/2.3.3/src \
+	-I/Users/christkv/.node-gyp/2.3.3/deps/uv/include \
+	-I/Users/christkv/.node-gyp/2.3.3/deps/v8/include \
 	-I$(srcdir)/node_modules/nan
 
 DEFS_Release := \
+	'-DNODE_GYP_MODULE_NAME=bson' \
 	'-D_DARWIN_USE_64_BIT_INODE=1' \
 	'-D_LARGEFILE_SOURCE' \
 	'-D_FILE_OFFSET_BITS=64' \
@@ -79,9 +81,9 @@ CFLAGS_OBJC_Release :=
 CFLAGS_OBJCC_Release :=
 
 INCS_Release := \
-	-I/Users/ck/.node-gyp/1.0.2/src \
-	-I/Users/ck/.node-gyp/1.0.2/deps/uv/include \
-	-I/Users/ck/.node-gyp/1.0.2/deps/v8/include \
+	-I/Users/christkv/.node-gyp/2.3.3/src \
+	-I/Users/christkv/.node-gyp/2.3.3/deps/uv/include \
+	-I/Users/christkv/.node-gyp/2.3.3/deps/v8/include \
 	-I$(srcdir)/node_modules/nan
 
 OBJS := \
@@ -114,25 +116,28 @@ $(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.cc FORCE_DO_CMD
 # End of this set of suffix rules
 ### Rules for final target.
 LDFLAGS_Debug := \
+	-undefined dynamic_lookup \
 	-Wl,-search_paths_first \
 	-mmacosx-version-min=10.5 \
 	-arch x86_64 \
 	-L$(builddir)
 
 LIBTOOLFLAGS_Debug := \
+	-undefined dynamic_lookup \
 	-Wl,-search_paths_first
 
 LDFLAGS_Release := \
+	-undefined dynamic_lookup \
 	-Wl,-search_paths_first \
 	-mmacosx-version-min=10.5 \
 	-arch x86_64 \
 	-L$(builddir)
 
 LIBTOOLFLAGS_Release := \
+	-undefined dynamic_lookup \
 	-Wl,-search_paths_first
 
-LIBS := \
-	-undefined dynamic_lookup
+LIBS :=
 
 $(builddir)/bson.node: GYP_LDFLAGS := $(LDFLAGS_$(BUILDTYPE))
 $(builddir)/bson.node: LIBS := $(LIBS)

package/build/config.gypi

@@ -1,4 +1,4 @@
-# Do not edit. File was generated by pangyp's "configure" step
+# Do not edit. File was generated by node-gyp's "configure" step
 {
   "target_defaults": {
     "cflags": [],
@@ -10,23 +10,23 @@
   "variables": {
     "host_arch": "x64",
     "icu_small": "false",
+    "llvm_version": "3.5",
     "node_install_npm": "true",
-    "node_prefix": "",
+    "node_prefix": "/",
     "node_shared_http_parser": "false",
     "node_shared_libuv": "false",
     "node_shared_openssl": "false",
-    "node_shared_v8": "false",
     "node_shared_zlib": "false",
     "node_tag": "",
     "node_use_dtrace": "true",
     "node_use_etw": "false",
-    "node_use_mdb": "false",
+    "node_use_lttng": "false",
     "node_use_openssl": "true",
     "node_use_perfctr": "false",
+    "openssl_fips": "",
     "openssl_no_asm": 0,
     "python": "/usr/bin/python",
     "target_arch": "x64",
-    "uv_library": "static_library",
     "uv_parent_path": "/deps/uv/",
     "uv_use_dtrace": "true",
     "v8_enable_gdbjit": 0,
@@ -34,10 +34,96 @@
     "v8_no_strict_aliasing": 1,
     "v8_optimized_debug": 0,
     "v8_random_seed": 0,
-    "v8_use_snapshot": "true",
+    "v8_use_snapshot": 1,
     "want_separate_host_toolset": 0,
-    "nodedir": "/Users/ck/.node-gyp/1.0.2",
+    "nodedir": "/Users/christkv/.node-gyp/2.3.3",
     "copy_dev_lib": "true",
-    "standalone_static_library": 1
+    "standalone_static_library": 1,
+    "save_dev": "",
+    "browser": "",
+    "viewer": "man",
+    "rollback": "true",
+    "usage": "",
+    "globalignorefile": "/usr/local/etc/npmignore",
+    "init_author_url": "",
+    "shell": "/bin/bash",
+    "parseable": "",
+    "shrinkwrap": "true",
+    "email": "christkv@gmail.com",
+    "init_license": "ISC",
+    "if_present": "",
+    "cache_max": "Infinity",
+    "init_author_email": "",
+    "sign_git_tag": "",
+    "cert": "",
+    "git_tag_version": "true",
+    "local_address": "",
+    "long": "",
+    "fetch_retries": "2",
+    "npat": "",
+    "registry": "https://registry.npmjs.org/",
+    "key": "",
+    "message": "%s",
+    "versions": "",
+    "globalconfig": "/usr/local/etc/npmrc",
+    "always_auth": "",
+    "spin": "true",
+    "cache_lock_retries": "10",
+    "cafile": "",
+    "heading": "npm",
+    "fetch_retry_mintimeout": "10000",
+    "proprietary_attribs": "true",
+    "access": "",
+    "json": "",
+    "description": "true",
+    "engine_strict": "",
+    "https_proxy": "",
+    "init_module": "/Users/christkv/.npm-init.js",
+    "userconfig": "/Users/christkv/.npmrc",
+    "node_version": "2.3.3",
+    "user": "",
+    "editor": "vi",
+    "save": "",
+    "tag": "latest",
+    "global": "",
+    "optional": "true",
+    "bin_links": "true",
+    "force": "",
+    "searchopts": "",
+    "depth": "Infinity",
+    "rebuild_bundle": "true",
+    "searchsort": "name",
+    "unicode": "true",
+    "fetch_retry_maxtimeout": "60000",
+    "ca": "",
+    "save_prefix": "^",
+    "strict_ssl": "true",
+    "tag_version_prefix": "v",
+    "dev": "",
+    "fetch_retry_factor": "10",
+    "group": "20",
+    "save_exact": "",
+    "cache_lock_stale": "60000",
+    "version": "",
+    "cache_min": "10",
+    "cache": "/Users/christkv/.npm",
+    "searchexclude": "",
+    "color": "true",
+    "save_optional": "",
+    "user_agent": "npm/2.11.3 node/v2.3.3 darwin x64",
+    "ignore_scripts": "",
+    "cache_lock_wait": "10000",
+    "production": "",
+    "save_bundle": "",
+    "init_version": "1.0.0",
+    "umask": "0022",
+    "git": "git",
+    "init_author_name": "",
+    "scope": "",
+    "onload_script": "",
+    "tmp": "/var/folders/f8/t_ptm_915cnfkwz8j4phfgw00000gp/T",
+    "unsafe_perm": "true",
+    "link": "",
+    "prefix": "/usr/local"
   }
 }

package/build/gyp-mac-tool

@@ -46,7 +46,7 @@ class MacTool(object):
     """Transforms a tool name like copy-info-plist to CopyInfoPlist"""
     return name_string.title().replace('-', '')
 
-  def ExecCopyBundleResource(self, source, dest):
+  def ExecCopyBundleResource(self, source, dest, convert_to_binary):
     """Copies a resource file to the bundle/Resources directory, performing any
     necessary compilation on each resource."""
     extension = os.path.splitext(source)[1].lower()
@@ -63,7 +63,7 @@ class MacTool(object):
     elif extension == '.storyboard':
       return self._CopyXIBFile(source, dest)
     elif extension == '.strings':
-      self._CopyStringsFile(source, dest)
+      self._CopyStringsFile(source, dest, convert_to_binary)
     else:
       shutil.copy(source, dest)
 
@@ -93,7 +93,11 @@ class MacTool(object):
         sys.stdout.write(line)
     return ibtoolout.returncode
 
-  def _CopyStringsFile(self, source, dest):
+  def _ConvertToBinary(self, dest):
+    subprocess.check_call([
+        'xcrun', 'plutil', '-convert', 'binary1', '-o', dest, dest])
+
+  def _CopyStringsFile(self, source, dest, convert_to_binary):
     """Copies a .strings file using iconv to reconvert the input into UTF-16."""
     input_code = self._DetectInputEncoding(source) or "UTF-8"
 
@@ -113,6 +117,9 @@ class MacTool(object):
     fp.write(s.decode(input_code).encode('UTF-16'))
     fp.close()
 
+    if convert_to_binary == 'True':
+      self._ConvertToBinary(dest)
+
   def _DetectInputEncoding(self, file_name):
     """Reads the first few bytes from file_name and tries to guess the text
     encoding. Returns None as a guess if it can't detect it."""
@@ -132,7 +139,7 @@ class MacTool(object):
     else:
       return None
 
-  def ExecCopyInfoPlist(self, source, dest, *keys):
+  def ExecCopyInfoPlist(self, source, dest, convert_to_binary, *keys):
     """Copies the |source| Info.plist to the destination directory |dest|."""
     # Read the source Info.plist into memory.
     fd = open(source, 'r')
@@ -147,7 +154,7 @@ class MacTool(object):
 
     # Go through all the environment variables and replace them as variables in
     # the file.
-    IDENT_RE = re.compile('[/\s]')
+    IDENT_RE = re.compile(r'[/\s]')
     for key in os.environ:
       if key.startswith('_'):
         continue
@@ -186,6 +193,9 @@ class MacTool(object):
     # "compiled".
     self._WritePkgInfo(dest)
 
+    if convert_to_binary == 'True':
+      self._ConvertToBinary(dest)
+
   def _WritePkgInfo(self, info_plist):
     """This writes the PkgInfo file from the data stored in Info.plist."""
     plist = plistlib.readPlist(info_plist)
@@ -220,11 +230,28 @@ class MacTool(object):
     """Calls libtool and filters out '/path/to/libtool: file: foo.o has no
     symbols'."""
     libtool_re = re.compile(r'^.*libtool: file: .* has no symbols$')
-    libtoolout = subprocess.Popen(cmd_list, stderr=subprocess.PIPE)
+    libtool_re5 = re.compile(
+        r'^.*libtool: warning for library: ' +
+        r'.* the table of contents is empty ' +
+        r'\(no object file members in the library define global symbols\)$')
+    env = os.environ.copy()
+    # Ref:
+    # http://www.opensource.apple.com/source/cctools/cctools-809/misc/libtool.c
+    # The problem with this flag is that it resets the file mtime on the file to
+    # epoch=0, e.g. 1970-1-1 or 1969-12-31 depending on timezone.
+    env['ZERO_AR_DATE'] = '1'
+    libtoolout = subprocess.Popen(cmd_list, stderr=subprocess.PIPE, env=env)
     _, err = libtoolout.communicate()
     for line in err.splitlines():
-      if not libtool_re.match(line):
+      if not libtool_re.match(line) and not libtool_re5.match(line):
         print >>sys.stderr, line
+    # Unconditionally touch the output .a file on the command line if present
+    # and the command succeeded. A bit hacky.
+    if not libtoolout.returncode:
+      for i in range(len(cmd_list) - 1):
+        if cmd_list[i] == "-o" and cmd_list[i+1].endswith('.a'):
+          os.utime(cmd_list[i+1], None)
+          break
     return libtoolout.returncode
 
   def ExecPackageFramework(self, framework, version):
@@ -263,6 +290,66 @@ class MacTool(object):
       os.remove(link)
     os.symlink(dest, link)
 
+  def ExecCompileXcassets(self, keys, *inputs):
+    """Compiles multiple .xcassets files into a single .car file.
+
+    This invokes 'actool' to compile all the inputs .xcassets files. The
+    |keys| arguments is a json-encoded dictionary of extra arguments to
+    pass to 'actool' when the asset catalogs contains an application icon
+    or a launch image.
+
+    Note that 'actool' does not create the Assets.car file if the asset
+    catalogs does not contains imageset.
+    """
+    command_line = [
+      'xcrun', 'actool', '--output-format', 'human-readable-text',
+      '--compress-pngs', '--notices', '--warnings', '--errors',
+    ]
+    is_iphone_target = 'IPHONEOS_DEPLOYMENT_TARGET' in os.environ
+    if is_iphone_target:
+      platform = os.environ['CONFIGURATION'].split('-')[-1]
+      if platform not in ('iphoneos', 'iphonesimulator'):
+        platform = 'iphonesimulator'
+      command_line.extend([
+          '--platform', platform, '--target-device', 'iphone',
+          '--target-device', 'ipad', '--minimum-deployment-target',
+          os.environ['IPHONEOS_DEPLOYMENT_TARGET'], '--compile',
+          os.path.abspath(os.environ['CONTENTS_FOLDER_PATH']),
+      ])
+    else:
+      command_line.extend([
+          '--platform', 'macosx', '--target-device', 'mac',
+          '--minimum-deployment-target', os.environ['MACOSX_DEPLOYMENT_TARGET'],
+          '--compile',
+          os.path.abspath(os.environ['UNLOCALIZED_RESOURCES_FOLDER_PATH']),
+      ])
+    if keys:
+      keys = json.loads(keys)
+      for key, value in keys.iteritems():
+        arg_name = '--' + key
+        if isinstance(value, bool):
+          if value:
+            command_line.append(arg_name)
+        elif isinstance(value, list):
+          for v in value:
+            command_line.append(arg_name)
+            command_line.append(str(v))
+        else:
+          command_line.append(arg_name)
+          command_line.append(str(value))
+    # Note: actool crashes if inputs path are relative, so use os.path.abspath
+    # to get absolute path name for inputs.
+    command_line.extend(map(os.path.abspath, inputs))
+    subprocess.check_call(command_line)
+
+  def ExecMergeInfoPlist(self, output, *inputs):
+    """Merge multiple .plist files into a single .plist file."""
+    merged_plist = {}
+    for path in inputs:
+      plist = self._LoadPlistMaybeBinary(path)
+      self._MergePlist(merged_plist, plist)
+    plistlib.writePlist(merged_plist, output)
+
   def ExecCodeSignBundle(self, key, resource_rules, entitlements, provisioning):
     """Code sign a bundle.
 
@@ -399,6 +486,19 @@ class MacTool(object):
           'security', 'cms', '-D', '-i', profile_path, '-o', temp.name])
       return self._LoadPlistMaybeBinary(temp.name)
 
+  def _MergePlist(self, merged_plist, plist):
+    """Merge |plist| into |merged_plist|."""
+    for key, value in plist.iteritems():
+      if isinstance(value, dict):
+        merged_value = merged_plist.get(key, {})
+        if isinstance(merged_value, dict):
+          self._MergePlist(merged_value, value)
+          merged_plist[key] = merged_value
+        else:
+          merged_plist[key] = value
+      else:
+        merged_plist[key] = value
+
   def _LoadPlistMaybeBinary(self, plist_path):
     """Loads into a memory a plist possibly encoded in binary format.
 

package/builderror.log

@@ -0,0 +1,28 @@
+../ext/bson.cc:825:17: warning: 'DecodeBytes' is deprecated: Use DecodeBytes(isolate, ...) [-Wdeprecated-declarations]
+                ssize_t len = DecodeBytes(args[0], BINARY);
+                              ^
+/Users/christkv/.node-gyp/2.3.3/src/node.h:318:32: note: 'DecodeBytes' has been explicitly marked deprecated here
+                inline ssize_t DecodeBytes(
+                               ^
+/Users/christkv/.node-gyp/2.3.3/src/node.h:66:42: note: expanded from macro 'NODE_DEPRECATED'
+    __attribute__((deprecated(message))) declarator
+                                         ^
+../ext/bson.cc:833:3: warning: 'DecodeWrite' is deprecated: Use DecodeWrite(isolate, ...) [-Wdeprecated-declarations]
+                DecodeWrite(data, len, args[0], BINARY);
+                ^
+/Users/christkv/.node-gyp/2.3.3/src/node.h:331:32: note: 'DecodeWrite' has been explicitly marked deprecated here
+                inline ssize_t DecodeWrite(char* buf,
+                               ^
+/Users/christkv/.node-gyp/2.3.3/src/node.h:66:42: note: expanded from macro 'NODE_DEPRECATED'
+    __attribute__((deprecated(message))) declarator
+                                         ^
+../ext/bson.cc:928:28: warning: 'Encode' is deprecated: Use Encode(isolate, ...) [-Wdeprecated-declarations]
+                Local<Value> bin_value = Encode(serialized_object, object_size, BINARY)->ToString();
+                                         ^
+/Users/christkv/.node-gyp/2.3.3/src/node.h:299:45: note: 'Encode' has been explicitly marked deprecated here
+                inline v8::Local<v8::Value> Encode(
+                                            ^
+/Users/christkv/.node-gyp/2.3.3/src/node.h:66:42: note: expanded from macro 'NODE_DEPRECATED'
+    __attribute__((deprecated(message))) declarator
+                                         ^
+3 warnings generated.

package/lib/bson/binary.js

@@ -17,7 +17,7 @@ if(typeof window === 'undefined') {
  *  - **BSON.BSON_BINARY_SUBTYPE_MD5**, BSON md5 type.
  *  - **BSON.BSON_BINARY_SUBTYPE_USER_DEFINED**, BSON user defined type.
  *
- * @class Represents a BSON Binary type.
+ * @class
  * @param {Buffer} buffer a buffer object containing the binary data.
  * @param {Number} [subType] the option binary type.
  * @return {Binary}

package/lib/bson/bson.js

@@ -20,7 +20,7 @@ var isDate = function isDate(d) {
 /**
  * Create a new BSON instance
  *
- * @class Represents the BSON Parser
+ * @class
  * @return {BSON} instance of BSON Parser.
  */
 function BSON () {};

package/lib/bson/code.js

@@ -1,7 +1,7 @@
 /**
  * A class representation of the BSON Code type.
  *
- * @class Represents a BSON Code and Code with scope type.
+ * @class
  * @param {(string|function)} code a string or function.
  * @param {Object} [scope] an optional scope for the function.
  * @return {Code}

package/lib/bson/db_ref.js

@@ -1,7 +1,7 @@
 /**
  * A class representation of the BSON DBRef type.
  *
- * @class Represents a BSON DbRef type.
+ * @class
  * @param {string} namespace the collection name.
  * @param {ObjectID} oid the reference ObjectID.
  * @param {string} [db] optional db name, if omitted the reference is local to the current db.

package/lib/bson/double.js

@@ -1,7 +1,7 @@
 /**
  * A class representation of the BSON Double type.
  *
- * @class Represents a BSON Double type.
+ * @class
  * @param {number} value the number we want to represent as a double.
  * @return {Double}
  */

package/lib/bson/long.js

@@ -35,7 +35,7 @@
  * a positive number, it overflows back into a negative).  Not handling this
  * case would often result in infinite recursion.
  *
- * @class Represents the BSON Long type.
+ * @class
  * @param {number} low  the low (signed) 32 bits of the Long.
  * @param {number} high the high (signed) 32 bits of the Long.
  * @return {Long}

package/lib/bson/max_key.js

@@ -1,7 +1,7 @@
 /**
  * A class representation of the BSON MaxKey type.
  *
- * @class Represents a BSON MaxKey type.
+ * @class
  * @return {MaxKey} A MaxKey instance
  */
 function MaxKey() {

package/lib/bson/min_key.js

@@ -1,7 +1,7 @@
 /**
  * A class representation of the BSON MinKey type.
  *
- * @class Represents a BSON MinKey type.
+ * @class
  * @return {MinKey} A MinKey instance
  */
 function MinKey() {

package/lib/bson/objectid.js

@@ -20,7 +20,7 @@ var checkForHexRegExp = new RegExp("^[0-9a-fA-F]{24}$");
 /**
 * Create a new ObjectID instance
 *
-* @class Represents a BSON ObjectId type.
+* @class
 * @param {(string|number)} id Can be a 24 byte hex string, 12 byte binary string or a Number.
 * @property {number} generationTime The generation time of this ObjectId instance
 * @return {ObjectID} instance of ObjectID.

package/lib/bson/symbol.js

@@ -1,7 +1,7 @@
 /**
  * A class representation of the BSON Symbol type.
  *
- * @class Represents a BSON Symbol type.
+ * @class
  * @deprecated
  * @param {string} value the string representing the symbol.
  * @return {Symbol}

package/lib/bson/timestamp.js

@@ -38,7 +38,7 @@
  * a positive number, it overflows back into a negative).  Not handling this
  * case would often result in infinite recursion.
  *
- * @class Represents the BSON Timestamp type.
+ * @class
  * @param {number} low  the low (signed) 32 bits of the Timestamp.
  * @param {number} high the high (signed) 32 bits of the Timestamp.
  */

package/package.json

@@ -1,7 +1,7 @@
 { "name" :            "bson"
 , "description" :     "A bson parser for node.js and the browser"
 , "keywords" :        ["mongodb", "bson", "parser"]
-, "version" :         "0.2.18"
+, "version" :         "0.2.22"
 , "author" :          "Christian Amor Kvalheim <christkv@gmail.com>"
 , "contributors" :  []
 
@@ -10,7 +10,7 @@
 , "bugs" :          { "mail" :  "node-mongodb-native@googlegroups.com"
                     , "url" :   "https://github.com/mongodb/js-bson/issues" }
 , "dependencies": {
-    "nan": "1.5.1"
+    "nan": "~1.8"
   }
 , "devDependencies": {
       "nodeunit": "0.9.0"

package/testcases.js

@@ -1,64 +0,0 @@
-var mongodb = require('./').pure(),
-  Code = mongodb.Code,
-  Binary = mongodb.Binary,
-  Timestamp = mongodb.Timestamp,
-  Long = mongodb.Long,
-  MongoReply = mongodb.MongoReply,
-  ObjectID = mongodb.ObjectID,
-  ObjectId = mongodb.ObjectId,
-  Symbol = mongodb.Symbol,
-  DBRef = mongodb.DBRef,
-  Double = mongodb.Double,
-  MinKey = mongodb.MinKey,
-  MaxKey = mongodb.MaxKey;
-
-
-var BSONSE = mongodb,
-  BSONDE = mongodb;
-
-// Create serializer
-var bson = new BSONSE.BSON([Long, ObjectID, Binary, Code, DBRef, Symbol, Double, Timestamp, MaxKey, MinKey]);
-
-// Serialize and print
-var serializeAndPrint = function(m, object) {
-  var buffer = bson.serialize(object, false, true);
-  console.log(m)
-  process.stdout.write("[]byte{");
-
-  for(var i = 0; i < buffer.length; i++) {
-    if(i < buffer.length - 1) {
-      process.stdout.write("" + buffer[i] + ",");
-    } else {
-      process.stdout.write("" + buffer[i]);
-    }
-  }
-
-  process.stdout.write("}\n")
-}
-
-var d = new Date();
-d.setTime(100000)
-
-serializeAndPrint('empty document', {});
-serializeAndPrint('simple int32', {int:10});
-serializeAndPrint('simple string', {string: "hello world"});
-serializeAndPrint('simple string and int', {string: "hello world", int: 10});
-serializeAndPrint('nested document', {string: "hello world", doc: {int: 10}});
-serializeAndPrint('simple array', {array: ["a", "b"]});
-serializeAndPrint('simple binary', {bin: new Binary(new Buffer("hello world"))});
-serializeAndPrint('mixed document', {array: [new Binary(new Buffer("hello world")), {a:1}]});
-serializeAndPrint('object id', {id: new ObjectID("123456781234")});
-serializeAndPrint('javascript with no scope', {js: new Code("var a = function(){}")});
-serializeAndPrint('javascript with scope', {js: new Code("var a = function(){}", {a:1})});
-serializeAndPrint('min and max', {min: new MinKey(), max: new MaxKey()});
-serializeAndPrint('date', {one: d, two: d});
-serializeAndPrint('buffer', {b: new Buffer("hello world")});
-serializeAndPrint('timestamp', {t: Timestamp.fromNumber(100000)});
-serializeAndPrint('long values', {o: Long.fromNumber(-1), t: Long.fromNumber(100000)});
-serializeAndPrint('float64 values', {o: 3.14});
-serializeAndPrint('float32 values', {o: -1.4});
-serializeAndPrint('boolean values', {o: true, t: false});
-serializeAndPrint('null values', {o: null});
-serializeAndPrint('regexp', {o: /[test]/i});
-
-