Permalink
Browse files

update libuv, update webserver (copied from libuv branch), and close #…

  • Loading branch information...
1 parent 3e0bc4c commit a6e75e3bfec32a989407587581cfe737d06d0191 @vtjnash vtjnash committed Nov 28, 2012
Showing with 170 additions and 70 deletions.
  1. +7 −4 deps/Makefile
  2. +1 −1 deps/libuv
  3. +1 −1 deps/lighttpd.conf
  4. +1 −1 src/Makefile
  5. +1 −1 ui/webserver/Makefile
  6. +1 −1 ui/webserver/server.cpp
  7. +2 −1 ui/webserver/server.h
  8. +156 −60 ui/webserver/webserver.cpp
View
@@ -267,13 +267,16 @@ endif
## LIBUV
-UV_OBJ_TARGET = $(USR)/lib/uv.a
-UV_OBJ_SOURCE = libuv/uv.a
+UV_OBJ_TARGET = $(USR)/lib/libuv.a
+UV_OBJ_SOURCE = libuv/libuv.a
libuv/Makefile:
(cd .. && git submodule init && git submodule update)
$(UV_OBJ_SOURCE): libuv/Makefile
- $(MAKE) -C libuv CC="$(CC)"
+ifneq ($(OS), WINNT)
+ $(MAKE) libuv.${SHLIB_EXT} -C libuv CC="$(CC)"
+endif
+ $(MAKE) libuv.a -C libuv CC="$(CC)"
$(UV_OBJ_TARGET): $(UV_OBJ_SOURCE)
mkdir -p $(USR)/include
cp $(UV_OBJ_SOURCE) $(USR)/lib/
@@ -282,7 +285,7 @@ install-uv: $(UV_OBJ_TARGET)
clean-uv:
$(MAKE) -C libuv clean
- rm -f $(USR)/lib/uv.a $(USR)/include/uv.h
+ rm -rf $(USR)/lib/libuv.a $(USR)/include/uv.h $(USR)/include/uv-private
distclean-uv: clean-uv
## PCRE ##
Submodule libuv updated 335 files
View
@@ -1,4 +1,4 @@
-server.document-root = "../share/julia/website"
+server.document-root = "../../ui/website"
server.port = 2000
View
@@ -15,7 +15,7 @@ FLAGS = \
-I$(shell $(LLVM_CONFIG) --includedir) \
-I$(JULIAHOME)/deps/libuv/include -I$(JULIAHOME)/usr/include
-LIBS = $(shell $(LLVM_CONFIG) --libfiles) $(WHOLE_ARCHIVE) $(JULIAHOME)/src/flisp/libflisp.a $(WHOLE_ARCHIVE) $(JULIAHOME)/src/support/libsupport.a -L$(USR)/lib $(USR)/$(JL_LIBDIR)/uv.a $(OSLIBS) -lpthread $(shell $(LLVM_CONFIG) --ldflags)
+LIBS = $(shell $(LLVM_CONFIG) --libfiles) $(WHOLE_ARCHIVE) $(JULIAHOME)/src/flisp/libflisp.a $(WHOLE_ARCHIVE) $(JULIAHOME)/src/support/libsupport.a -L$(USR)/lib $(USR)/$(JL_LIBDIR)/libuv.a $(OSLIBS) -lpthread $(shell $(LLVM_CONFIG) --ldflags)
ifneq ($(MAKECMDGOALS),debug)
TARGET =
View
@@ -4,7 +4,7 @@ include $(JULIAHOME)/Make.inc
override CFLAGS += $(JCFLAGS)
override CXXFLAGS += $(JCXXFLAGS)
-LIBS = -lpthread $(USR)/$(JL_LIBDIR)/uv.a
+LIBS = -lpthread $(USR)/$(JL_LIBDIR)/libuv.a
ifeq ($(OS), Linux)
LIBS += -lrt
endif
View
@@ -209,7 +209,7 @@ namespace scgi
#define PASS_ON(f) stream->read_cb = &f; \
uv_buf_t buf2; \
- buf2.base=pos; \
+ buf2.base=const_cast<char*>(pos); \
buf2.len=buf.len-nread-(pos-buf.base); \
f(stream,nread-(pos-buf.base),buf2);
View
@@ -5,7 +5,8 @@
#include <string>
#include <vector>
#include <sstream>
-//#define DEBUG_TRACE
+//#define JULIA_DEBUG_TRACE
+//#define CPP_DEBUG_TRACE
namespace scgi
{
Oops, something went wrong.

0 comments on commit a6e75e3

Please sign in to comment.