Merge remote-tracking branch 'origin/v0.10'
This commit is contained in:
Ben Noordhuis
commit
73524cdd3a
23
.mailmap
23
.mailmap
@ -1,13 +1,16 @@
|
||||
# update AUTHORS with:
|
||||
# git log --all --reverse --format='%aN <%aE>' | perl -ne 'BEGIN{print "# Authors ordered by first contribution.\n"} print unless $h{$_}; $h{$_} = 1' > AUTHORS
|
||||
<rm@joyent.com> <rm@fingolfin.org>
|
||||
<ryan@joyent.com> <ry@tinyclouds.org>
|
||||
<bertbelder@gmail.com> <info@2bs.nl>
|
||||
<alan@prettyrobots.com> <alan@blogometer.com>
|
||||
San-Tai Hsu <vanilla@fatpipi.com>
|
||||
Isaac Z. Schlueter <i@izs.me>
|
||||
Saúl Ibarra Corretgé <saghul@gmail.com>
|
||||
Yuki OKUMURA <mjt@cltn.org>
|
||||
Alan Gutierrez <alan@prettyrobots.com> <alan@blogometer.com>
|
||||
Bert Belder <bertbelder@gmail.com> <info@2bs.nl>
|
||||
Bert Belder <bertbelder@gmail.com> <user@ChrUbuntu.(none)>
|
||||
Brandon Philips <brandon.philips@rackspace.com> <brandon@ifup.org>
|
||||
Brian White <mscdex@mscdex.net> <mscdex@gmail.com>
|
||||
Frank Denis <github@pureftpd.org>
|
||||
Isaac Z. Schlueter <i@izs.me>
|
||||
Robert Mustacchi <rm@joyent.com> <rm@fingolfin.org>
|
||||
Ryan Dahl <ryan@joyent.com> <ry@tinyclouds.org>
|
||||
Ryan Emery <seebees@gmail.com>
|
||||
San-Tai Hsu <vanilla@fatpipi.com>
|
||||
Saúl Ibarra Corretgé <saghul@gmail.com>
|
||||
Shigeki Ohtsu <ohtsu@iij.ad.jp> <ohtsu@ohtsu.org>
|
||||
Timothy J. Fontaine <tjfontaine@gmail.com>
|
||||
Yasuhiro Matsumoto <mattn.jp@gmail.com>
|
||||
Yuki Okumura <mjt@cltn.org>
|
||||
|
||||
26
AUTHORS
26
AUTHORS
@ -28,7 +28,7 @@ Marek Jelen <marek@jelen.biz>
|
||||
Fedor Indutny <fedor.indutny@gmail.com>
|
||||
Saúl Ibarra Corretgé <saghul@gmail.com>
|
||||
Felix Geisendörfer <felix@debuggable.com>
|
||||
Yuki OKUMURA <mjt@cltn.org>
|
||||
Yuki Okumura <mjt@cltn.org>
|
||||
Roman Shtylman <shtylman@gmail.com>
|
||||
Frank Denis <github@pureftpd.org>
|
||||
Carter Allen <CarterA@opt-6.com>
|
||||
@ -44,7 +44,6 @@ Dan VerWeire <dverweire@gmail.com>
|
||||
Brandon Benvie <brandon@bbenvie.com>
|
||||
Brandon Philips <brandon.philips@rackspace.com>
|
||||
Nathan Rajlich <nathan@tootallnate.net>
|
||||
Brandon Philips <brandon@ifup.org>
|
||||
Charlie McConnell <charlie@charlieistheman.com>
|
||||
Vladimir Dronnikov <dronnikov@gmail.com>
|
||||
Aaron Bieber <qbit@deftly.net>
|
||||
@ -54,8 +53,29 @@ Erik Dubbelboer <erik@dubbelboer.com>
|
||||
Keno Fischer <kenof@stanford.edu>
|
||||
Ira Cooper <Ira.Cooper@mathworks.com>
|
||||
Andrius Bentkus <andrius.bentkus@gmail.com>
|
||||
Brian White <mscdex@gmail.com>
|
||||
Iñaki Baz Castillo <ibc@aliax.net>
|
||||
Mark Cavage <mark.cavage@joyent.com>
|
||||
George Yohng <georgegh@oss3d.com>
|
||||
Xidorn Quan <quanxunzhen@gmail.com>
|
||||
Roman Neuhauser <rneuhauser@suse.cz>
|
||||
Shuhei Tanuma <shuhei.tanuma@gmail.com>
|
||||
Bryan Cantrill <bcantrill@acm.org>
|
||||
Trond Norbye <trond.norbye@gmail.com>
|
||||
Tim Holy <holy@wustl.edu>
|
||||
Prancesco Pertugio <meh@schizofreni.co>
|
||||
Leonard Hecker <leonard.hecker91@gmail.com>
|
||||
Andrew Paprocki <andrew@ishiboo.com>
|
||||
Luigi Grilli <luigi.grilli@gmail.com>
|
||||
Shannen Saez <shannenlaptop@gmail.com>
|
||||
Artur Adib <arturadib@gmail.com>
|
||||
Hiroaki Nakamura <hnakamur@gmail.com>
|
||||
Ting-Yu Lin <ph.minamo@cytisan.com>
|
||||
Stephen Gallagher <sgallagh@redhat.com>
|
||||
Shane Holloway <shane.holloway@ieee.org>
|
||||
Andrew Shaffer <darawk@gmail.com>
|
||||
Vlad Tudose <vlad.tudose@intel.com>
|
||||
Ben Leslie <benno@benno.id.au>
|
||||
Tim Bradshaw <tfb@cley.com>
|
||||
Timothy J. Fontaine <tjfontaine@gmail.com>
|
||||
Marc Schlaich <marc.schlaich@googlemail.com>
|
||||
Brian Mazza <louseman@gmail.com>
|
||||
|
||||
28
ChangeLog
Normal file
28
ChangeLog
Normal file
@ -0,0 +1,28 @@
|
||||
2013.03.25, Version 0.10.2 (Stable)
|
||||
|
||||
This is the first officially versioned release of libuv. Starting now
|
||||
libuv will make releases independently of Node.js.
|
||||
|
||||
Changes since Node.js v0.10.0:
|
||||
|
||||
* test: add tap output for windows (Timothy J. Fontaine)
|
||||
|
||||
* unix: fix uv_tcp_simultaneous_accepts() logic (Ben Noordhuis)
|
||||
|
||||
* include: bump UV_VERSION_MINOR (Ben Noordhuis)
|
||||
|
||||
* unix: improve uv_guess_handle() implementation (Ben Noordhuis)
|
||||
|
||||
* stream: run try_select only for pipes and ttys (Fedor Indutny)
|
||||
|
||||
Changes since Node.js v0.10.1:
|
||||
|
||||
* build: rename OS to PLATFORM (Ben Noordhuis)
|
||||
|
||||
* unix: make uv_timer_init() initialize repeat (Brian Mazza)
|
||||
|
||||
* unix: make timers handle large timeouts (Ben Noordhuis)
|
||||
|
||||
* build: add OBJC makefile var (Ben Noordhuis)
|
||||
|
||||
* Add `uv_version()` and `uv_version_string()` APIs (Bert Belder)
|
||||
@ -64,7 +64,7 @@ To build via Makefile simply execute:
|
||||
|
||||
MinGW users should run this instead:
|
||||
|
||||
make OS=mingw
|
||||
make PLATFORM=mingw
|
||||
|
||||
Out-of-tree builds are supported:
|
||||
|
||||
|
||||
@ -35,7 +35,7 @@ RUNNER_LDFLAGS=$(LDFLAGS)
|
||||
RUNNER_LIBS=-lws2_32 -lpsapi -liphlpapi
|
||||
RUNNER_SRC=test/runner-win.c
|
||||
|
||||
libuv.a: $(WIN_OBJS) src/fs-poll.o src/inet.o src/uv-common.o
|
||||
libuv.a: $(WIN_OBJS) src/fs-poll.o src/inet.o src/uv-common.o src/version.o
|
||||
$(AR) rcs $@ $^
|
||||
|
||||
src/%.o: src/%.c include/uv.h include/uv-private/uv-win.h
|
||||
|
||||
@ -18,6 +18,8 @@
|
||||
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
# IN THE SOFTWARE.
|
||||
|
||||
OBJC ?= $(CC)
|
||||
|
||||
E=
|
||||
CSTDFLAG=--std=c89 -pedantic -Wall -Wextra -Wno-unused-parameter
|
||||
CFLAGS += -g
|
||||
@ -53,6 +55,7 @@ OBJS += src/unix/udp.o
|
||||
OBJS += src/fs-poll.o
|
||||
OBJS += src/uv-common.o
|
||||
OBJS += src/inet.o
|
||||
OBJS += src/version.o
|
||||
|
||||
ifeq (sunos,$(PLATFORM))
|
||||
CPPFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=500
|
||||
@ -145,7 +148,7 @@ include/uv-private/uv-unix.h: \
|
||||
src/unix/internal.h: src/unix/linux-syscalls.h
|
||||
|
||||
src/.buildstamp src/unix/.buildstamp test/.buildstamp:
|
||||
mkdir -p $(dir $@)
|
||||
mkdir -p $(@D)
|
||||
touch $@
|
||||
|
||||
src/unix/%.o src/unix/%.pic.o: src/unix/%.c include/uv.h include/uv-private/uv-unix.h src/unix/internal.h src/unix/.buildstamp
|
||||
@ -161,4 +164,4 @@ clean-platform:
|
||||
$(RM) test/run-{tests,benchmarks}.dSYM $(OBJS) $(OBJS:%.o=%.pic.o)
|
||||
|
||||
%.pic.o %.o: %.m
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) -c $^ -o $@
|
||||
$(OBJC) $(CPPFLAGS) $(CFLAGS) -c $^ -o $@
|
||||
|
||||
14
include/uv.h
14
include/uv.h
@ -228,6 +228,20 @@ typedef enum {
|
||||
} uv_run_mode;
|
||||
|
||||
|
||||
/*
|
||||
* Returns the libuv version packed into a single integer. 8 bits are used for
|
||||
* each component, with the patch number stored in the 8 least significant
|
||||
* bits. E.g. for libuv 1.2.3 this would return 0x010203.
|
||||
*/
|
||||
UV_EXTERN unsigned int uv_version(void);
|
||||
|
||||
/*
|
||||
* Returns the libuv version number as a string. For non-release versions
|
||||
* "-pre" is appended, so the version number could be "1.2.3-pre".
|
||||
*/
|
||||
UV_EXTERN const char* uv_version_string(void);
|
||||
|
||||
|
||||
/*
|
||||
* This function must be called before any other functions in libuv.
|
||||
*
|
||||
|
||||
60
src/version.c
Normal file
60
src/version.c
Normal file
@ -0,0 +1,60 @@
|
||||
/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to
|
||||
* deal in the Software without restriction, including without limitation the
|
||||
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
||||
* sell copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
* IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
* Versions with an even minor version (e.g. 0.6.1 or 1.0.4) are API and ABI
|
||||
* stable. When the minor version is odd, the API can change between patch
|
||||
* releases.
|
||||
*/
|
||||
|
||||
#define UV_VERSION_MAJOR 0
|
||||
#define UV_VERSION_MINOR 10
|
||||
#define UV_VERSION_PATCH 3
|
||||
#define UV_VERSION_IS_RELEASE 0
|
||||
|
||||
|
||||
#define UV_VERSION ((UV_VERSION_MAJOR << 16) | \
|
||||
(UV_VERSION_MINOR << 8) | \
|
||||
(UV_VERSION_PATCH))
|
||||
|
||||
#define UV_STRINGIFY(v) UV_STRINGIFY_HELPER(v)
|
||||
#define UV_STRINGIFY_HELPER(v) #v
|
||||
|
||||
#define UV_VERSION_STRING_BASE UV_STRINGIFY(UV_VERSION_MAJOR) "." \
|
||||
UV_STRINGIFY(UV_VERSION_MINOR) "." \
|
||||
UV_STRINGIFY(UV_VERSION_PATCH)
|
||||
|
||||
#if UV_VERSION_IS_RELEASE
|
||||
# define UV_VERSION_STRING UV_VERSION_STRING_BASE
|
||||
#else
|
||||
# define UV_VERSION_STRING UV_VERSION_STRING_BASE "-pre"
|
||||
#endif
|
||||
|
||||
|
||||
unsigned int uv_version(void) {
|
||||
return UV_VERSION;
|
||||
}
|
||||
|
||||
|
||||
const char* uv_version_string(void) {
|
||||
return UV_VERSION_STRING;
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user