Skip to content

Commit bdf3391

Browse files
author
Dane Springmeyer
committed
another try at fixing build order based on details at https://code.google.com/p/gyp/issues/detail?id=259
1 parent cf19057 commit bdf3391

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

binding.gyp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
},
2828
{
2929
'dependencies': [
30-
'deps/sqlite3.gyp:action_before_build',
3130
'deps/sqlite3.gyp:sqlite3'
3231
]
3332
}

deps/extract.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import os
44

55
tarball = os.path.abspath(sys.argv[1])
6-
dirname = os.path.dirname(tarball)
6+
dirname = os.path.abspath(sys.argv[2])
77
tfile = tarfile.open(tarball,'r:gz');
88
tfile.extractall(dirname)
99
sys.exit(0)

deps/sqlite3.gyp

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
{
22
'includes': [ 'common-sqlite.gypi' ],
3-
'conditions': [
4-
['OS=="win"', {
5-
'variables': {
6-
'bin_name':'call'
7-
},
8-
},{
9-
'variables': {
10-
'bin_name':'node'
11-
},
12-
}]
13-
],
143
'target_defaults': {
154
'default_configuration': 'Debug',
165
'configurations': {
@@ -61,17 +50,27 @@
6150
'./sqlite-autoconf-<@(sqlite_version).tar.gz'
6251
],
6352
'outputs': [
64-
'./sqlite-autoconf-<@(sqlite_version)/sqlite3.c'
53+
'<(SHARED_INTERMEDIATE_DIR)/sqlite-autoconf-<@(sqlite_version)/sqlite3.c'
6554
],
66-
'action': ['python','./extract.py','./sqlite-autoconf-<@(sqlite_version).tar.gz']
55+
'action': ['python','./extract.py','./sqlite-autoconf-<@(sqlite_version).tar.gz','<(SHARED_INTERMEDIATE_DIR)']
6756
}
68-
]
57+
],
58+
'direct_dependent_settings': {
59+
'include_dirs': [
60+
'<(SHARED_INTERMEDIATE_DIR)',
61+
],
62+
'sources': [
63+
'<(SHARED_INTERMEDIATE_DIR)/sqlite-autoconf-<@(sqlite_version)/sqlite3.c'
64+
]
65+
},
6966
},
7067
{
7168
'target_name': 'sqlite3',
7269
'type': 'static_library',
73-
'hard_dependency': 1,
7470
'include_dirs': [ './sqlite-autoconf-<@(sqlite_version)/' ],
71+
'dependencies': [
72+
'action_before_build'
73+
],
7574
'direct_dependent_settings': {
7675
'include_dirs': [ './sqlite-autoconf-<@(sqlite_version)/' ],
7776
'defines': [
@@ -86,7 +85,9 @@
8685
'SQLITE_ENABLE_FTS3',
8786
'SQLITE_ENABLE_RTREE'
8887
],
89-
'sources': [ './sqlite-autoconf-<@(sqlite_version)/sqlite3.c' ],
88+
'export_dependent_settings': [
89+
'action_before_build',
90+
]
9091
}
9192
]
9293
}

0 commit comments

Comments
 (0)