mirror of https://github.com/octoleo/lsyncd.git
Merge branch 'master' of github.com:axkibe/lsyncd
This commit is contained in:
commit
f3d65770cd
|
@ -1,7 +1,7 @@
|
|||
# preamble
|
||||
project( Lsyncd )
|
||||
cmake_minimum_required( VERSION 2.8 )
|
||||
set( LSYNCD_VERSION 2.2.2 )
|
||||
set( LSYNCD_VERSION 2.2.3 )
|
||||
set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/" )
|
||||
|
||||
|
||||
|
|
|
@ -1,8 +1,10 @@
|
|||
2018-??-??: 2.2.3
|
||||
enhaencement: supporting includes with new filter and filterFrom options
|
||||
change: needing at least Lua 5.2 (was 5.1)
|
||||
change: if the target/targetdir ands with a ':' do not append
|
||||
a trailing '/' to it, since that would change it from homedir to rootdir!
|
||||
add: example for Amazon S3 Bucket (Daniel Miranda)
|
||||
fix: setting stdout/stderr to linebuffer mode.
|
||||
|
||||
2017-02-16: 2.2.2
|
||||
fix: checkgauge 'insist'
|
||||
|
@ -18,7 +20,7 @@
|
|||
enhancement: now always using filter lists with rysnc
|
||||
instead of include/exclude lists taking advantage of the new --delete-missing-args
|
||||
parameter to delete files on target.
|
||||
>>> Thus Lsyncd 2.1.1 needs rsync >= 3.1.0
|
||||
>>> Thus Lsyncd 2.2.1 needs rsync >= 3.1.0
|
||||
change: added "tests" make target to run all the tests.
|
||||
fix: crash due to typo in changed ^path, ^pathdir, ^pathname
|
||||
|
||||
|
|
22
INSTALL
22
INSTALL
|
@ -15,22 +15,22 @@ Prerequisites
|
|||
Lua
|
||||
|
||||
For building Lsyncd the Lua interpreter 'lua'
|
||||
and the Lua compiler 'luac' are needed.
|
||||
They aren't needed in the deployed binary though.
|
||||
and the Lua compiler 'luac' are needed.
|
||||
They aren't needed in the deployed binary though.
|
||||
|
||||
Use Lua 5.1 or Lua 5.2 at your choice.
|
||||
Use Lua 5.2 or later.
|
||||
|
||||
Liblua
|
||||
|
||||
The lua library.
|
||||
|
||||
Note that you likely need the package "liblua-dev"
|
||||
or something like that.
|
||||
Note that you likely need the package "liblua-dev"
|
||||
or something like that.
|
||||
|
||||
Use Lua 5.1 or Lua 5.2 at your choice.
|
||||
Use Lua 5.2 or later.
|
||||
|
||||
Note, this has to be exactly the same Version as the
|
||||
lua compiler used above!
|
||||
Note, this has to be exactly the same Version as the
|
||||
lua compiler used above!
|
||||
|
||||
|
||||
Building
|
||||
|
@ -41,16 +41,16 @@ Building
|
|||
mkdir build
|
||||
cd build
|
||||
cmake ..
|
||||
make
|
||||
make
|
||||
sudo make install
|
||||
|
||||
Building intree:
|
||||
cmake .
|
||||
make
|
||||
make
|
||||
|
||||
On OSX you yet need to get the xnu sources.
|
||||
For example:
|
||||
cmake -DWITH_INOTIFY=OFF -DWITH_FSEVENTS=ON -DXNU_DIR=/path/to/xnu-VERSION
|
||||
make
|
||||
make
|
||||
|
||||
FIXME make install not yet done
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
# License text for the above reference.)
|
||||
#
|
||||
# The required version of Lua can be specified using the
|
||||
# standard syntax, e.g. FIND_PACKAGE(Lua 5.1)
|
||||
# standard syntax, e.g. FIND_PACKAGE(Lua 5.2)
|
||||
# Otherwise the module will search for any available Lua implementation
|
||||
|
||||
# Always search for non-versioned lua first (recommended)
|
||||
|
@ -41,7 +41,7 @@ SET(_POSSIBLE_LUA_LIBRARY lua)
|
|||
IF(Lua_FIND_VERSION_MAJOR AND Lua_FIND_VERSION_MINOR)
|
||||
SET(_POSSIBLE_SUFFIXES "${Lua_FIND_VERSION_MAJOR}${Lua_FIND_VERSION_MINOR}" "${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR}" "-${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR}")
|
||||
ELSE(Lua_FIND_VERSION_MAJOR AND Lua_FIND_VERSION_MINOR)
|
||||
SET(_POSSIBLE_SUFFIXES "53" "5.3" "-5.3" "52" "5.2" "-5.2" "51" "5.1" "-5.1")
|
||||
SET(_POSSIBLE_SUFFIXES "53" "5.3" "-5.3" "52" "5.2" "-5.2")
|
||||
ENDIF(Lua_FIND_VERSION_MAJOR AND Lua_FIND_VERSION_MINOR)
|
||||
|
||||
# Set up possible search names and locations
|
||||
|
|
Loading…
Reference in New Issue