lighttpd
/
lighttpd2
2
0
Fork 0
Code Issues Wiki

Rename lighttpd to lighttpd2

This commit is contained in:
Stefan Bühler 2010-01-03 19:47:47 +01:00
parent 7768470b10
commit edd74a0e3c
16 changed files with 119 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/LighttpdMacros.cmake
View File

@ -3,7 +3,7 @@
MACRO(ADD_AND_INSTALL_LIBRARY LIBNAME SRCFILES)
IF(BUILD_STATIC)
ADD_LIBRARY(${LIBNAME} STATIC ${SRCFILES})
TARGET_LINK_LIBRARIES(lighttpd ${LIBNAME})
TARGET_LINK_LIBRARIES(lighttpd2 ${LIBNAME})
ELSE(BUILD_STATIC)
ADD_LIBRARY(${LIBNAME} MODULE ${SRCFILES})
SET(L_INSTALL_TARGETS ${L_INSTALL_TARGETS} ${LIBNAME})
@ -12,7 +12,7 @@ MACRO(ADD_AND_INSTALL_LIBRARY LIBNAME SRCFILES)
ADD_TARGET_PROPERTIES(${LIBNAME} COMPILE_FLAGS ${COMMON_CFLAGS})
SET_TARGET_PROPERTIES(${LIBNAME} PROPERTIES CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
TARGET_LINK_LIBRARIES(${LIBNAME} lighttpd-common lighttpd-shared)
TARGET_LINK_LIBRARIES(${LIBNAME} lighttpd-${PACKAGE_VERSION}-common lighttpd-${PACKAGE_VERSION}-shared)
IF(APPLE)
SET_TARGET_PROPERTIES(${LIBNAME} PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")

5
configure.ac
View File

@ -41,9 +41,9 @@ AC_CHECK_HEADERS([ \
AC_ARG_WITH(
[pkglibdir],
AS_HELP_STRING([--with-pkglibdir=dir],
[specify directory for driver files (default LIBDIR/lighttpd)]),
[specify directory for driver files (default LIBDIR/lighttpd-VERSION]),
[pkglibdir=$withval],
[pkglibdir=$libdir/lighttpd])
[pkglibdir=$libdir/lighttpd-$PACKAGE_VERSION])
AC_SUBST(pkglibdir)
# Checks for libraries.
@ -303,5 +303,6 @@ AC_CONFIG_FILES([Makefile \
src/angel/Makefile \
src/modules/Makefile \
src/unittests/Makefile \
src/lighttpd2.pc \
])
AC_OUTPUT

1
include/Makefile.am Normal file
View File

@ -0,0 +1 @@
SUBDIRS=lighttpd

7
include/lighttpd/Makefile.am Normal file
View File

@ -0,0 +1,7 @@
headerfiles=$(filter-out config.h,$(wildcard $(srcdir)/*.h))
EXTRA_DIST=$(headerfiles)
headersdir=$(includedir)/lighttpd
headers_DATA=$(headerfiles) config.h

78
src/CMakeLists.txt
View File

@ -259,31 +259,31 @@ RAGEL_PARSER(angel/angel_config_parser.rl)
SET(L_INSTALL_TARGETS)
ADD_LIBRARY(lighttpd-common SHARED
ADD_LIBRARY(lighttpd-${PACKAGE_VERSION}-common SHARED
${COMMON_SRC}
)
ADD_LIBRARY(lighttpd-shared SHARED
ADD_LIBRARY(lighttpd-${PACKAGE_VERSION}-shared SHARED
${LIGHTTPD_SHARED_SRC}
)
TARGET_LINK_LIBRARIES(lighttpd-shared lighttpd-common)
TARGET_LINK_LIBRARIES(lighttpd-${PACKAGE_VERSION}-shared lighttpd-${PACKAGE_VERSION}-common)
ADD_LIBRARY(lighttpd-sharedangel SHARED
ADD_LIBRARY(lighttpd-${PACKAGE_VERSION}-sharedangel SHARED
${ANGEL_SHARED_SRC}
)
TARGET_LINK_LIBRARIES(lighttpd-sharedangel lighttpd-common)
TARGET_LINK_LIBRARIES(lighttpd-${PACKAGE_VERSION}-sharedangel lighttpd-${PACKAGE_VERSION}-common)
ADD_EXECUTABLE(lighttpd
ADD_EXECUTABLE(lighttpd2
main/lighttpd.c
)
TARGET_LINK_LIBRARIES(lighttpd lighttpd-common lighttpd-shared)
TARGET_LINK_LIBRARIES(lighttpd2 lighttpd-${PACKAGE_VERSION}-common lighttpd-${PACKAGE_VERSION}-shared)
ADD_EXECUTABLE(lighttpd-angel
ADD_EXECUTABLE(lighttpd2-angel
angel/angel_main.c
)
TARGET_LINK_LIBRARIES(lighttpd-angel lighttpd-common lighttpd-sharedangel)
TARGET_LINK_LIBRARIES(lighttpd2-angel lighttpd-${PACKAGE_VERSION}-common lighttpd-${PACKAGE_VERSION}-sharedangel)
SET(L_INSTALL_TARGETS ${L_INSTALL_TARGETS} lighttpd lighttpd-angel lighttpd-common lighttpd-shared lighttpd-sharedangel)
SET(L_INSTALL_TARGETS ${L_INSTALL_TARGETS} lighttpd2 lighttpd2-angel lighttpd-${PACKAGE_VERSION}-common lighttpd-${PACKAGE_VERSION}-shared lighttpd-${PACKAGE_VERSION}-sharedangel)
IF(BUILD_EXTRA_WARNINGS)
SET(WARN_CFLAGS "-g -O2 -g2 -Wall -Wmissing-declarations -Wdeclaration-after-statement -Wcast-align -Wsign-compare -Wnested-externs -Wpointer-arith")
@ -336,20 +336,20 @@ IF(HAVE_LIBCRYPT)
TARGET_LINK_LIBRARIES(mod_auth crypt)
ENDIF(HAVE_LIBCRYPT)
ADD_TARGET_PROPERTIES(lighttpd-common LINK_FLAGS ${COMMON_LDFLAGS})
ADD_TARGET_PROPERTIES(lighttpd-common COMPILE_FLAGS ${COMMON_CFLAGS})
ADD_TARGET_PROPERTIES(lighttpd-${PACKAGE_VERSION}-common LINK_FLAGS ${COMMON_LDFLAGS})
ADD_TARGET_PROPERTIES(lighttpd-${PACKAGE_VERSION}-common COMPILE_FLAGS ${COMMON_CFLAGS})
ADD_TARGET_PROPERTIES(lighttpd-shared LINK_FLAGS ${COMMON_LDFLAGS})
ADD_TARGET_PROPERTIES(lighttpd-shared COMPILE_FLAGS ${COMMON_CFLAGS})
ADD_TARGET_PROPERTIES(lighttpd-${PACKAGE_VERSION}-shared LINK_FLAGS ${COMMON_LDFLAGS})
ADD_TARGET_PROPERTIES(lighttpd-${PACKAGE_VERSION}-shared COMPILE_FLAGS ${COMMON_CFLAGS})
ADD_TARGET_PROPERTIES(lighttpd-sharedangel LINK_FLAGS ${COMMON_LDFLAGS})
ADD_TARGET_PROPERTIES(lighttpd-sharedangel COMPILE_FLAGS ${COMMON_CFLAGS})
ADD_TARGET_PROPERTIES(lighttpd-${PACKAGE_VERSION}-sharedangel LINK_FLAGS ${COMMON_LDFLAGS})
ADD_TARGET_PROPERTIES(lighttpd-${PACKAGE_VERSION}-sharedangel COMPILE_FLAGS ${COMMON_CFLAGS})
ADD_TARGET_PROPERTIES(lighttpd LINK_FLAGS ${COMMON_LDFLAGS})
ADD_TARGET_PROPERTIES(lighttpd COMPILE_FLAGS ${COMMON_CFLAGS})
ADD_TARGET_PROPERTIES(lighttpd2 LINK_FLAGS ${COMMON_LDFLAGS})
ADD_TARGET_PROPERTIES(lighttpd2 COMPILE_FLAGS ${COMMON_CFLAGS})
ADD_TARGET_PROPERTIES(lighttpd-angel LINK_FLAGS ${COMMON_LDFLAGS})
ADD_TARGET_PROPERTIES(lighttpd-angel COMPILE_FLAGS ${COMMON_CFLAGS})
ADD_TARGET_PROPERTIES(lighttpd2-angel LINK_FLAGS ${COMMON_LDFLAGS})
ADD_TARGET_PROPERTIES(lighttpd2-angel COMPILE_FLAGS ${COMMON_CFLAGS})
IF(CMAKE_COMPILER_IS_GNUCC)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -g -Wshadow -W -pedantic")
@ -359,34 +359,34 @@ IF(CMAKE_COMPILER_IS_GNUCC)
ADD_DEFINITIONS(-D_GNU_SOURCE)
ENDIF(CMAKE_COMPILER_IS_GNUCC)
SET_TARGET_PROPERTIES(lighttpd PROPERTIES CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
SET_TARGET_PROPERTIES(lighttpd2 PROPERTIES CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
IF(WIN32)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNVALGRIND")
ADD_TARGET_PROPERTIES(lighttpd COMPILE_FLAGS "-DLI_DECLARE_EXPORTS")
TARGET_LINK_LIBRARIES(lighttpd ws2_32)
ADD_TARGET_PROPERTIES(lighttpd2 COMPILE_FLAGS "-DLI_DECLARE_EXPORTS")
TARGET_LINK_LIBRARIES(lighttpd2 ws2_32)
IF(MINGW)
TARGET_LINK_LIBRARIES(lighttpd msvcr70)
ADD_TARGET_PROPERTIES(lighttpd LINK_FLAGS "-Wl,-subsystem,console")
TARGET_LINK_LIBRARIES(lighttpd2 msvcr70)
ADD_TARGET_PROPERTIES(lighttpd2 LINK_FLAGS "-Wl,-subsystem,console")
ENDIF(MINGW)
ENDIF(WIN32)
IF(NOT WIN32)
INSTALL(TARGETS ${L_INSTALL_TARGETS}
RUNTIME DESTINATION ${SBINDIR}
LIBRARY DESTINATION ${LIGHTTPD_MODULES_DIR}
ARCHIVE DESTINATION ${LIGHTTPD_MODULES_DIR}/static)
INSTALL(TARGETS ${L_INSTALL_TARGETS}
RUNTIME DESTINATION ${SBINDIR}
LIBRARY DESTINATION ${LIGHTTPD_MODULES_DIR}
ARCHIVE DESTINATION ${LIGHTTPD_MODULES_DIR}/static)
ELSE(NOT WIN32)
## HACK to make win32 to install our libraries in desired directory..
INSTALL(TARGETS lighttpd
RUNTIME DESTINATION ${SBINDIR}
ARCHIVE DESTINATION lib/static)
LIST(REMOVE_ITEM L_INSTALL_TARGETS lighttpd)
INSTALL(TARGETS ${L_INSTALL_TARGETS}
RUNTIME DESTINATION ${SBINDIR}/lib
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/static)
## HACK to make win32 to install our libraries in desired directory..
INSTALL(TARGETS lighttpd2
RUNTIME DESTINATION ${SBINDIR}
ARCHIVE DESTINATION lib/static)
LIST(REMOVE_ITEM L_INSTALL_TARGETS lighttpd2)
INSTALL(TARGETS ${L_INSTALL_TARGETS}
RUNTIME DESTINATION ${SBINDIR}/lib
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/static)
ENDIF(NOT WIN32)
IF(BUILD_UNIT_TESTS)
@ -396,7 +396,7 @@ IF(BUILD_UNIT_TESTS)
ADD_TARGET_PROPERTIES(${EXENAME} LINK_FLAGS ${COMMON_LDFLAGS})
ADD_TARGET_PROPERTIES(${EXENAME} COMPILE_FLAGS ${COMMON_CFLAGS})
TARGET_LINK_LIBRARIES(${EXENAME} lighttpd-common lighttpd-shared)
TARGET_LINK_LIBRARIES(${EXENAME} lighttpd-${PACKAGE_VERSION}-common lighttpd-${PACKAGE_VERSION}-shared)
ADD_TEST(${TESTNAME} ${EXENAME})
ENDMACRO(ADD_TEST_BINARY)

7
src/Makefile.am
View File

@ -1,4 +1,9 @@
SUBDIRS=common main modules angel unittests
EXTRA_DIST=CMakeLists.txt config.h.cmake
EXTRA_DIST=CMakeLists.txt config.h.cmake lighttpd2.pc.in
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = lighttpd2.pc
$(pkgconfig_DATA): ../config.status

20
src/angel/Makefile.am
View File

@ -1,6 +1,6 @@
sbin_PROGRAMS=lighttpd-angel
lib_LTLIBRARIES=liblighttpd-sharedangel.la
sbin_PROGRAMS=lighttpd2-angel
lib_LTLIBRARIES=liblighttpd2-sharedangel.la
common_cflags=-I$(top_srcdir)/include -I$(top_builddir)/include
@ -20,13 +20,13 @@ angel_config_parser.c: angel_config_parser.rl
EXTRA_DIST=angel_config_parser.rl
liblighttpd_sharedangel_la_SOURCES=$(lighttpd_angel_shared_src)
liblighttpd_sharedangel_la_CPPFLAGS=$(common_cflags) $(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) $(LIBEV_CFLAGS) $(LUA_CFLAGS)
liblighttpd_sharedangel_la_LDFLAGS=-release $(PACKAGE_VERSION) -export-dynamic $(GTHREAD_LIBS) $(GMODULE_LIBS) $(LIBEV_LIBS)
liblighttpd_sharedangel_la_LIBADD=../common/liblighttpd-common.la
liblighttpd2_sharedangel_la_SOURCES=$(lighttpd_angel_shared_src)
liblighttpd2_sharedangel_la_CPPFLAGS=$(common_cflags) $(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) $(LIBEV_CFLAGS) $(LUA_CFLAGS)
liblighttpd2_sharedangel_la_LDFLAGS=-release $(PACKAGE_VERSION) -export-dynamic $(GTHREAD_LIBS) $(GMODULE_LIBS) $(LIBEV_LIBS)
liblighttpd2_sharedangel_la_LIBADD=../common/liblighttpd2-common.la
lighttpd_angel_SOURCES=angel_main.c
lighttpd2_angel_SOURCES=angel_main.c
lighttpd_angel_CPPFLAGS=$(common_cflags) $(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) $(LIBEV_CFLAGS) $(LUA_CFLAGS) -DDEFAULT_LIBDIR='"$(pkglibdir)"'
lighttpd_angel_LDFLAGS=-export-dynamic $(GTHREAD_LIBS) $(GMODULE_LIBS) $(LIBEV_LIBS) $(LUA_LIBS)
lighttpd_angel_LDADD=../common/liblighttpd-common.la ../angel/liblighttpd-sharedangel.la
lighttpd2_angel_CPPFLAGS=$(common_cflags) $(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) $(LIBEV_CFLAGS) $(LUA_CFLAGS) -DDEFAULT_LIBDIR='"$(pkglibdir)"'
lighttpd2_angel_LDFLAGS=-export-dynamic $(GTHREAD_LIBS) $(GMODULE_LIBS) $(LIBEV_LIBS) $(LUA_LIBS)
lighttpd2_angel_LDADD=../common/liblighttpd2-common.la ../angel/liblighttpd2-sharedangel.la

6
src/angel/angel_main.c
View File

@ -5,6 +5,10 @@
#include <lighttpd/version.h>
#ifndef DEFAULT_LIBDIR
# define DEFAULT_LIBDIR "/usr/local/lib/lighttpd2"
#endif
# ifndef HAVE_ISSETUGID
static int l_issetugid() {
@ -20,7 +24,7 @@ int main(int argc, char *argv[]) {
/* options */
gboolean show_version = FALSE, no_fork = FALSE;
gchar const *const def_module_dir = "/usr/local/lib"; /* TODO: configure module-dir with make-system */
gchar const *const def_module_dir = DEFAULT_LIBDIR;
gchar const *module_dir = def_module_dir;
gchar const *config_path = NULL, *pidfile = NULL;

2
src/angel/wscript
View File

@ -33,4 +33,4 @@ def build(bld):
uselib = ['glib', 'gthread', 'gmodule', 'ev'],
uselib_local = ['common'],
includes = ['#/include/'],
target = 'lighttpd-angel')
target = 'lighttpd2-angel')

8
src/common/Makefile.am
View File

@ -1,5 +1,5 @@
lib_LTLIBRARIES=liblighttpd-common.la
lib_LTLIBRARIES=liblighttpd2-common.la
common_cflags=-I$(top_srcdir)/include -I$(top_builddir)/include
common_src= \
@ -24,6 +24,6 @@ ip_parsers.c: ip_parsers.rl
EXTRA_DIST=ip_parsers.rl
liblighttpd_common_la_SOURCES=$(common_src)
liblighttpd_common_la_CPPFLAGS=$(common_cflags) $(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) $(LIBEV_CFLAGS)
liblighttpd_common_la_LDFLAGS=-release $(PACKAGE_VERSION) -export-dynamic $(GTHREAD_LIBS) $(GMODULE_LIBS) $(LIBEV_LIBS)
liblighttpd2_common_la_SOURCES=$(common_src)
liblighttpd2_common_la_CPPFLAGS=$(common_cflags) $(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) $(LIBEV_CFLAGS)
liblighttpd2_common_la_LDFLAGS=-release $(PACKAGE_VERSION) -export-dynamic $(GTHREAD_LIBS) $(GMODULE_LIBS) $(LIBEV_LIBS)

14
src/lighttpd2.pc.in Normal file
View File

@ -0,0 +1,14 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
version=@VERSION@
INSTALL_MOD=@pkglibdir@
Name: lighttpd2
Description: modules for lighttpd2
Version: ${version}
Requires: glib-2.0
Libs: -module -export-dynamic -avoid-version -no-undefined -L${libdir} -llighttpd2-common-${version} -llighttpd2-shared-${version} -lev
Cflags: -I${includedir}

22
src/main/Makefile.am
View File

@ -1,6 +1,6 @@
bin_PROGRAMS=lighttpd
lib_LTLIBRARIES=liblighttpd-shared.la
bin_PROGRAMS=lighttpd2
lib_LTLIBRARIES=liblighttpd2-shared.la
common_cflags=-I$(top_srcdir)/include -I$(top_builddir)/include
@ -64,7 +64,7 @@ lua_src= \
if USE_LUA
lighttpd_shared_src+=$(lua_src)
endif
EXTRA_lighttpd_SOURCES=$(lua_src)
EXTRA_lighttpd2_SOURCES=$(lua_src)
BUILT_SOURCES=config_parser.c http_range_parser.c http_request_parser.c http_response_parser.c url_parser.c
@ -81,13 +81,13 @@ url_parser.c: url_parser.rl
EXTRA_DIST=config_parser.rl http_range_parser.rl http_request_parser.rl http_response_parser.rl url_parser.rl
liblighttpd_shared_la_SOURCES=$(lighttpd_shared_src)
liblighttpd_shared_la_CPPFLAGS=$(common_cflags) $(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) $(LIBEV_CFLAGS) $(LUA_CFLAGS)
liblighttpd_shared_la_LDFLAGS=-release $(PACKAGE_VERSION) -export-dynamic $(GTHREAD_LIBS) $(GMODULE_LIBS) $(LIBEV_LIBS) $(LUA_LIBS)
liblighttpd_shared_la_LIBADD=../common/liblighttpd-common.la
liblighttpd2_shared_la_SOURCES=$(lighttpd_shared_src)
liblighttpd2_shared_la_CPPFLAGS=$(common_cflags) $(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) $(LIBEV_CFLAGS) $(LUA_CFLAGS)
liblighttpd2_shared_la_LDFLAGS=-release $(PACKAGE_VERSION) -export-dynamic $(GTHREAD_LIBS) $(GMODULE_LIBS) $(LIBEV_LIBS) $(LUA_LIBS)
liblighttpd2_shared_la_LIBADD=../common/liblighttpd2-common.la
lighttpd_SOURCES=lighttpd.c
lighttpd2_SOURCES=lighttpd.c
lighttpd_CPPFLAGS=$(common_cflags) $(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) $(LIBEV_CFLAGS) $(LUA_CFLAGS) -DDEFAULT_LIBDIR='"$(pkglibdir)"'
lighttpd_LDFLAGS=-export-dynamic $(GTHREAD_LIBS) $(GMODULE_LIBS) $(LIBEV_LIBS) $(LUA_LIBS)
lighttpd_LDADD=../common/liblighttpd-common.la ../main/liblighttpd-shared.la
lighttpd2_CPPFLAGS=$(common_cflags) $(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) $(LIBEV_CFLAGS) $(LUA_CFLAGS) -DDEFAULT_LIBDIR='"$(pkglibdir)"'
lighttpd2_LDFLAGS=-export-dynamic $(GTHREAD_LIBS) $(GMODULE_LIBS) $(LIBEV_LIBS) $(LUA_LIBS)
lighttpd2_LDADD=../common/liblighttpd2-common.la ../main/liblighttpd2-shared.la

2
src/main/lighttpd.c
View File

@ -14,7 +14,7 @@
#endif
#ifndef DEFAULT_LIBDIR
# define DEFAULT_LIBDIR "/usr/local/lib/lighttpd"
# define DEFAULT_LIBDIR "/usr/local/lib/lighttpd2"
#endif
int main(int argc, char *argv[]) {

2
src/main/wscript
View File

@ -85,4 +85,4 @@ def build(bld):
uselib = libs,
uselib_local = ['common'],
includes = ['#/include/'],
target = 'lighttpd')
target = 'lighttpd2')

2
src/modules/Makefile.am
View File

@ -4,7 +4,7 @@ common_cflags = -I$(top_srcdir)/include -I$(top_builddir)/include
common_cflags += $(GTHREAD_CFLAGS) $(LIBEV_CFLAGS) $(LUA_CFLAGS) $(OPENSSL_CFLAGS)
common_libs = $(GTHREAD_LIBS) $(LIBEV_LIBS) $(LUA_LIBS)
common_ldflags = -module -export-dynamic -avoid-version -no-undefined $(common_libs)
common_libadd = ../common/liblighttpd-common.la ../main/liblighttpd-shared.la
common_libadd = ../common/liblighttpd2-common.la ../main/liblighttpd2-shared.la
AM_CPPFLAGS = $(common_cflags)

13
src/unittests/Makefile.am Normal file
View File

@ -0,0 +1,13 @@
AM_CFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
AM_CFLAGS += $(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) $(LIBEV_CFLAGS) $(LUA_CFLAGS)
AM_LDFLAGS = -export-dynamic -avoid-version -no-undefined $(GTHREAD_LIBS) $(GMODULE_LIBS) $(LIBEV_LIBS) $(LUA_LIBS)
LDADD = ../common/liblighttpd2-common.la ../main/liblighttpd2-shared.la
test_binaries=test-chunk test-range-parser test-utils
check_PROGRAMS=$(test_binaries)
TESTS=$(test_binaries)
TESTS_ENVIRONMENT=gtester