4 files changed, 33 insertions, 58 deletions

diff --git a/README b/README
index c30799c..091ce6f 100644
--- a/README
+++ b/README
@@ -1,38 +1,12 @@
-This directory  contains the implementation  of the protocols  FTP, HTTP
-and SMTP, the URL parsing and composition module and the Concat and Code
-auxiliary modules. The files provided are:
-
-        http.lua                                -- HTTP protocol implementation
-
-The  module   http.lua  provides   general  HTTP  client   support.  The
-implementation conforms to the HTTP/1.1 standard, RFC 2068.
-
-        smtp.lua                                -- SMTP protocol implementation
-        
-The module smtp.lua provides functionality  to send e-mail messages to a
-SMTP mail server. The implementation conforms to RFC 821.
-
-        ftp.lua                                 -- FTP protocol implementation
-
-The module ftp.lua provides functions  to download and upload files from
-and to FTP servers. The implementation conforms to RFC 959.
-
-        url.lua                                 -- URL parsing and composition
-
-The module url.lua provides routines to  split a URL into its components
-and to compose a base URL and relative URL into an absolute URL.
-
-        code.lua                                -- some coding conversion routines
-
-The  code.lua module  provides  base64, hexa  and  escaped encoding  and
-decoding. The module  is used for the HTTP  Basic Authentication Scheme,
-and URL protection, conforming to RFC 2045.
-
-        concat.lua                              -- fast concatenation library
-
-The module concat.lua implements, completely  in Lua, a set of functions
-that greatly improves the performance  of repeated concatenations of Lua
-strings. The algorithm was inventd by Roberto Ierusalimschy.
-
-These  modules are  part of  the  LuaSocket library  and are  supported.
-Please send any comments to diego@tecgraf.puc-rio.br.
+This release is work in progress. It has been tested on WinXP, Mac OS X,
+SunOS and Linux. The most important change is a major rewrite of the C code
+that attempts to make the library extensible. Also, all functions were
+moved to the 'socket' namespace. A few changes are expected for the final
+version, mostly in order to make the API more uniform.
+
+In this version, all Lua code has been built into the binary. For that, you
+will need a working versions of luac and bin2c, both available with your
+Lua distribution. Check makefile for details.
+
+Have fun,
+Diego Nehab.
diff --git a/makefile.dist b/makefile.dist
index 2154eb9..90ef7c2 100644
--- a/makefile.dist
+++ b/makefile.dist
@@ -2,31 +2,32 @@
 # Distribution makefile
 #--------------------------------------------------------------------------
 
-DIST = luasocket-1.4
+DIST = luasocket-1.5-work
 
-SRC = ~diego/tec/luasocket
+LUA = concat.lua code.lua url.lua http.lua smtp.lua ftp.lua lsselect.lua \
+  cl-compat.lua
+
+TESTS = testclnt.lua testsrvr.lua testcmd.lua codetest.lua \
+  urltest.lua concattest.lua
+
+EXAMPLES = check-links.lua daytimeclnt.lua dict.lua echoclnt.lua \
+  echosrvr.lua get.lua listener.lua talker.lua tinyirc.lua tftpclnt.lua
 
 dist:
-        mkdir -p $(DIST)/lua
         mkdir -p $(DIST)/examples
-        mkdir -p $(DIST)/html
-        mkdir -p $(DIST)/test
+        mkdir -p $(DIST)/tests
         cp -vf *.c $(DIST)
         cp -vf *.h $(DIST)
+        cp -vf $(LUA) $(DIST)
         cp -vf makefile $(DIST)
         cp -vf README $(DIST)
-        cp -vf lua/*.lua $(DIST)/lua
-        cp -vf lua/README $(DIST)/lua
-        cp -vf examples/*.lua $(DIST)/examples
-        cp -vf examples/README $(DIST)/examples
-        cp -vf html/*.html $(DIST)/html
-        cp -vf html/*.png $(DIST)/html
-        cp -vf test/testclnt.lua $(DIST)/test
-        cp -vf test/testsrvr.lua $(DIST)/test
-        cp -vf test/testcmd.lua $(DIST)/test
-        cp -vf test/codetest.lua $(DIST)/test
-        cp -vf test/concattest.lua $(DIST)/test
-        cp -vf test/urltest.lua $(DIST)/test
-        cp -vf test/README $(DIST)/test
+        cp -vf $(EXAMPLES) $(DIST)/examples
+        cp -vf README.examples $(DIST)/examples/README
+        cp -vf $(TESTS) $(DIST)/tests
+        cp -vf README.tests $(DIST)/tests/README
         tar -zcvf $(DIST).tar.gz $(DIST)
         zip -r $(DIST).zip $(DIST)
+
+
+clean:
+        \rm -rf $(DIST) $(DIST).tar.gz $(DIST).zip
diff --git a/src/luasocket.c b/src/luasocket.c
index 358b25e..bcc705f 100644
--- a/src/luasocket.c
+++ b/src/luasocket.c
@@ -56,7 +56,7 @@ LUASOCKET_API int lua_socketlibopen(lua_State *L)
     buf_open(L);
     tcps_open(L); 
     udp_open(L);
-#if LUASOCKET_DEBUG
+#ifdef LUASOCKET_DOFILE
     lua_dofile(L, "concat.lua");
     lua_dofile(L, "code.lua");
     lua_dofile(L, "url.lua");
diff --git a/src/select.c b/src/select.c
index 0c14ba6..9f56b47 100644
--- a/src/select.c
+++ b/src/select.c
@@ -41,7 +41,7 @@ void select_open(lua_State *L)
 {
     /* push select auxiliar lua function and register
     * select_lua_select with it as an upvalue */
-#ifdef LUASOCKET_DEBUG
+#ifdef LUASOCKET_DOFILE
     lua_dofile(L, "lsselect.lua");
 #else
 #include "lsselect.loh"