diff --git a/CMakeLists.txt b/CMakeLists.txt index 0286cdb..147f190 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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/" ) diff --git a/ChangeLog b/ChangeLog index 64138c3..8d5602f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/INSTALL b/INSTALL index 0d4d374..f424e9a 100644 --- a/INSTALL +++ b/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. - - Use Lua 5.1 or Lua 5.2 at your choice. + and the Lua compiler 'luac' are needed. + They aren't needed in the deployed binary though. + + 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 diff --git a/cmake/FindLua.cmake b/cmake/FindLua.cmake index ee7a63d..5fabb3f 100644 --- a/cmake/FindLua.cmake +++ b/cmake/FindLua.cmake @@ -1,7 +1,7 @@ # Locate Lua library # This module defines # LUA_EXECUTABLE, if found -# LUA_FOUND, if false, do not try to link to Lua +# LUA_FOUND, if false, do not try to link to Lua # LUA_LIBRARIES # LUA_INCLUDE_DIR, where to find lua.h # LUA_VERSION_STRING, the version of Lua found (since CMake 2.8.8) @@ -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 @@ -79,7 +79,7 @@ FIND_PATH(LUA_INCLUDE_DIR lua.h ) # Find the lua library -FIND_LIBRARY(LUA_LIBRARY +FIND_LIBRARY(LUA_LIBRARY NAMES ${_POSSIBLE_LUA_LIBRARY} HINTS $ENV{LUA_DIR} @@ -115,7 +115,7 @@ IF(LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h") ENDIF() INCLUDE(FindPackageHandleStandardArgs) -# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if # all listed variables are TRUE FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR diff --git a/lsyncd.c b/lsyncd.c index 746f2d4..5ab21fd 100644 --- a/lsyncd.c +++ b/lsyncd.c @@ -2889,6 +2889,9 @@ main( int argc, char * argv[ ] ) // gets a kernel parameter clocks_per_sec = sysconf( _SC_CLK_TCK ); + setlinebuf( stdout ); + setlinebuf( stderr ); + while( !term ) { main1( argc, argv ); }