[Pkg-javascript-commits] [node-leveldown] 12/492: gyp simplify

[Andrew Kelley]

This is an automated email from the git hooks/post-receive script.

andrewrk-guest pushed a commit to annotated tag rocksdb-0.10.1
in repository node-leveldown.

commit 657e8825653acd171dcb7422cda6fdc6f768aa0b
Author: Rod Vagg <rod at vagg.org>
Date:   Tue Aug 14 09:44:38 2012 +1000

    gyp simplify
---
 binding.gyp              |  3 ---
 deps/leveldb/leveldb.gyp | 26 ++------------------------
 deps/snappy/snappy.gyp   |  4 ++--
 3 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/binding.gyp b/binding.gyp
index 35c6fc9..f45d89f 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -13,8 +13,5 @@
           , "src/iterator_async.cc"
           , "src/levelup.cc"
         ]
-      , "include_dirs": [
-            "<(module_root_dir)/deps/leveldb/include/"
-        ]
     }]
 }
\ No newline at end of file
diff --git a/deps/leveldb/leveldb.gyp b/deps/leveldb/leveldb.gyp
index 0751db3..eabe01d 100644
--- a/deps/leveldb/leveldb.gyp
+++ b/deps/leveldb/leveldb.gyp
@@ -1,11 +1,10 @@
+# Originally taken from the Chromium source leveldatabase.gyp, adapted & simplified for node-levelup
+
 # Copyright (c) 2011 The LevelDB Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file. See the AUTHORS file for names of contributors.
 
 {
-  'variables': {
-    'Xuse_snappy%': 0,
-  },
   'target_defaults': {
     'defines': [
       'LEVELDB_PLATFORM_POSIX=1',
@@ -14,7 +13,6 @@
     'include_dirs': [
       'leveldb-1.5.0/',
       'leveldb-1.5.0/include/',
-      'leveldb-1.5.0/port/',
     ],
     'conditions': [
       ['OS == "win"', {
@@ -22,11 +20,6 @@
           'leveldb-1.5.0/port/win',
         ],
       }],
-      ['Xuse_snappy', {
-        'Xdefines': [
-          'USE_SNAPPY=1',
-        ],
-      }],
     ],
   },
   'targets': [
@@ -36,16 +29,8 @@
       'dependencies': [
         "../snappy/snappy.gyp:snappy",
       ],
-      'conditions': [
-        ['Xuse_snappy', {
-          'XXdependencies': [
-            '../../third_party/snappy/snappy.gyp:snappy',
-          ],
-        }],
-      ],
       'direct_dependent_settings': {
         'include_dirs': [
-          'leveldb-1.5.0/port/',
           'leveldb-1.5.0/include/',
           'leveldb-1.5.0/',
         ],
@@ -57,13 +42,6 @@
           }],
         ],
       },
-      # Patch posted for upstream, can be removed once that's landed and
-      # rolled into Chromium.
-      # Internal link: https://mondrian.corp.google.com/#review/29997992
-      'msvs_disabled_warnings': [
-        # Signed/unsigned comparison.
-        4018,
-      ],
       'sources': [
         'leveldb-1.5.0/db/builder.cc',
         'leveldb-1.5.0/db/builder.h',
diff --git a/deps/snappy/snappy.gyp b/deps/snappy/snappy.gyp
index 0b3a3c6..8f30ab7 100644
--- a/deps/snappy/snappy.gyp
+++ b/deps/snappy/snappy.gyp
@@ -1,3 +1,5 @@
+# Originally taken from the Chromium source snappy.gyp, adapted & simplified for node-levelup
+
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
@@ -11,7 +13,6 @@
       ['OS=="mac"', {'os_include': 'mac'}],
       ['OS=="win"', {'os_include': 'win32'}],
     ],
-    'use_system_libxml%': 0,
   },
   'targets': [
     {
@@ -20,7 +21,6 @@
       'include_dirs': [
         '<(os_include)',
         'snappy-1.0.5',
-        '../..',
       ],
       'direct_dependent_settings': {
         'include_dirs': [

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-leveldown.git