Commit 945df536 by Dane Springmeyer

attempt to solve #153

parent 231b1380
...@@ -7,37 +7,15 @@ ...@@ -7,37 +7,15 @@
['OS=="win"', { ['OS=="win"', {
'variables': { 'variables': {
'copy_command%': 'copy', 'copy_command%': 'copy',
'bin_name':'call'
}, },
},{ },{
'variables': { 'variables': {
'copy_command%': 'cp', 'copy_command%': 'cp',
'bin_name':'node'
}, },
}] }]
], ],
'targets': [ 'targets': [
{ {
'target_name': 'action_before_build',
'type': 'none',
'conditions': [
['sqlite == "internal"', {
'actions': [
{
'action_name': 'unpack_sqlite_dep',
'inputs': [
'./deps/sqlite-autoconf-<@(sqlite_version).tar.gz'
],
'outputs': [
'./deps/sqlite-autoconf-<@(sqlite_version)/sqlite3.c'
],
'action': ['<@(bin_name)','./node_modules/.bin/targz','deps/sqlite-autoconf-<@(sqlite_version).tar.gz','-x','deps/']
}
]
}]
]
},
{
'target_name': 'node_sqlite3', 'target_name': 'node_sqlite3',
'conditions': [ 'conditions': [
['sqlite != "internal"', { ['sqlite != "internal"', {
...@@ -49,7 +27,7 @@ ...@@ -49,7 +27,7 @@
}, },
{ {
'dependencies': [ 'dependencies': [
'action_before_build', 'deps/sqlite3.gyp:action_before_build',
'deps/sqlite3.gyp:sqlite3' 'deps/sqlite3.gyp:sqlite3'
] ]
} }
......
{ {
'includes': [ 'common-sqlite.gypi' ], 'includes': [ 'common-sqlite.gypi' ],
'conditions': [
['OS=="win"', {
'variables': {
'bin_name':'call'
},
},{
'variables': {
'bin_name':'node'
},
}]
],
'target_defaults': { 'target_defaults': {
'default_configuration': 'Debug', 'default_configuration': 'Debug',
'configurations': { 'configurations': {
...@@ -40,8 +51,26 @@ ...@@ -40,8 +51,26 @@
'targets': [ 'targets': [
{ {
'target_name': 'action_before_build',
'type': 'none',
'hard_dependency': 1,
'actions': [
{
'action_name': 'unpack_sqlite_dep',
'inputs': [
'./sqlite-autoconf-<@(sqlite_version).tar.gz'
],
'outputs': [
'./sqlite-autoconf-<@(sqlite_version)/sqlite3.c'
],
'action': ['<@(bin_name)','../node_modules/.bin/targz','./sqlite-autoconf-<@(sqlite_version).tar.gz','-x','./']
}
]
},
{
'target_name': 'sqlite3', 'target_name': 'sqlite3',
'type': 'static_library', 'type': 'static_library',
'hard_dependency': 1,
'include_dirs': [ './sqlite-autoconf-<@(sqlite_version)/' ], 'include_dirs': [ './sqlite-autoconf-<@(sqlite_version)/' ],
'direct_dependent_settings': { 'direct_dependent_settings': {
'include_dirs': [ './sqlite-autoconf-<@(sqlite_version)/' ], 'include_dirs': [ './sqlite-autoconf-<@(sqlite_version)/' ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment