Browse Source

restructure docs

personal/stbuehler/wip
Stefan Bühler 8 years ago
parent
commit
3cd06f49ad
  1. 2
      Makefile.am
  2. 105
      configure.ac
  3. 10
      contrib/Makefile.am
  4. 0
      contrib/angel.conf
  5. 0
      contrib/core.lua
  6. 0
      contrib/core__cached_html.lua
  7. 0
      contrib/core__xsendfile.lua
  8. 0
      contrib/default.html
  9. 0
      contrib/lighttpd.conf
  10. 0
      contrib/mimetypes.conf
  11. 0
      contrib/secdownload.lua
  12. 0
      contrib/secdownload__secdownload.lua
  13. 0
      contrib/service/log/run
  14. 0
      contrib/service/run
  15. 11
      doc/Makefile.am
  16. 8
      tests/base.py
  17. 2
      tests/runtests.py

2
Makefile.am

@ -1,4 +1,4 @@
SUBDIRS=doc src include tests
SUBDIRS=contrib doc src include tests
ACLOCAL_AMFLAGS=-I m4
EXTRA_DIST=autogen.sh CMakeLists.txt

105
configure.ac

@ -31,7 +31,7 @@ AM_PROG_AR
AC_PATH_PROG([RAGEL], [ragel])
if test "x$RAGEL" = "x"; then
AC_MSG_ERROR([ragel not found])
AC_MSG_ERROR([ragel not found])
fi
AC_SUBST([RAGEL])
@ -49,15 +49,15 @@ AC_PROG_LIBTOOL
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS([ \
unistd.h \
stddef.h \
sys/mman.h \
sys/resource.h \
sys/sendfile.h \
sys/types.h \
sys/uio.h \
sys/un.h \
execinfo.h \
unistd.h \
stddef.h \
sys/mman.h \
sys/resource.h \
sys/sendfile.h \
sys/types.h \
sys/uio.h \
sys/un.h \
execinfo.h \
])
# pkglibdir
@ -89,23 +89,23 @@ LIBEV_CFLAGS=""
LIBEV_LIBS=""
PKG_CHECK_MODULES([LIBEV], [libev], [], [
# no pkg-config for libev, searching manually:
if test "$WITH_LIBEV" != "yes"; then
LIBEV_CFLAGS="-I$WITH_LIBEV/include"
LIBEV_LIBS="-L$WITH_LIBEV/lib -lev"
else
AC_CHECK_HEADERS([ev.h],[
AC_CHECK_LIB([ev], [ev_time], [
LIBEV_LIBS="-lev"
],[
AC_MSG_ERROR([libev not found])
]
)],[
AC_MSG_ERROR([libev not found])
]
)
fi
# no pkg-config for libev, searching manually:
if test "$WITH_LIBEV" != "yes"; then
LIBEV_CFLAGS="-I$WITH_LIBEV/include"
LIBEV_LIBS="-L$WITH_LIBEV/lib -lev"
else
AC_CHECK_HEADERS([ev.h],[
AC_CHECK_LIB([ev], [ev_time], [
LIBEV_LIBS="-lev"
],[
AC_MSG_ERROR([libev not found])
]
)],[
AC_MSG_ERROR([libev not found])
]
)
fi
])
AC_SUBST([LIBEV_CFLAGS])
@ -218,20 +218,20 @@ AC_SEARCH_LIBS([kvm_open],[kvm])
# Checks for library functions.
AC_CHECK_FUNCS([ \
chroot \
getrlimit \
gmtime_r \
inet_aton \
inet_ntop \
localtime_r \
madvise \
mmap \
posix_fadvise \
sendfile \
sendfile64 \
sendfilev \
writev \
accept4 \
chroot \
getrlimit \
gmtime_r \
inet_aton \
inet_ntop \
localtime_r \
madvise \
mmap \
posix_fadvise \
sendfile \
sendfile64 \
sendfilev \
writev \
accept4 \
])
dnl Check for IPv6 support
@ -417,16 +417,17 @@ if test x$extrawarnings = xtrue; then
fi
AC_CONFIG_FILES([Makefile \
doc/Makefile \
include/Makefile \
include/lighttpd/Makefile \
src/Makefile \
src/common/Makefile \
src/main/Makefile \
src/angel/Makefile \
src/modules/Makefile \
src/unittests/Makefile \
src/lighttpd2.pc \
tests/Makefile \
contrib/Makefile \
doc/Makefile \
include/Makefile \
include/lighttpd/Makefile \
src/Makefile \
src/common/Makefile \
src/main/Makefile \
src/angel/Makefile \
src/modules/Makefile \
src/unittests/Makefile \
src/lighttpd2.pc \
tests/Makefile \
])
AC_OUTPUT

10
contrib/Makefile.am

@ -0,0 +1,10 @@
EXTRA_DIST=angel.conf lighttpd.conf mimetypes.conf service \
default.html
# see src/modules/Makefile.am
luadir = $(datarootdir)/lighttpd2/lua
dist_lua_DATA = core__cached_html.lua \
core.lua \
core__xsendfile.lua \
secdownload.lua \
secdownload__secdownload.lua

0
doc/angel.conf → contrib/angel.conf

0
doc/core.lua → contrib/core.lua

0
doc/core__cached_html.lua → contrib/core__cached_html.lua

0
doc/core__xsendfile.lua → contrib/core__xsendfile.lua

0
doc/default.html → contrib/default.html

0
doc/lighttpd.conf → contrib/lighttpd.conf

0
doc/mimetypes.conf → contrib/mimetypes.conf

0
doc/secdownload.lua → contrib/secdownload.lua

0
doc/secdownload__secdownload.lua → contrib/secdownload__secdownload.lua

0
doc/service/log/run → contrib/service/log/run

0
doc/service/run → contrib/service/run

11
doc/Makefile.am

@ -1,12 +1 @@
dist_man8_MANS=lighttpd2.8 lighttpd2-worker.8
EXTRA_DIST=angel.conf lighttpd.conf mimetypes.conf service \
default.html
# see src/modules/Makefile.am
luadir = $(datarootdir)/lighttpd2/lua
dist_lua_DATA = core__cached_html.lua \
core.lua \
core__xsendfile.lua \
secdownload.lua \
secdownload__secdownload.lua

8
tests/base.py

@ -342,7 +342,7 @@ class Tests(object):
errorconfig = Env.debug and " " or """log [ default => "file:%s" ];""" % (errorlog)
accesslog = self.PrepareFile("log/access.log", "")
self.config = """
global var.docdir = "{Env.docdir}";
global var.contribdir = "{Env.contribdir}";
global var.ssldir = "{Env.sourcedir}/tests/ca";
global var.default_docroot = "{Env.defaultwww}";
@ -374,8 +374,8 @@ setup {{
log [ default => "stderr" ];
lua.plugin var.docdir + "/core.lua";
lua.plugin var.docdir + "/secdownload.lua";
lua.plugin var.contribdir + "/core.lua";
lua.plugin var.contribdir + "/secdownload.lua";
accesslog.format "%h %V %u %t \\"%r\\" %>s %b \\"%{{Referer}}i\\" \\"%{{User-Agent}}i\\"";
accesslog "{accesslog}";
@ -396,7 +396,7 @@ setup {{
{errorconfig}
include var.docdir + "/mimetypes.conf";
include var.contribdir + "/mimetypes.conf";
global defaultaction = {{
docroot var.default_docroot;

2
tests/runtests.py

@ -72,7 +72,7 @@ Env.force_cleanup = options.force_cleanup
Env.port = find_port(options.port)
Env.tests = options.tests
Env.sourcedir = os.path.dirname(os.path.abspath(os.path.dirname(__file__)))
Env.docdir = os.path.join(Env.sourcedir, "doc")
Env.contribdir = os.path.join(Env.sourcedir, "contrib")
Env.debugRequests = options.debug_requests
Env.strace = options.strace
Env.truss = options.truss

Loading…
Cancel
Save