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

…1616
JuliaLang · Nov 28, 2012 · a6e75e3 · a6e75e3
1 parent 3e0bc4c
commit a6e75e3
Show file tree

Hide file tree

Showing 8 changed files with 170 additions and 70 deletions.
diff --git a/deps/Makefile b/deps/Makefile
@@ -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 ##

diff --git a/deps/libuv b/deps/libuv
diff --git a/deps/lighttpd.conf b/deps/lighttpd.conf
@@ -1,4 +1,4 @@
-server.document-root = "../share/julia/website"
+server.document-root = "../../ui/website"
 
 server.port = 2000
 

diff --git a/src/Makefile b/src/Makefile
@@ -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 =

diff --git a/ui/webserver/Makefile b/ui/webserver/Makefile
@@ -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

diff --git a/ui/webserver/server.cpp b/ui/webserver/server.cpp
@@ -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);
 

diff --git a/ui/webserver/server.h b/ui/webserver/server.h
@@ -5,7 +5,8 @@
 #include <string>
 #include <vector>
 #include <sstream>
-//#define DEBUG_TRACE
+//#define JULIA_DEBUG_TRACE
+//#define CPP_DEBUG_TRACE
 
 namespace scgi
 {