[Box Backup-commit] [boxbackup/boxbackup] e32b11: Forward-port git config changes from s3_support_me...

GitHub noreply at github.com
Sat Dec 17 09:09:01 GMT 2016


  Branch: refs/heads/s3_support
  Home:   https://github.com/boxbackup/boxbackup
  Commit: e32b118333fa9c273e1ef8ceb59e6a00b9c633eb
      https://github.com/boxbackup/boxbackup/commit/e32b118333fa9c273e1ef8ceb59e6a00b9c633eb
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M .gitattributes
    M .gitignore

  Log Message:
  -----------
  Forward-port git config changes from s3_support_merge_4


  Commit: de4dc08973e3aa1d9089a3e91165ce227948c7eb
      https://github.com/boxbackup/boxbackup/commit/de4dc08973e3aa1d9089a3e91165ce227948c7eb
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M LICENSE.txt
    M contrib/windows/installer/bbackupd.conf.template
    M contrib/windows/installer/tools/InstallService.bat
    M contrib/windows/installer/tools/KillBackupProcess.bat
    M contrib/windows/installer/tools/QueryOutputAll.bat
    M contrib/windows/installer/tools/QueryOutputCurrent.bat
    M contrib/windows/installer/tools/ReloadConfig.bat
    M contrib/windows/installer/tools/RemoveService.bat
    M contrib/windows/installer/tools/RestartService.bat
    M contrib/windows/installer/tools/ShowUsage.bat
    M contrib/windows/installer/tools/StartService.bat
    M contrib/windows/installer/tools/StopService.bat
    M contrib/windows/installer/tools/Sync.bat
    M docs/xsl-generic/highlighting/common.xsl
    M docs/xsl-generic/highlighting/xslthl-config.xml
    M docs/xsl-generic/html/highlight.xsl
    M infrastructure/cmake/build/bin_bbackupd.vcxproj.user
    M infrastructure/cmake/build/bin_bbstored.vcxproj.user
    M infrastructure/cmake/build/test_backupstore.vcxproj.user
    M infrastructure/cmake/build/test_backupstorefix.vcxproj.user
    M infrastructure/cmake/build/test_bbackupd.vcxproj.user
    M infrastructure/cmake/build/test_common.vcxproj.user
    M infrastructure/cmake/build/test_httpserver.vcxproj.user
    M infrastructure/cmake/build/test_raidfile.vcxproj.user
    M lib/win32/bsd_getopt.h
    M lib/win32/messages.h
    M lib/win32/messages.rc
    M qdbm/VCmakefile
    M qdbm/misc/VCmakefile-old
    M qdbm/misc/win32check.bat
    M qdbm/qdbm.def

  Log Message:
  -----------
  Fix line endings from Git config change


  Commit: 9b929db17aa5ec3f6871ea6eac4587e72ea15966
      https://github.com/boxbackup/boxbackup/commit/9b929db17aa5ec3f6871ea6eac4587e72ea15966
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M infrastructure/buildenv-testmain-template.cpp
    M infrastructure/makebuildenv.pl.in

  Log Message:
  -----------
  Forward-port small fixes from s3_support_merge_4


  Commit: b3b2daedb9c94ca0ea21b3e6ba4c24ddb4db6423
      https://github.com/boxbackup/boxbackup/commit/b3b2daedb9c94ca0ea21b3e6ba4c24ddb4db6423
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    M appveyor.yml

  Log Message:
  -----------
  Disable Appveyor cache.

I want repeatable builds, even if they take longer, and that's hard to
guarantee with CMake and its cache.


  Commit: 2c6a99cd0162c1ad9bb722593efce56817dbb93a
      https://github.com/boxbackup/boxbackup/commit/2c6a99cd0162c1ad9bb722593efce56817dbb93a
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    M infrastructure/cmake/CMakeLists.txt
    M infrastructure/cmake/windows/CMakeLists.txt

  Log Message:
  -----------
  Add Boost, needed for XML support in S3Simulator and S3Client


  Commit: bd53ff057dc584db93a8d863b46f87aaf47eb1f2
      https://github.com/boxbackup/boxbackup/commit/bd53ff057dc584db93a8d863b46f87aaf47eb1f2
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    M infrastructure/m4/boxbackup_tests.m4
    M lib/backupstore/BackupStoreFile.h
    M lib/backupstore/BackupStoreFileCmbIdx.cpp
    M lib/backupstore/BackupStoreFileEncodeStream.h
    M lib/common/BufferedStream.h
    M lib/common/BufferedWriteStream.h
    M lib/common/CollectInBufferStream.h
    M lib/common/FileStream.h
    M lib/common/MemBlockStream.h
    M lib/common/PartialReadStream.h
    M lib/common/RateLimitingStream.h
    M lib/common/ReadGatherStream.h
    M lib/common/ReadLoggingStream.h
    M lib/common/SelfFlushingStream.h
    M lib/common/ZeroStream.h
    M lib/compress/CompressStream.h
    M lib/raidfile/RaidFileRead.h
    M lib/raidfile/RaidFileWrite.h
    M lib/server/ProtocolUncertainStream.h
    M lib/server/SocketStream.h
    M lib/server/SocketStreamTLS.h
    M lib/server/TcpNice.cpp
    M lib/server/TcpNice.h
    M lib/server/WinNamedPipeStream.h
    M test/bbackupd/testbbackupd.cpp

  Log Message:
  -----------
  Fix warning that overloaded method hides inherited ones

Make this warning an error to prevent it from happening again.


  Commit: 5e2545f75342d808a45313cba325f18c362f9174
      https://github.com/boxbackup/boxbackup/commit/5e2545f75342d808a45313cba325f18c362f9174
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    M infrastructure/m4/boxbackup_tests.m4
    M infrastructure/makebuildenv.pl.in

  Log Message:
  -----------
  Detect which debugger to use in t-gdb scripts: lldb or gdb

Should make debugging on Mac and BSD less painful.


  Commit: d955ffd128c1fd8d0658d5d441b61278d2a83db3
      https://github.com/boxbackup/boxbackup/commit/d955ffd128c1fd8d0658d5d441b61278d2a83db3
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    M infrastructure/travis-build.sh

  Log Message:
  -----------
  Travis build script: add extra debugging.

This script can be useful as a shortcut for command-line builds, but not if you
forget to set TEST_TARGET, so now it errors if you do.


  Commit: 6d50c4c2e8b130cfdb8cbd6bbdf254a356e335f5
      https://github.com/boxbackup/boxbackup/commit/6d50c4c2e8b130cfdb8cbd6bbdf254a356e335f5
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    M lib/backupclient/BackupClientRestore.cpp
    M lib/backupstore/BackupClientFileAttributes.cpp
    M lib/backupstore/BackupFileSystem.cpp
    M lib/backupstore/BackupStoreFile.cpp
    M lib/backupstore/BackupStoreRefCountDatabase.cpp
    M lib/bbackupd/BackupDaemon.cpp
    M lib/bbackupquery/BackupQueries.cpp
    M lib/common/InvisibleTempFileStream.cpp
    M lib/common/NamedLock.cpp
    M lib/common/Test.cpp
    M lib/httpserver/S3Simulator.cpp
    M lib/raidfile/RaidFileWrite.cpp
    M lib/server/Daemon.cpp
    M lib/server/ServerControl.cpp
    M lib/server/ServerStream.h
    M lib/win32/emu.h
    M test/backupstore/testbackupstore.cpp
    M test/backupstorefix/testbackupstorefix.cpp
    M test/backupstorepatch/testbackupstorepatch.cpp
    M test/basicserver/testbasicserver.cpp
    M test/bbackupd/testbbackupd.cpp
    M test/httpserver/testhttpserver.cpp
    M test/raidfile/testraidfile.cpp

  Log Message:
  -----------
  Remove link and unlink macros on Windows.

They provided source-code compatibility with the POSIX versions of these
functions, but they conflict with Boost. Replace with EMU_LINK and
EMU_UNLINK everywhere.


Compare: https://github.com/boxbackup/boxbackup/compare/3ede4eef7f1a...6d50c4c2e8b1


More information about the Boxbackup-commit mailing list