Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added support for "node-gyp" build #61

Merged
merged 36 commits into from
Apr 23, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
8aec7ad
add ability to configure against boost threads if requested
Nov 6, 2011
9ee3c90
add a threading compatibility shim - likely cleaner ways of doing thi…
Nov 6, 2011
357f57b
enable usage of boost threads instead of direct posix/pthreads usage …
Nov 6, 2011
1e57acc
be explicit about headers
Nov 6, 2011
0e4d62f
handle up front error in affected.test.js
Nov 7, 2011
501caf0
Revert change to affected.test.js
Nov 7, 2011
50c1d42
fix configure
Nov 7, 2011
8d7eb6e
Merge branch 'cross-platform-threading' into windows
kkaefer Nov 8, 2011
963295e
remove trailing whitespace
kkaefer Nov 8, 2011
3fb599b
use win32 mutexes
kkaefer Nov 8, 2011
ad6cda0
actually define type
kkaefer Nov 8, 2011
fed5417
add visual studio projects
kkaefer Nov 8, 2011
e7c3afb
some tweaks for windows support
kkaefer Nov 19, 2011
78f2eec
add paths to gitignore and sample propsheet
kkaefer Nov 19, 2011
e6b1f79
add gyp files for building without messing with visual studio UI
Jan 6, 2012
55f7cfb
fully clear out stale builds
Jan 24, 2012
9b7b922
Add "expresso" to devDependencies.
TooTallNate Feb 13, 2012
7ef826c
Consistent spacing in the package.json.
TooTallNate Feb 13, 2012
82f63cb
Prepare the bindings.gyp file.
TooTallNate Feb 13, 2012
2556985
A useful .gitignore file.
TooTallNate Feb 13, 2012
b70da5d
Remove compiled Visual Studio stuff. This shouldn't get comitted.
TooTallNate Feb 13, 2012
0a0b316
node-gyp in the ./configure and Makefile.
TooTallNate Feb 13, 2012
c062c58
Add unarchived sqlite3 bundled dependency.
TooTallNate Feb 13, 2012
8a4e67d
Remove the tarball.
TooTallNate Feb 13, 2012
2b91175
Use node-bindings.
TooTallNate Feb 13, 2012
eeda206
Add a minimally working gyp file to build sqlite3 as a static lib.
TooTallNate Feb 13, 2012
5c5ab6c
Ignore test/support/big.db.
TooTallNate Feb 13, 2012
2faf80d
Add the 'shell' executable as a target to the sqlite3 gyp file.
TooTallNate Feb 13, 2012
812c5d3
Add some defines from the autoconf configuration.
TooTallNate Feb 13, 2012
eb4e5a3
Syntax highlighting in the README.
TooTallNate Feb 13, 2012
f82a33f
Remove the wscript file.
TooTallNate Mar 7, 2012
abdf5da
bindings.gyp -> binding.gyp
TooTallNate Mar 7, 2012
53c90a8
Revert "Use node-bindings."
TooTallNate Mar 7, 2012
229d62f
Fix bindings require path.
TooTallNate Mar 7, 2012
77176d6
Revert "Remove the wscript file."
TooTallNate Mar 26, 2012
427fd32
package.json: support node >= 0.6.0
TooTallNate Mar 26, 2012
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
.DS_Store
.lock-wscript
build/
TODO
wiki
lib/sqlite3_bindings.node
deps/sqlite-autoconf-3070800
*.dylib
*.so
*.o
*.lo
*.Makefile
*.target.gyp.mk
build
out
Release
Debug
node_modules
.deps
Makefile.gyp
gyp-mac-tool
.dirstamp
npm-debug.log
test/support/big.db
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

build:
node-waf build
node-gyp build

clean:
node-waf clean
node-gyp clean

db:
@if ! [ -f test/support/big.db ]; then \
@if ! [ -f test/support/big.db ]; then \
echo "Creating test database... This may take several minutes." ; \
node test/support/createdb.js ; \
fi
Expand All @@ -21,4 +21,4 @@ test: build db
@expresso -I lib test/${only}.test.js
endif

.PHONY: build clean test
.PHONY: build clean test
38 changes: 20 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,26 @@ node-sqlite3 - Asynchronous, non-blocking [SQLite3](http://sqlite.org/) bindings

Install with `npm install sqlite3`.

var sqlite3 = require('sqlite3').verbose();
var db = new sqlite3.Database(':memory:');

db.serialize(function() {
db.run("CREATE TABLE lorem (info TEXT)");

var stmt = db.prepare("INSERT INTO lorem VALUES (?)");
for (var i = 0; i < 10; i++) {
stmt.run("Ipsum " + i);
}
stmt.finalize();

db.each("SELECT rowid AS id, info FROM lorem", function(err, row) {
console.log(row.id + ": " + row.info);
});
});

db.close();
``` js
var sqlite3 = require('sqlite3').verbose();
var db = new sqlite3.Database(':memory:');

db.serialize(function() {
db.run("CREATE TABLE lorem (info TEXT)");

var stmt = db.prepare("INSERT INTO lorem VALUES (?)");
for (var i = 0; i < 10; i++) {
stmt.run("Ipsum " + i);
}
stmt.finalize();

db.each("SELECT rowid AS id, info FROM lorem", function(err, row) {
console.log(row.id + ": " + row.info);
});
});

db.close();
```



Expand Down
15 changes: 15 additions & 0 deletions binding.gyp
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
'targets': [
{
'target_name': 'node_sqlite3',
'sources': [
'src/database.cc',
'src/node_sqlite3.cc',
'src/statement.cc'
],
'dependencies': [
'deps/sqlite3/sqlite3.gyp:sqlite3'
]
}
]
}
2 changes: 1 addition & 1 deletion configure
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/sh

node-waf configure $@
node-gyp configure $@
Binary file removed deps/sqlite-autoconf-3070800.tar.gz
Binary file not shown.
236 changes: 236 additions & 0 deletions deps/sqlite3/INSTALL
Original file line number Diff line number Diff line change
@@ -0,0 +1,236 @@
Installation Instructions
*************************

Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
Software Foundation, Inc.

This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.

Basic Installation
==================

These are generic installation instructions.

The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
you can run in the future to recreate the current configuration, and a
file `config.log' containing compiler output (useful mainly for
debugging `configure').

It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
the results of its tests to speed up reconfiguring. (Caching is
disabled by default to prevent problems with accidental use of stale
cache files.)

If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If you are using the cache, and at
some point `config.cache' contains results you don't want to keep, you
may remove or edit it.

The file `configure.ac' (or `configure.in') is used to create
`configure' by a program called `autoconf'. You only need
`configure.ac' if you want to change it or regenerate `configure' using
a newer version of `autoconf'.

The simplest way to compile this package is:

1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system. If you're
using `csh' on an old version of System V, you might need to type
`sh ./configure' instead to prevent `csh' from trying to execute
`configure' itself.

Running `configure' takes awhile. While running, it prints some
messages telling which features it is checking for.

2. Type `make' to compile the package.

3. Optionally, type `make check' to run any self-tests that come with
the package.

4. Type `make install' to install the programs and any data files and
documentation.

5. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
also a `make maintainer-clean' target, but that is intended mainly
for the package's developers. If you use it, you may have to get
all sorts of other programs in order to regenerate files that came
with the distribution.

Compilers and Options
=====================

Some systems require unusual options for compilation or linking that the
`configure' script does not know about. Run `./configure --help' for
details on some of the pertinent environment variables.

You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:

./configure CC=c89 CFLAGS=-O2 LIBS=-lposix

*Note Defining Variables::, for more details.

Compiling For Multiple Architectures
====================================

You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you must use a version of `make' that
supports the `VPATH' variable, such as GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.

If you have to use a `make' that does not support the `VPATH'
variable, you have to compile the package for one architecture at a
time in the source code directory. After you have installed the
package for one architecture, use `make distclean' before reconfiguring
for another architecture.

Installation Names
==================

By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.

You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
pass the option `--exec-prefix=PREFIX' to `configure', the package uses
PREFIX as the prefix for installing programs and libraries.
Documentation and other data files still use the regular prefix.

In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.

If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.

Optional Features
=================

Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
`README' should mention any `--enable-' and `--with-' options that the
package recognizes.

For packages that use the X Window System, `configure' can usually
find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.

Specifying the System Type
==========================

There may be some features `configure' cannot figure out automatically,
but needs to determine by the type of machine the package will run on.
Usually, assuming the package is built to be run on the _same_
architectures, `configure' can figure that out, but if it prints a
message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:

CPU-COMPANY-SYSTEM

where SYSTEM can have one of these forms:

OS KERNEL-OS

See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
need to know the machine type.

If you are _building_ compiler tools for cross-compiling, you should
use the option `--target=TYPE' to select the type of system they will
produce code for.

If you want to _use_ a cross compiler, that generates code for a
platform different from the build platform, you should specify the
"host" platform (i.e., that on which the generated programs will
eventually be run) with `--host=TYPE'.

Sharing Defaults
================

If you want to set default values for `configure' scripts to share, you
can create a site shell script called `config.site' that gives default
values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
A warning: not all `configure' scripts look for a site script.

Defining Variables
==================

Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
them in the `configure' command line, using `VAR=value'. For example:

./configure CC=/usr/local2/bin/gcc

causes the specified `gcc' to be used as the C compiler (unless it is
overridden in the site shell script). Here is a another example:

/bin/bash ./configure CONFIG_SHELL=/bin/bash

Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
configuration-related scripts to be executed by `/bin/bash'.

`configure' Invocation
======================

`configure' recognizes the following options to control how it operates.

`--help'
`-h'
Print a summary of the options to `configure', and exit.

`--version'
`-V'
Print the version of Autoconf used to generate the `configure'
script, and exit.

`--cache-file=FILE'
Enable the cache: use and save the results of the tests in FILE,
traditionally `config.cache'. FILE defaults to `/dev/null' to
disable caching.

`--config-cache'
`-C'
Alias for `--cache-file=config.cache'.

`--quiet'
`--silent'
`-q'
Do not print messages saying which checks are being made. To
suppress all normal output, redirect it to `/dev/null' (any error
messages will still be shown).

`--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.

`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.

19 changes: 19 additions & 0 deletions deps/sqlite3/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@

AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE

lib_LTLIBRARIES = libsqlite3.la
libsqlite3_la_SOURCES = sqlite3.c
libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8

bin_PROGRAMS = sqlite3
sqlite3_SOURCES = shell.c sqlite3.h
sqlite3_LDADD = $(top_builddir)/libsqlite3.la @READLINE_LIBS@
sqlite3_DEPENDENCIES = $(top_builddir)/libsqlite3.la

include_HEADERS = sqlite3.h sqlite3ext.h

EXTRA_DIST = sqlite3.pc sqlite3.1 tea
pkgconfigdir = ${libdir}/pkgconfig
pkgconfig_DATA = sqlite3.pc

man_MANS = sqlite3.1
Loading