Skip to content
Snippets Groups Projects
Commit cc4c1ab1 authored by Roman Tsisyk's avatar Roman Tsisyk
Browse files

Merge branch 'master' into 1.6

parents 0a6bde06 5ab671e5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
cmake/pod2man.cmake
+ 12
− 13
View file @ cc4c1ab1
......@@ -8,27 +8,26 @@ if(NOT POD2MAN)
message(STATUS "Could not find pod2man - man pages disabled")
endif(NOT POD2MAN)
macro(pod2man PODFILE MANFILE SECTION OUTPATH CENTER)
if(NOT EXISTS ${PODFILE})
message(FATAL ERROR "Could not find pod file ${PODFILE} to generate man page")
endif(NOT EXISTS ${PODFILE})
macro(pod2man PODFILE NAME SECTION CENTER)
set(PODFILE_FULL "${CMAKE_CURRENT_SOURCE_DIR}/${PODFILE}")
set(MANFILE_FULL "${CMAKE_CURRENT_BINARY_DIR}/${NAME}.${SECTION}")
if(NOT EXISTS ${PODFILE_FULL})
message(FATAL ERROR "Could not find pod file ${PODFILE_FULL} to generate man page")
endif(NOT EXISTS ${PODFILE_FULL})
if(POD2MAN)
set(OUTPATH_NEW "${PROJECT_BINARY_DIR}/${OUTPATH}")
add_custom_command(
OUTPUT ${OUTPATH_NEW}/${MANFILE}.${SECTION}
OUTPUT ${MANFILE_FULL}
COMMAND ${POD2MAN} --section ${SECTION} --center ${CENTER}
--release --name ${MANFILE} ${PODFILE}
${OUTPATH_NEW}/${MANFILE}.${SECTION}
--release --name ${MANFILE} ${PODFILE_FULL} ${MANFILE_FULL}
)
set(MANPAGE_TARGET "man-${MANFILE}")
set(MANPAGE_TARGET "man-${NAME}")
add_custom_target(${MANPAGE_TARGET} ALL
DEPENDS ${OUTPATH_NEW}/${MANFILE}.${SECTION}
DEPENDS ${MANFILE_FULL}
)
install(
FILES ${OUTPATH_NEW}/${MANFILE}.${SECTION}
FILES ${MANFILE_FULL}
DESTINATION ${CMAKE_INSTALL_MANDIR}/man${SECTION}
)
endif()
endmacro(pod2man PODFILE MANFILE SECTION OUTPATH CENTER)
endmacro(pod2man PODFILE NAME SECTION OUTPATH CENTER)
debian/copyright
+ 38
− 115
View file @ cc4c1ab1
......@@ -11,29 +11,6 @@ Files: third_party/libev/event_compat.h
Copyright: 2000-2004 Niels Provos <provos@citi.umich.edu>,
2008 Marc Alexander Lehmann <libev@schmorp.de>
License: BSD-3-Clause
All rights reserved.
.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.
.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Files: third_party/libev/ev.c
Copyright: 2007-2012 Marc Alexander Lehmann <libeio@schmorp.de>,
......@@ -53,33 +30,6 @@ Files: third_party/crc32.c
Copyright: 1986 Gary S. Brown
2004-2006 Intel Corporation
License: BSD-3-Clause
You may use this program, or code or tables extracted from it,
as desired without restriction.
.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
.
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of the University nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
.
THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
Files: third_party/memrchr.c third_party/memmem.c
Copyright: 2008 The NetBSD Foundation, Inc.
......@@ -188,32 +138,6 @@ Files: third_party/qsort_arg.c
src/lib/small/small/rb.h
Copyright: 1992, 1993 The Regents of the University of California.
License: BSD-3-Clause
All rights reserved.
.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
.
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of the University nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
.
THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
Files: third_party/compat/unwind.h
Copyright: 2001, 2003, 2004, 2006 Free Software Foundation, Inc.
......@@ -422,6 +346,35 @@ License: BSD-2-Clause
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
License: BSD-3-Clause
You may use this program, or code or tables extracted from it,
as desired without restriction.
.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
.
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of the University nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
.
THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
License: Expat
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
......@@ -443,45 +396,6 @@ License: Expat
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
License: BSD-2-Clause or GPL-2+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
.
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.
Alternatively, the contents of this package may be used under the terms
of the GNU General Public License ("GPL") version 2 or any later version,
in which case the provisions of the GPL are applicable instead of the
above. If you wish to allow the use of your version of this package only
under the terms of the GPL and not to allow others to use your version of
this file under the BSD license, indicate your decision by deleting the
provisions above and replace them with the notice and other provisions
required by the GPL in this and the other files of this package. If you do
not delete the provisions above, a recipient may use your version of this
file under either the BSD or the GPL.
.
Debian systems, full text of GPLv2 license is alailable in
/usr/share/common-licenses/GPL-2.
License: Apache-2.0
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
......@@ -496,6 +410,15 @@ License: Apache-2.0
On Debian systems, the complete text of the Apache License,
Version 2.0 can be found in '/usr/share/common-licenses/Apache-2.0'.
License: GPL-2+
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; version 2 of the License, or (at your option)
any later version.
.
On Debian systems, the complete text of version 2 of the GNU General Public
License can be found in `/usr/share/common-licenses/GPL-2'.
License: LGPL-2.1+
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by the
......
doc/CMakeLists.txt
+ 5
− 5
View file @ cc4c1ab1
configure_file(
"${PROJECT_SOURCE_DIR}/doc/www/content/newsite/download.yml.in"
"${PROJECT_BINARY_DIR}/doc/www/content/newsite/download.yml"
)
add_subdirectory(man)
if (ENABLE_DOC)
configure_file(
"${PROJECT_SOURCE_DIR}/doc/www/content/newsite/download.yml.in"
"${PROJECT_BINARY_DIR}/doc/www/content/newsite/download.yml"
)
add_subdirectory(sphinx)
add_subdirectory(www)
endif()
doc/man/CMakeLists.txt
+ 1
− 2
View file @ cc4c1ab1
pod2man (
${CMAKE_SOURCE_DIR}/doc/man/tarantool.pod
"tarantool" 1 doc/man
tarantool.pod "tarantool" 1
"Lua application server and NoSQL database"
)
extra/dist/CMakeLists.txt
+ 1
− 3
View file @ cc4c1ab1
......@@ -63,8 +63,6 @@ install (FILES example.lua DESTINATION
)
pod2man (
${CMAKE_SOURCE_DIR}/extra/dist/tarantoolctl
"tarantoolctl" 1 extra/dist
tarantoolctl "tarantoolctl" 1
"tarantoolctl instances control"
)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment