Commit bdf3391b by Dane Springmeyer

another try at fixing build order based on details at…

another try at fixing  build order based on details at https://code.google.com/p/gyp/issues/detail?id=259
parent cf190570
......@@ -27,7 +27,6 @@
},
{
'dependencies': [
'deps/sqlite3.gyp:action_before_build',
'deps/sqlite3.gyp:sqlite3'
]
}
......
......@@ -3,7 +3,7 @@ import tarfile
import os
tarball = os.path.abspath(sys.argv[1])
dirname = os.path.dirname(tarball)
dirname = os.path.abspath(sys.argv[2])
tfile = tarfile.open(tarball,'r:gz');
tfile.extractall(dirname)
sys.exit(0)
{
'includes': [ 'common-sqlite.gypi' ],
'conditions': [
['OS=="win"', {
'variables': {
'bin_name':'call'
},
},{
'variables': {
'bin_name':'node'
},
}]
],
'target_defaults': {
'default_configuration': 'Debug',
'configurations': {
......@@ -61,17 +50,27 @@
'./sqlite-autoconf-<@(sqlite_version).tar.gz'
],
'outputs': [
'./sqlite-autoconf-<@(sqlite_version)/sqlite3.c'
'<(SHARED_INTERMEDIATE_DIR)/sqlite-autoconf-<@(sqlite_version)/sqlite3.c'
],
'action': ['python','./extract.py','./sqlite-autoconf-<@(sqlite_version).tar.gz']
'action': ['python','./extract.py','./sqlite-autoconf-<@(sqlite_version).tar.gz','<(SHARED_INTERMEDIATE_DIR)']
}
],
'direct_dependent_settings': {
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)',
],
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/sqlite-autoconf-<@(sqlite_version)/sqlite3.c'
]
},
},
{
'target_name': 'sqlite3',
'type': 'static_library',
'hard_dependency': 1,
'include_dirs': [ './sqlite-autoconf-<@(sqlite_version)/' ],
'dependencies': [
'action_before_build'
],
'direct_dependent_settings': {
'include_dirs': [ './sqlite-autoconf-<@(sqlite_version)/' ],
'defines': [
......@@ -86,7 +85,9 @@
'SQLITE_ENABLE_FTS3',
'SQLITE_ENABLE_RTREE'
],
'sources': [ './sqlite-autoconf-<@(sqlite_version)/sqlite3.c' ],
'export_dependent_settings': [
'action_before_build',
]
}
]
}
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