diff options
author | Reinhard Tartler <siretart@tauware.de> | 2018-02-20 21:50:22 -0500 |
---|---|---|
committer | Reinhard Tartler <siretart@tauware.de> | 2018-02-20 21:50:22 -0500 |
commit | f6d7cfd710de1bf9d4f6eabab45570bc91941ee1 (patch) | |
tree | 6aed4f8606e47c6ef21c5b1d8bbf7cafa694af6e | |
parent | c81b92946b58b90fe9679a476338e2d2dec8df67 (diff) | |
parent | f28f88e5e72ba1499409047a9d6985eb312c0232 (diff) |
Merge branch 'upstream'
126 files changed, 2636 insertions, 8019 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..11b61ab9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,11 @@ +# https://help.github.com/articles/dealing-with-line-endings/ +# Set the default behavior, in case people don't have core.autocrlf set. +* text=auto + +# Declare files that will always have CRLF line endings on checkout. +*.sln text eol=crlf +*.vcxproj.user text eol=crlf + +# Denote all files that are truly binary and should not be modified. +*.png binary +*.jpg binary @@ -16,12 +16,14 @@ contrib/solaris/bbstored-manifest.xml contrib/solaris/bbstored-smf-method contrib/windows/installer/boxbackup.mpi infrastructure/BoxPlatform.pm +infrastructure/cmake/build infrastructure/makebuildenv.pl infrastructure/makedistribution.pl infrastructure/makeparcels.pl lib/bbackupquery/makedocumentation.pl lib/common/BoxConfig.h lib/common/BoxConfig.h.in +lib/common/BoxConfig.cmake.h lib/common/BoxPortsAndFiles.h lib/common/BoxVersion.h lib/common/makeexception.pl @@ -60,8 +62,8 @@ test/*/*.memleaks # built by makebuildenv.pl test/*/_main.cpp -test/*/_t -test/*/_t-gdb +test/*/t +test/*/t-gdb bin/*/autogen_*.cpp bin/*/autogen_*.h lib/*/autogen_*.cpp @@ -75,9 +77,35 @@ qdbm/libqdbm.a qdbm/qdbm.pc qdbm/qdbm.spec qdbm/LTmakefile +qdbm/cbcodec +qdbm/cbtest +qdbm/crmgr +qdbm/crtest +qdbm/crtsv +qdbm/dpmgr +qdbm/dptest +qdbm/dptsv +qdbm/hvmgr +qdbm/hvtest +qdbm/libqdbm.so +qdbm/libqdbm.so.14 +qdbm/libqdbm.so.14.13.0 +qdbm/odidx +qdbm/odmgr +qdbm/odtest +qdbm/qmttest +qdbm/rlmgr +qdbm/rltest +qdbm/vlmgr +qdbm/vltest +qdbm/vltsv # development *.orig *.patch .*.swo .*.swp + +# generated documentation +docs/htmlguide +docs/man diff --git a/.travis.yml b/.travis.yml index 3f4e75ef..57bd36f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,25 +12,37 @@ sudo: false addons: apt: + # We need cmake > 2.8.7 + # https://github.com/travis-ci/travis-ci/issues/4631#issuecomment-191153634 + sources: + - george-edison55-precise-backports # cmake 3.2.3 / doxygen 1.8.3 packages: + - cmake + - cmake-data + - libboost-dev - libdb-dev - libreadline-dev - libssl-dev - libwww-perl + - time - xsltproc - zlib1g-dev -before_script: - - ccache -s - - ./bootstrap - - ./configure CC="ccache $CC" CXX="ccache $CXX" - - grep CXX config.status - - make - env: - TEST_TARGET=debug - TEST_TARGET=release + - BUILD=cmake TEST_TARGET=debug + - BUILD=cmake TEST_TARGET=release + +os: + - linux + - osx + +matrix: + exclude: + # No point testing both GCC and Clang on Mac OS X, as they're the same thing. + - os: osx + compiler: gcc script: - - ./runtest.pl ALL $TEST_TARGET - - ccache -s + - env EXTRA_MAKE_ARGS=-j2 ./infrastructure/travis-build.sh diff --git a/appveyor.yml b/appveyor.yml index cbca569f..d75eff77 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.0.{build}-{branch} +version: 0.12.{branch}.appveyor_{build} clone_depth: 1 @@ -8,112 +8,102 @@ skip_tags: true os: Windows Server 2012 platform: -# - x86 -# - x64 - - Win32 + - Win32 # CMake sucks + - x64 configuration: - Debug - Release environment: - VisualStudioVersion: 10.0 - Generator: Visual Studio 10 - OPENSSL_VERSION: 1.0.2f + VisualStudioVersion: 11.0 + Generator_Base: Visual Studio 11 2012 + OPENSSL_VERSION: 1.1.0f PCRE_VERSION: 8.38 - -cache: - - '..\zlib-1.2.8' - - '..\zlib-%PLATFORM%' - - '..\openssl-%OPENSSL_VERSION%.tar.gz' - - '..\openssl-%OPENSSL_VERSION%' - - '..\openssl-%PLATFORM%' - - '..\pcre-%PCRE_VERSION%.zip' - - '..\pcre-%PCRE_VERSION%' - - '..\pcre-%PLATFORM%' - - 'infrastructure\cmake\build' + CMAKE_UNIBUILD_DIR: '%APPVEYOR_BUILD_FOLDER%\..\cmake' + BOXBACKUP_VERSION_BASE: 0.12 init: # Uncomment the following two lines to enable RDP access to the virtual machine for debugging. # - reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp" /v UserAuthentication /t REG_DWORD /d 0 /f # - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) + - ps: $env:date_string = Get-Date -Format "yyMMdd" + - ps: $env:sane_platform = $($env:PLATFORM.replace("Win32", "x86")) + # http://help.appveyor.com/discussions/problems/2874-how-can-i-add-commit-id-to-build-version + - ps: $env:boxbackup_version_full="$env:BOXBACKUP_VERSION_BASE.$env:APPVEYOR_REPO_BRANCH.$env:date_string.$($env:APPVEYOR_REPO_COMMIT.substring(0,7))" + - ps: Update-AppveyorBuild -Version "$env:boxbackup_version_full" + - ps: $env:compiled_version="$($env:boxbackup_version_full)_Win_$($env:sane_platform)_$($env:CONFIGURATION)" + # The only way to switch between 32-bit and 64-bit compilers appears to be to append " Win64" + # to the generator name if you want a 64-bit build (x64 platform): + - ps: $env:generator_name="$($env:Generator_Base)$(if ($env:PLATFORM.equals('x64')) {' Win64'})" + +# scripts that run after cloning repository (before the build step, not after!) +install: + # test_bbackupd needs 7zip (or cmake -E tar) to extract tar archives on Windows: + - cinst -y --limit-output 7zip.commandline nsis.portable + - dir "c:\Program Files" + - dir "c:\Program Files (x86)" + # We don't need strawberryperl on AppVeyor because there is already a Perl in c:\Perl. + # If you are doing this on a fresh box for development, you would probably want to + # install Chocolatey and then run: + # cinst -y cmake.portable strawberryperl git vim visualstudio2012wdx + # We install cmake.portable instead of cmake, to get it on the path again + # <http://disq.us/p/xdknrt>. + + - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86' + - if not exist %CMAKE_UNIBUILD_DIR% md %CMAKE_UNIBUILD_DIR% + - cd %CMAKE_UNIBUILD_DIR% + # We need to specify the generator here, in case the user has more than one installed. + # CMake always seems to default to the latest version of Visual Studio, not the one on + # the current PATH. + - echo cmake -G "%generator_name%" + -DBOXBACKUP_VERSION=%compiled_version% + -DSUB_CMAKE_EXTRA_ARGS="-- /verbosity:minimal" + %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\windows + - cmake -G "%generator_name%" + -DBOXBACKUP_VERSION=%compiled_version% + -DSUB_CMAKE_EXTRA_ARGS="-- /verbosity:minimal" + %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\windows + + # Leave the current directory in the correct place to find the solution file using its relative path above. + +# Remove Xamarin to remove 500 lines of junk from build logs +# http://help.appveyor.com/discussions/problems/4569-the-target-_convertpdbfiles-listed-in-a-beforetargets-attribute-at-c-does-not-exist-in-the-project-and-will-be-ignored +before_build: + - del "C:\Program Files (x86)\MSBuild\4.0\Microsoft.Common.Targets\ImportAfter\Xamarin.Common.targets" build: parallel: true - project: infrastructure/cmake/build/BoxBackup.sln - -install: - # Show compiled files restored from cache - - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build - - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\bin_bbackupd.dir - - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\bin_bbackupd.dir\%CONFIGURATION% - - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\%PLATFORM% - - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\%PLATFORM%\%CONFIGURATION% - - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\%PLATFORM%\%CONFIGURATION%\ALL_BUILD + project: ..\cmake\BoxBackup_Windows.sln + verbosity: minimal - - cinst strawberryperl 7zip.commandline cmake - - # - dir "C:\Program Files\Microsoft SDKs\Windows" - # - dir "C:\Program Files\Microsoft SDKs\Windows\v7.1" - # - dir "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin" +test_script: + - cd %CMAKE_UNIBUILD_DIR%\Build\boxbackup + # - dir + # - dir bin_bbackupd.dir + # - dir %PLATFORM% + # - dir %PLATFORM%\%CONFIGURATION% + - ctest -C %CONFIGURATION% -V --interactive-debug-mode 0 - - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86' + # After running tests successfully, build the artifacts that we want to upload: + - cmake --build . --config %CONFIGURATION% --target package - - cd %APPVEYOR_BUILD_FOLDER%\.. - - if not exist zlib128.zip appveyor DownloadFile "http://zlib.net/zlib128.zip" - - 7za x -aoa zlib128.zip - - cd zlib-1.2.8 - - cmake -G "%Generator%" -A %PLATFORM% -DCMAKE_INSTALL_PREFIX="..\zlib-%PLATFORM%" . - # We need to build both versions, debug and release, because cmake requires both to be - # present to generate its multi-configuration project files for Visual Studio/MSBuild. - - msbuild INSTALL.vcxproj /m /p:Configuration=Debug /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" - - msbuild INSTALL.vcxproj /m /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" - - - cd %APPVEYOR_BUILD_FOLDER%\.. - - if not exist openssl-%OPENSSL_VERSION%.tar.gz appveyor DownloadFile "https://www.openssl.org/source/openssl-%OPENSSL_VERSION%.tar.gz" - - 7za x -aoa openssl-%OPENSSL_VERSION%.tar.gz - - 7za x -aoa openssl-%OPENSSL_VERSION%.tar - - cd openssl-%OPENSSL_VERSION% - - perl Configure debug-VC-WIN32 no-asm --prefix="%APPVEYOR_BUILD_FOLDER%\..\openssl-%PLATFORM%" - - ms\do_ms - - nmake /s /f ms\nt.mak - - nmake /s /f ms\nt.mak install - - - cd %APPVEYOR_BUILD_FOLDER%\.. - - if not exist pcre-%PCRE_VERSION%.zip appveyor DownloadFile "http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-%PCRE_VERSION%.zip" - - 7za x -aoa pcre-%PCRE_VERSION%.zip - - cd %APPVEYOR_BUILD_FOLDER%\.. - - cd pcre-%PCRE_VERSION% - - cmake -G "%Generator%" -A %PLATFORM% -DCMAKE_INSTALL_PREFIX="..\pcre-%PLATFORM%" . + # AppVeyor refuses to package files outside of the project directory, so we need to push them: - dir - # We need to build both versions, debug and release, because cmake requires both to be - # present to generate its multi-configuration project files for Visual Studio/MSBuild. - - msbuild INSTALL.vcxproj /m /p:Configuration=Debug /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" - - msbuild INSTALL.vcxproj /m /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" - - cd %APPVEYOR_BUILD_FOLDER%\.. - - dir - - dir pcre-%PLATFORM% - - dir pcre-%PLATFORM%\bin - - dir pcre-%PLATFORM%\lib - - - cd %APPVEYOR_BUILD_FOLDER% - - cd infrastructure\cmake\build - - cmake -G "%Generator%" -A %PLATFORM% .. - - cd %APPVEYOR_BUILD_FOLDER% - - # Show files after build - - dir %APPVEYOR_BUILD_FOLDER%\..\zlib-1.2.8 - - dir %APPVEYOR_BUILD_FOLDER%\..\zlib-%PLATFORM% - - dir %APPVEYOR_BUILD_FOLDER%\..\openssl-%OPENSSL_VERSION% - - dir %APPVEYOR_BUILD_FOLDER%\..\openssl-%PLATFORM% - - dir %APPVEYOR_BUILD_FOLDER%\..\pcre-%PCRE_VERSION% - - dir %APPVEYOR_BUILD_FOLDER%\..\pcre-%PLATFORM% - - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build - - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\bin_bbackupd.dir - - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\%PLATFORM% - - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\%PLATFORM%\%CONFIGURATION% - -test_script: - - cd %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build - - ctest -C %CONFIGURATION% -V + - appveyor PushArtifact -path BoxBackup-%compiled_version%.zip -DeploymentName BoxBackup-%compiled_version% + - appveyor PushArtifact -path BoxBackup-%compiled_version%.exe -DeploymentName BoxBackup-%compiled_version% + +deploy: + - provider: GitHub + release: BoxBackup-$(boxbackup_version_full) + artifact: BoxBackup-$(compiled_version) + description: "Windows client binaries auto-built by AppVeyor" + draft: false + prerelease: true + auth_token: + secure: WZi3MJGA5zIIAAij0if4auYeltJlyWUOePTYlCGvrNrgEVjYRkqILHzvVKDnLn43 + on: + branch: + - master + - windows_binary_packages diff --git a/bin/bbstoreaccounts/bbstoreaccounts.cpp b/bin/bbstoreaccounts/bbstoreaccounts.cpp index f2e3df95..6a173680 100644 --- a/bin/bbstoreaccounts/bbstoreaccounts.cpp +++ b/bin/bbstoreaccounts/bbstoreaccounts.cpp @@ -27,7 +27,6 @@ #include "BoxPortsAndFiles.h" #include "HousekeepStoreAccount.h" #include "MainHelper.h" -#include "NamedLock.h" #include "RaidFileController.h" #include "StoreStructure.h" #include "UnixUser.h" diff --git a/bin/bbstored/bbstored-certs.in b/bin/bbstored/bbstored-certs.in index 85560748..00085662 100755 --- a/bin/bbstored/bbstored-certs.in +++ b/bin/bbstored/bbstored-certs.in @@ -288,7 +288,7 @@ sub get_csr_common_name my $subject; while(<CSRTEXT>) { - $subject = $1 if m/Subject:.+?CN=([-\.\w]+)/ + $subject = $1 if m/Subject:.+?CN\s?=\s?([-\.\w]+)/; } close CSRTEXT; diff --git a/configure.ac b/configure.ac index 272044f7..f9f481d5 100644 --- a/configure.ac +++ b/configure.ac @@ -107,7 +107,6 @@ AX_CONFIG_SCRIPTS([bin/bbackupd/bbackupd-config contrib/solaris/bbstored-smf-method contrib/windows/installer/boxbackup.mpi infrastructure/makebuildenv.pl - infrastructure/makeparcels.pl infrastructure/makedistribution.pl lib/bbackupquery/makedocumentation.pl lib/common/makeexception.pl @@ -124,8 +123,7 @@ AC_OUTPUT # Configure the Box build system echo -if ! $PERL ./infrastructure/makebuildenv.pl \ -|| ! $PERL ./infrastructure/makeparcels.pl; then +if ! $PERL ./infrastructure/makebuildenv.pl; then echo "Making infrastructure failed!" exit 1 fi diff --git a/infrastructure/BoxPlatform.pm.in b/infrastructure/BoxPlatform.pm.in index 8f9daa81..325e56c3 100644 --- a/infrastructure/BoxPlatform.pm.in +++ b/infrastructure/BoxPlatform.pm.in @@ -47,16 +47,8 @@ BEGIN } elsif ($build_os eq 'SunOS') { - if ($build_os_ver <= 5.10) - { - $make_command = 'gmake'; - $bsd_make = 0; - } - else - { - $make_command = 'bmake'; - $bsd_make = 1; - } + $make_command = 'gmake'; + $bsd_make = 0; } else { @@ -127,6 +119,11 @@ BEGIN $platform_link_line_extra = '-L/sw/lib '; } } + + if ($target_windows) + { + $platform_exe_ext = '.exe'; + } } sub make_flag diff --git a/infrastructure/cmake/CMakeLists.txt b/infrastructure/cmake/CMakeLists.txt index a9bd549f..65f59eb8 100644 --- a/infrastructure/cmake/CMakeLists.txt +++ b/infrastructure/cmake/CMakeLists.txt @@ -1,17 +1,16 @@ cmake_minimum_required(VERSION 2.6) + +find_program(CCACHE_PROGRAM ccache) +if(CCACHE_PROGRAM) + # Support Unix Makefiles and Ninja + set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") +endif() + project(BoxBackup) enable_testing() set(base_dir ${CMAKE_SOURCE_DIR}/../..) -macro(cmake_to_native_path cmake_path native_path) - if(WIN32) - string(REPLACE "/" "\\" ${native_path} "${cmake_path}") - else() - set(${native_path} "${cmake_path}") - endif() -endmacro() - set(files_to_configure bin/bbackupd/bbackupd-config bin/bbstored/bbstored-certs @@ -31,7 +30,6 @@ set(files_to_configure contrib/windows/installer/boxbackup.mpi infrastructure/BoxPlatform.pm infrastructure/makebuildenv.pl - infrastructure/makeparcels.pl infrastructure/makedistribution.pl lib/bbackupquery/makedocumentation.pl lib/common/BoxPortsAndFiles.h @@ -56,22 +54,64 @@ set(files_to_configure include(FindPerl) set(TARGET_PERL ${PERL_EXECUTABLE}) +function(replace_file_if_different dest_file source_file) + execute_process( + COMMAND "${CMAKE_COMMAND}" -E + copy_if_different "${source_file}" "${dest_file}") + execute_process( + COMMAND "${CMAKE_COMMAND}" -E + remove "${source_file}") +endfunction() + +function(move_file_if_exists source_file dest_file) + if(EXISTS "${source_file}") + execute_process( + COMMAND "${CMAKE_COMMAND}" -E + rename "${source_file}" "${dest_file}") + endif() +endfunction() + foreach(file_to_configure ${files_to_configure}) - configure_file("${base_dir}/${file_to_configure}.in" "${base_dir}/${file_to_configure}" @ONLY) + configure_file("${base_dir}/${file_to_configure}.in" "${base_dir}/${file_to_configure}.out" @ONLY) + replace_file_if_different( + "${base_dir}/${file_to_configure}" + "${base_dir}/${file_to_configure}.out") endforeach() -file(READ "${base_dir}/infrastructure/buildenv-testmain-template.cpp" test_template) +# If BOXBACKUP_VERSION is defined when running CMake (as the AppVeyor config does), use it +# as-is, since it contains the full version number, branch, and platform (Win32/Win64): +if(BOXBACKUP_VERSION) + set(boxbackup_version ${BOXBACKUP_VERSION}) + # Remove CPACK_SYSTEM_NAME from the default CPACK_PACKAGE_NAME, because it's already + # included in the CPACK_PACKAGE_VERSION: + set(CPACK_PACKAGE_FILE_NAME ${CMAKE_PROJECT_NAME}-${boxbackup_version}) +else() + # Work out the current Box version (requires Perl) and update lib/common/BoxVersion.h, + # but only if it has changed, to avoid unnecessary complete rebuilds due to timestamps. + execute_process( + COMMAND ${PERL_EXECUTABLE} ${base_dir}/infrastructure/cmake/getversion.pl + WORKING_DIRECTORY ${base_dir}/infrastructure + RESULT_VARIABLE status + OUTPUT_VARIABLE boxbackup_version + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_VARIABLE command_output) + if(NOT status EQUAL 0) + message(FATAL_ERROR "Failed to execute: " + "${PERL_EXECUTABLE} ${base_dir}/infrastructure/cmake/getversion.pl: " + "status ${status}: ${command_output}") + endif() +endif() + +file(WRITE "${base_dir}/lib/common/BoxVersion.h.new" + "#define BOX_VERSION \"${boxbackup_version}\"\n") +replace_file_if_different( + "${base_dir}/lib/common/BoxVersion.h" + "${base_dir}/lib/common/BoxVersion.h.new") +add_definitions(-DBOX_CMAKE -DNEED_BOX_VERSION_H) -execute_process( - COMMAND ${PERL_EXECUTABLE} ${base_dir}/infrastructure/msvc/getversion.pl - RESULT_VARIABLE status - OUTPUT_VARIABLE command_output - ERROR_VARIABLE command_output) -if(NOT status EQUAL 0) - message(FATAL_ERROR "Failed to execute: " - "${PERL_EXECUTABLE} ${base_dir}/infrastructure/msvc/getversion.pl: " - "status ${status}: ${command_output}") +if(WIN32) + add_definitions(-DWIN32) endif() # Parsing Makefile.extra files in CMake script is a pain, so the relevant rules for @@ -107,8 +147,8 @@ foreach(exception_file ${exception_files}) endforeach() set(protocol_files - lib/backupstore/backupprotocol.txt - test/basicserver/testprotocol.txt + lib/backupstore/BackupProtocol.txt + test/basicserver/TestProtocol.txt ) foreach(protocol_file ${protocol_files}) @@ -128,7 +168,7 @@ foreach(protocol_file ${protocol_files}) endforeach() set(documentation_files - lib/bbackupquery/documentation.txt + lib/bbackupquery/Documentation.txt ) foreach(documentation_file ${documentation_files}) @@ -147,13 +187,15 @@ foreach(documentation_file ${documentation_files}) set(${module_name}_extra_files ${${module_name}_extra_files} ${output_file}) endforeach() +set(testmain_template_cpp + "${base_dir}/infrastructure/buildenv-testmain-template.cpp" +) +set(release_or_debug_dir + "${base_dir}/$<$<CONFIG:Debug>:debug>$<$<CONFIG:Release>:release>$<$<CONFIG:RelWithDebInfo>:release>" +) + file(STRINGS ${base_dir}/modules.txt module_deps REGEX "^[^#]") -# qdbm, lib/common and lib/win32 aren't listed in modules.txt, so hard-code them. -foreach(module_dep - "qdbm" - "lib/win32" - "lib/common qdbm lib/win32" - ${module_deps}) +foreach(module_dep ${module_deps}) string(REGEX MATCH "([^ ]+)[ ]*(.*)" valid_module_line ${module_dep}) if(valid_module_line) @@ -165,16 +207,19 @@ foreach(module_dep set(module_path ${base_dir}/${module_dir}) string(REPLACE "/" "_" module_name ${CMAKE_MATCH_1}) string(REPLACE "/" "_" dependencies "${CMAKE_MATCH_2}") - file(GLOB module_files ${module_path}/*.c ${module_path}/*.cpp - ${module_path}/*.h) - set(module_files ${module_files} ${${module_name}_extra_files}) - # everything except qdbm, lib/common and lib/win32 implicitly depend on - # lib/common, so express that dependency here. - if(module_name MATCHES "^(qdbm|lib_(common|win32))$") + # We are replacing QDBM's normal build system, and we only want to include + # the modules that we actually need, to avoid warnings about duplicate + # definitions, and potential conflicts with Box Backup code in future, so + # we specify the C files to compile in explicitly. + if(module_name STREQUAL "qdbm") + file(GLOB module_files ${module_path}/depot.c ${module_path}/myconf.c) else() - set(dependencies "${dependencies} lib_common") + file(GLOB module_files ${module_path}/*.cpp ${module_path}/*.h) endif() + + set(module_files ${module_files} ${${module_name}_extra_files}) + string(REGEX REPLACE "^ " "" dependencies "${dependencies}") string(REGEX REPLACE " $" "" dependencies "${dependencies}") @@ -184,7 +229,26 @@ foreach(module_dep if(DEBUG) message(STATUS "add executable '${module_name}': '${module_files}'") endif() + add_executable(${module_name} ${module_files}) + # Rename the output executable from bin_bbackupd(.exe) to bbackupd(.exe): + set_target_properties(${module_name} PROPERTIES + OUTPUT_NAME "${bin_name}") + + # Use a custom post-build command instead of install(...) to install + # binaries ready for running tests, because we don't want "make install" to + # do this too, and absolute-path installations break the CPack generators. + add_custom_command(TARGET ${module_name} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy + "$<TARGET_FILE:${module_name}>" + "${release_or_debug_dir}/${module_dir}/${bin_name}${CMAKE_EXECUTABLE_SUFFIX}" + VERBATIM) + + # For "make install" and CPack generators: + install(TARGETS ${module_name} RUNTIME + CONFIGURATIONS Debug;Release + DESTINATION "." + COMPONENT Applications) elseif(module_name MATCHES "^test_") string(REGEX MATCH "^test_(.*)" valid_test ${module_name}) set(test_name ${CMAKE_MATCH_1}) @@ -194,13 +258,52 @@ foreach(module_dep message(STATUS "add test '${module_name}': '${module_files}'") endif() - string(REPLACE "TEST_NAME" ${test_name} test_main "${test_template}") - file(WRITE "${module_path}/_main.cpp" "${test_main}") - add_executable(${module_name} ${module_files} - "${module_path}/_main.cpp") + set(module_files ${module_files} "${testmain_template_cpp}") + add_executable(${module_name} ${module_files}) + + # Use a custom post-build command instead of install(...) to install + # binaries ready for running tests, because we don't want "make install" to + # do this too, and absolute-path installations break the CPack generators. + add_custom_command(TARGET ${module_name} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy + "$<TARGET_FILE:${module_name}>" + "${release_or_debug_dir}/${module_dir}/${bin_name}${CMAKE_EXECUTABLE_SUFFIX}" + VERBATIM) + + if(${APPVEYOR_MODE}) + set(appveyor_runtest_pl_switch -a) + else() + set(appveyor_runtest_pl_switch) + endif() + + if(WIN32) + set(test_command_internal "$<TARGET_FILE_NAME:${module_name}>") + else() + set(test_command_internal "./$<TARGET_FILE_NAME:${module_name}>") + endif() + + target_compile_definitions(${module_name} PRIVATE + -DTEST_EXECUTABLE="${test_command_internal}") add_test(NAME ${test_name} - COMMAND ${PERL_EXECUTABLE} ${base_dir}/runtest.pl.in ${test_name} - $<CONFIG> WORKING_DIRECTORY ${base_dir}) + COMMAND ${PERL_EXECUTABLE} ${base_dir}/runtest.pl + ${appveyor_runtest_pl_switch} -c ${test_name} + $<$<CONFIG:Debug>:DEBUG>$<$<CONFIG:Release>:RELEASE>$<$<CONFIG:RelWithDebInfo>:RELEASE> + "$<TARGET_FILE:${module_name}>" "${test_command_internal}" + WORKING_DIRECTORY ${base_dir}) + + if(${APPVEYOR_MODE}) + execute_process(COMMAND appveyor AddTest -Name ${test_name} + -Framework Custom -FileName "") + endif() + + # It helps with debugging if the test depends on another step which + # prepares the target directory, and is always out of date. + add_custom_target(${module_name}-prepare + COMMAND ${PERL_EXECUTABLE} ${base_dir}/runtest.pl + -n -c ${test_name} + $<$<CONFIG:Debug>:DEBUG>$<$<CONFIG:Release>:RELEASE>$<$<CONFIG:RelWithDebInfo>:RELEASE> + "$<TARGET_FILE:${module_name}>" "${test_command_internal}" + WORKING_DIRECTORY ${base_dir}) elseif(module_name MATCHES "^(lib_.*|qdbm)$") if(DEBUG) message(STATUS "add library '${module_name}': '${module_files}'") @@ -210,19 +313,6 @@ foreach(module_dep message(FATAL_ERROR "Unsupported module type: " ${module_name}) endif() - if(module_name MATCHES "^(bin|test)_") - # We need to install binaries in specific places so that test - # runner can find them: - install(FILES "$<TARGET_FILE:${module_name}>" - CONFIGURATIONS Debug - DESTINATION "${base_dir}/debug/${module_dir}" - RENAME "${bin_name}${CMAKE_EXECUTABLE_SUFFIX}") - install(FILES "$<TARGET_FILE:${module_name}>" - CONFIGURATIONS Release - DESTINATION "${base_dir}/release/${module_dir}" - RENAME "${bin_name}${CMAKE_EXECUTABLE_SUFFIX}") - endif() - target_compile_definitions(${module_name} PRIVATE -DBOX_MODULE="${module_name}") if(dependencies) @@ -254,47 +344,401 @@ foreach(module_dep endif() endforeach() -#include(ExternalProject) -#ExternalProject_Add(pcre -# PREFIX "../pcre" -# BUILD_COMMAND "${CMAKE_EXECUTABLE +if(WIN32) + install(FILES ${base_dir}/bin/bbackupd/win32/NotifySysAdmin.vbs + DESTINATION "." COMPONENT Extras) + install(FILES ${base_dir}/bin/bbackupd/win32/bbackupd.conf + DESTINATION "." COMPONENT Extras) +else() + install(FILES ${base_dir}/bin/bbackupd/bbackupd-config + DESTINATION "." COMPONENT Extras) +endif() -# Tell QDBM not to build itself as a DLL, because we want to link statically to it. -target_compile_definitions(qdbm PUBLIC -DQDBM_STATIC) +# We can't do anything conditional on CMAKE_BUILD_TYPE because that's not valid for multi-configuration +# generators such as MSVC. We need to use a generator expression instead. +target_compile_definitions(lib_common PUBLIC $<$<CONFIG:Release>:BOX_RELEASE_BUILD>) -# Silence some less-useful warnings -if(MSVC) - add_definitions(/wd4996 /wd4291) - # target_link_libraries(qdbm PRIVATE /IGNORE:LNK4006) - set_property(TARGET qdbm PROPERTY CMAKE_STATIC_LINKER_FLAGS /IGNORE:LNK4006) -endif(MSVC) +# Detect platform features and write BoxConfig.h.in. Reuse code from +# infrastructure/m4/boxbackup_tests.m4 where possible + +include(CheckCXXCompilerFlag) +include(CheckCXXSourceCompiles) +include(CheckFunctionExists) +include(CheckIncludeFiles) +include(CheckLibraryExists) +include(CheckSymbolExists) + +set(boxconfig_h_file "${CMAKE_BINARY_DIR}/BoxConfig.h.in") +file(REMOVE "${boxconfig_h_file}") +file(WRITE "${boxconfig_h_file}" "// Auto-generated by CMake. Do not edit.\n") + +if(WIN32) + target_link_libraries(lib_common PUBLIC ws2_32 gdi32) +endif() -target_link_libraries(lib_common PUBLIC ws2_32 gdi32) +# On Windows we want to statically link zlib to make debugging and distribution easier, +# but FindZLIB.cmake doesn't offer that as an option, so we have to go through some +# contortions to "find" the correct library. ZLIB_ROOT is required in this case. +if(WIN32) + if(NOT DEFINED ZLIB_ROOT) + message(FATAL_ERROR "You must set ZLIB_ROOT to point to include/zlib.h and lib/zlibstatic[d].lib on Windows") + endif() -# Link to ZLib -include_directories(${base_dir}/../zlib-win32/include) -find_library(zlibstaticd_lib_path zlibstaticd ${base_dir}/../zlib-win32/lib) -find_library(zlibstatic_lib_path zlibstatic ${base_dir}/../zlib-win32/lib) -target_link_libraries(lib_compress PUBLIC debug ${zlibstaticd_lib_path}) -target_link_libraries(lib_compress PUBLIC optimized ${zlibstatic_lib_path}) + message(STATUS "Searching for Zlib in: ${ZLIB_ROOT}") + find_path(ZLIB_INCLUDE_DIR zlib.h PATHS ${ZLIB_ROOT}/include NO_DEFAULT_PATH) + include_directories(${ZLIB_INCLUDE_DIR}) + message(STATUS "Found Zlib headers: ${ZLIB_INCLUDE_DIR}") + + # We must link against zlibstaticD if this is a debug build, otherwise + # we have a C runtime mismatch (/MD versus /MDd) and the application + # crashes at runtime. + find_library(ZLIB_LIBRARY_STATIC_DEBUG NAMES zlibstaticd + PATHS ${ZLIB_ROOT}/lib NO_DEFAULT_PATH) + find_library(ZLIB_LIBRARY_STATIC_RELEASE NAMES zlibstatic + PATHS ${ZLIB_ROOT}/lib NO_DEFAULT_PATH) + + target_link_libraries(lib_compress PUBLIC + debug ${ZLIB_LIBRARY_STATIC_DEBUG} + optimized ${ZLIB_LIBRARY_STATIC_RELEASE}) +else() + find_package(ZLIB REQUIRED) + include_directories(${ZLIB_INCLUDE_DIRS}) + target_link_libraries(lib_compress PUBLIC ${ZLIB_LIBRARIES}) +endif() # Link to OpenSSL -include_directories(${base_dir}/../openssl-win32/include) -find_library(libeay32_lib_path libeay32 ${base_dir}/../openssl-win32/lib) -find_library(ssleay32_lib_path ssleay32 ${base_dir}/../openssl-win32/lib) -target_link_libraries(lib_crypto PUBLIC ${libeay32_lib_path} ${ssleay32_lib_path}) +# Workaround for incorrect library suffixes searched by FindOpenSSL: +# https://gitlab.kitware.com/cmake/cmake/issues/17604 +if(WIN32 AND MSVC) + find_package(OpenSSL) + set(OPENSSL_SSL_LIBRARY ${SSL_EAY_RELEASE}) + set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY_RELEASE}) + set(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} crypt32) + find_package_handle_standard_args(OpenSSL + REQUIRED_VARS + OPENSSL_SSL_LIBRARY + OPENSSL_CRYPTO_LIBRARY + OPENSSL_INCLUDE_DIR + VERSION_VAR + OPENSSL_VERSION + FAIL_MESSAGE + "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR" + ) +else() + find_package(OpenSSL REQUIRED) +endif() +include_directories(${OPENSSL_INCLUDE_DIR}) +target_link_libraries(lib_crypto PUBLIC ${OPENSSL_LIBRARIES}) # Link to PCRE -include_directories(${base_dir}/../pcre-win32/include) -target_compile_definitions(lib_common PUBLIC -DPCRE_STATIC) -find_library(pcreposix_lib_path pcreposix ${base_dir}/../pcre-win32/lib) -find_library(pcreposixd_lib_path pcreposixd ${base_dir}/../pcre-win32/lib) -find_library(pcre_lib_path pcre ${base_dir}/../pcre-win32/lib) -find_library(pcred_lib_path pcred ${base_dir}/../pcre-win32/lib) -target_link_libraries(lib_common PUBLIC debug "${pcreposixd_lib_path}" optimized "${pcreposix_lib_path}") -target_link_libraries(lib_common PUBLIC debug "${pcred_lib_path}" optimized "${pcre_lib_path}") +if (WIN32) + if(NOT DEFINED PCRE_ROOT) + message(FATAL_ERROR "You must set PCRE_ROOT to point to include/pcreposix.h and lib/pcreposix[d].lib on Windows") + endif() + + target_compile_definitions(lib_common PUBLIC -DPCRE_STATIC) + find_library(pcreposix_lib_path pcreposix ${PCRE_ROOT}/lib) + find_library(pcreposixd_lib_path pcreposixd ${PCRE_ROOT}/lib) + find_library(pcre_lib_path pcre ${PCRE_ROOT}/lib) + find_library(pcred_lib_path pcred ${PCRE_ROOT}/lib) + target_link_libraries(lib_common PUBLIC debug "${pcreposixd_lib_path}" optimized "${pcreposix_lib_path}") + target_link_libraries(lib_common PUBLIC debug "${pcred_lib_path}" optimized "${pcre_lib_path}") + include_directories(${PCRE_ROOT}/include) +else() + find_package(PkgConfig REQUIRED) + pkg_check_modules(PCRE REQUIRED libpcreposix) + include_directories(${PCRE_INCLUDE_DIRS}) + target_link_libraries(lib_common PUBLIC ${PCRE_LIBRARIES}) + + if(DEBUG) + message(STATUS "Linking PCRE libraries from ${PCRE_LIBRARY_DIRS}: ${PCRE_LIBRARIES}") + endif() +endif() + +list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}") +find_package(Readline) +if(READLINE_FOUND) + include_directories(${Readline_INCLUDE_DIR}) + target_link_libraries(lib_common PUBLIC ${Readline_LIBRARY}) +endif() + +set(boxconfig_cmake_h_dir "${base_dir}/lib/common") +# Get the values of all directories added to the INCLUDE_DIRECTORIES property +# by include_directory() statements, and save it in CMAKE_REQUIRED_INCLUDES +# which check_include_files() uses to set the include file search path: +get_property(CMAKE_REQUIRED_INCLUDES DIRECTORY PROPERTY INCLUDE_DIRECTORIES) +list(APPEND CMAKE_REQUIRED_INCLUDES "${boxconfig_cmake_h_dir}") +# message(STATUS "CMAKE_REQUIRED_INCLUDES=${CMAKE_REQUIRED_INCLUDES}") + +# Save the original BoxConfig.cmake.h so that we can move it back later, +# and not need to recompile everything. +move_file_if_exists( + "${boxconfig_cmake_h_dir}/BoxConfig.cmake.h" + "${boxconfig_cmake_h_dir}/BoxConfig.cmake.h.bak") + +foreach(m4_filename boxbackup_tests.m4 ax_check_mount_point.m4 ax_func_syscall.m4) + file(STRINGS "${base_dir}/infrastructure/m4/${m4_filename}" m4_functions REGEX "^ *AC[_A-Z]+\\(.*\\)$") + foreach(m4_function ${m4_functions}) + if(DEBUG) + message(STATUS "Processing m4_function: ${m4_function}") + endif() + + string(REGEX MATCH .* ac_check_headers ${m4_function}) + if(m4_function MATCHES "^ *AC_CHECK_HEADERS?\\(\\[([a-z./ ]+)\\](.*)\\)$") + if(DEBUG) + message(STATUS "Processing ac_check_headers: ${CMAKE_MATCH_1}") + endif() + + # http://stackoverflow.com/questions/5272781/what-is-common-way-to-split-string-into-list-with-cmake + string(REPLACE " " ";" header_files ${CMAKE_MATCH_1}) + + foreach(header_file ${header_files}) + list(APPEND detect_header_files ${header_file}) + endforeach() + elseif(m4_function MATCHES "^ *AC_CHECK_FUNCS\\(\\[([a-z./_ ]+)\\](.*)\\)$") + if(DEBUG) + message(STATUS "Processing ac_check_funcs: ${CMAKE_MATCH_1}") + endif() + + # http://stackoverflow.com/questions/5272781/what-is-common-way-to-split-string-into-list-with-cmake + string(REPLACE " " ";" function_names ${CMAKE_MATCH_1}) + + foreach(function_name ${function_names}) + list(APPEND detect_functions ${function_name}) + endforeach() + elseif(m4_function MATCHES "^ *AC_CHECK_DECLS\\(\\[([A-Za-z._/ ]+)\\](,,, ..#include <([^>]+)>..)?\\)$") + if(DEBUG) + message(STATUS "Processing ac_check_decls: ${CMAKE_MATCH_1} in ${CMAKE_MATCH_3}") + endif() + + # http://stackoverflow.com/questions/5272781/what-is-common-way-to-split-string-into-list-with-cmake + string(REPLACE " " ";" decl_names "${CMAKE_MATCH_1}") + string(REPLACE " " ";" header_files "${CMAKE_MATCH_3}") + + foreach(decl_name ${decl_names}) + string(TOUPPER ${decl_name} platform_var_name) + string(REGEX REPLACE "[/.]" "_" platform_var_name ${platform_var_name}) + check_symbol_exists("${decl_name}" "${header_files}" HAVE_DECL_${platform_var_name}) + file(APPEND "${boxconfig_h_file}" "#cmakedefine01 HAVE_DECL_${platform_var_name}\n") + endforeach() + elseif(m4_function MATCHES "^ *AC_SEARCH_LIBS\\(\\[([A-Za-z._/ ]+)\\], \\[([A-Za-z._]+)\\]\\)$") + if(DEBUG) + message(STATUS "Processing ac_search_libs: ${CMAKE_MATCH_1} in ${CMAKE_MATCH_2}") + endif() + + set(function_name ${CMAKE_MATCH_1}) + # http://stackoverflow.com/questions/5272781/what-is-common-way-to-split-string-into-list-with-cmake + string(REPLACE " " ";" library_names "${CMAKE_MATCH_2}") + + foreach(library_name ${library_names}) + string(TOUPPER ${library_name} platform_var_name) + check_library_exists(${library_name} ${function_name} "" HAVE_LIB_${platform_var_name}) + if(HAVE_LIB_${platform_var_name}) + target_link_libraries(lib_common PUBLIC ${library_name}) + endif() + endforeach() + elseif(m4_function MATCHES "^ *AC_CHECK_MEMBERS\\(\\[([A-Za-z._/ ]+)\\.([[A-Za-z_]+)\\](,,, ..(#include <([^>]+)>)..)?\\)$") + if(DEBUG) + message(STATUS "Processing ac_check_members: ${CMAKE_MATCH_1}.${CMAKE_MATCH_2} in ${CMAKE_MATCH_5}") + endif() + + set(struct_name "${CMAKE_MATCH_1}") + set(member_name "${CMAKE_MATCH_2}") + set(include_file "${CMAKE_MATCH_5}") + + string(TOUPPER "${struct_name}_${member_name}" platform_var_name) + string(REGEX REPLACE "[/. ]" "_" platform_var_name ${platform_var_name}) + + CHECK_CXX_SOURCE_COMPILES([=[ + #include "BoxConfig.cmake.h" + #include <${include_file}> + int main() + { + ${struct_name} foo; + return sizeof(foo.${member_name}) > 0 ? 0 : 1; + } + ]=] "HAVE_${platform_var_name}") + file(APPEND "${boxconfig_h_file}" "#cmakedefine HAVE_${platform_var_name}\n") + endif() + endforeach() + + # Build an intermediate version of BoxConfig.cmake.h for use in the following tests. + configure_file("${boxconfig_h_file}" "${boxconfig_cmake_h_dir}/BoxConfig.cmake.h") +endforeach() + +list(APPEND detect_header_files mntent.h sys/mnttab.h sys/mount.h sys/param.h) + +foreach(header_file ${detect_header_files}) + list(APPEND detect_header_files ${header_file}) + string(TOUPPER ${header_file} platform_var_name) + string(REGEX REPLACE "[/.]" "_" platform_var_name ${platform_var_name}) + check_include_files(${header_file} HAVE_${platform_var_name}) + file(APPEND "${boxconfig_h_file}" "#cmakedefine HAVE_${platform_var_name}\n") +endforeach() + +if(NOT HAVE_PCREPOSIX_H) + message(FATAL_ERROR "pcreposix.h not found at PCRE_ROOT/include: ${PCRE_ROOT}/include") +endif() + +# PCRE is required, so unconditionally define this: +set(HAVE_REGEX_SUPPORT 1) +file(APPEND "${boxconfig_h_file}" "#cmakedefine HAVE_REGEX_SUPPORT\n") + +foreach(function_name ${detect_functions}) + string(TOUPPER ${function_name} platform_var_name) + string(REGEX REPLACE "[/.]" "_" platform_var_name ${platform_var_name}) + check_function_exists(${function_name} HAVE_${platform_var_name}) + file(APPEND "${boxconfig_h_file}" "#cmakedefine HAVE_${platform_var_name}\n") +endforeach() + +check_symbol_exists(dirfd "dirent.h" HAVE_DECL_DIRFD) +file(APPEND "${boxconfig_h_file}" "#cmakedefine01 HAVE_DECL_DIRFD\n") + +# Emulate ax_check_mount_point.m4 +# These checks are run by multi-line M4 commands which are harder to parse/fake using +# regexps above, so we hard-code them here: +CHECK_CXX_SOURCE_COMPILES([=[ + #include "BoxConfig.cmake.h" + #ifdef HAVE_SYS_PARAM_H + # include <sys/param.h> + #endif + #include <sys/mount.h> + int main() + { + struct statfs foo; + return sizeof(foo.f_mntonname) > 0 ? 0 : 1; + } + ]=] "HAVE_STRUCT_STATFS_F_MNTONNAME") +file(APPEND "${boxconfig_h_file}" "#cmakedefine HAVE_STRUCT_STATFS_F_MNTONNAME\n") +CHECK_CXX_SOURCE_COMPILES([=[ + #include "BoxConfig.cmake.h" + #ifdef HAVE_SYS_PARAM_H + # include <sys/param.h> + #endif + #include <sys/mount.h> + int main() + { + struct statvfs foo; + return sizeof(foo.f_mntonname) > 0 ? 0 : 1; + } + ]=] "HAVE_STRUCT_STATVFS_F_MNTONNAME") +file(APPEND "${boxconfig_h_file}" "#cmakedefine HAVE_STRUCT_STATVFS_F_MNTONNAME\n") +if(HAVE_STRUCT_STATFS_F_MNTONNAME OR + HAVE_STRUCT_STATVFS_F_MNTONNAME OR + HAVE_STRUCT_MNTENT_MNT_DIR OR + HAVE_STRUCT_MNTTAB_MNT_MOUNTP) + + set(HAVE_MOUNTS 1) + file(APPEND "${boxconfig_h_file}" "#cmakedefine HAVE_MOUNTS\n") +endif() + +# Emulate ax_random_device.m4 +if(EXISTS /dev/urandom) + set(RANDOM_DEVICE /dev/urandom) +elseif(EXISTS /dev/arandom) + set(RANDOM_DEVICE /dev/arandom) +elseif(EXISTS /dev/random) + set(RANDOM_DEVICE /dev/random) +endif() +if(RANDOM_DEVICE) + set(HAVE_RANDOM_DEVICE TRUE) +endif() +file(APPEND "${boxconfig_h_file}" "#cmakedefine RANDOM_DEVICE \"${RANDOM_DEVICE}\"\n") +file(APPEND "${boxconfig_h_file}" "#cmakedefine HAVE_RANDOM_DEVICE\n") + +# Build an intermediate version of BoxConfig.cmake.h for use in the following tests: +configure_file("${boxconfig_h_file}" "${boxconfig_cmake_h_dir}/BoxConfig.cmake.h") + +foreach(struct_member_name "struct ucred.uid" "struct ucred.cr_uid") + string(REGEX MATCH "(.*)\\.(.*)" dummy_var ${struct_member_name}) + set(struct_name "${CMAKE_MATCH_1}") + set(member_name "${CMAKE_MATCH_2}") + + string(TOUPPER "${struct_name}_${member_name}" platform_var_name) + string(REGEX REPLACE "[/. ]" "_" platform_var_name ${platform_var_name}) + + CHECK_CXX_SOURCE_COMPILES([=[ + #include "BoxConfig.cmake.h" + + #ifdef HAVE_UCRED_H + # include <ucred.h> + #endif + + #ifdef HAVE_SYS_PARAM_H + # include <sys/param.h> + #endif + + #ifdef HAVE_SYS_UCRED_H + # include <sys/ucred.h> + #endif + + #ifdef HAVE_SYS_SOCKET_H + # include <sys/socket.h> + #endif + + int main() + { + ${struct_name} foo; + return sizeof(foo.${member_name}) > 0 ? 0 : 1; + } + ]=] "HAVE_${platform_var_name}") + file(APPEND "${boxconfig_h_file}" "#cmakedefine HAVE_${platform_var_name}\n") +endforeach() +set(CMAKE_REQUIRED_INCLUDES "") + +# Build the final version of BoxConfig.cmake.h, as a temporary file. +configure_file("${boxconfig_h_file}" "${boxconfig_cmake_h_dir}/BoxConfig.cmake.h.new") + +# Move the original back into place, and then replace it with the +# temporary one if different (which will force a rebuild of everything). +move_file_if_exists( + "${boxconfig_cmake_h_dir}/BoxConfig.cmake.h.bak" + "${boxconfig_cmake_h_dir}/BoxConfig.cmake.h") +replace_file_if_different( + "${boxconfig_cmake_h_dir}/BoxConfig.cmake.h" + "${boxconfig_cmake_h_dir}/BoxConfig.cmake.h.new") + +# Tell QDBM not to build itself as a DLL, because we want to link statically to it. +target_compile_definitions(qdbm PUBLIC -DQDBM_STATIC) + +# Silence some less-useful warnings +if(MSVC) + add_definitions(/wd4291 /wd4710 /wd4820 /wd4996) + set_property(TARGET qdbm PROPERTY CMAKE_STATIC_LINKER_FLAGS /IGNORE:LNK4006) +endif(MSVC) # Define the location of the Perl executable, needed by testbackupstorefix -cmake_to_native_path("${PERL_EXECUTABLE}" perl_executable_native) +file(TO_NATIVE_PATH "${PERL_EXECUTABLE}" perl_executable_native) string(REPLACE "\\" "\\\\" perl_path_escaped ${perl_executable_native}) target_compile_definitions(test_backupstorefix PRIVATE -DPERL_EXECUTABLE="${perl_path_escaped}") + +# Configure test timeouts: +# I've set the timeout to 4 times as long as it took to run on a particular run on Appveyor: +# https://ci.appveyor.com/project/qris/boxbackup/build/job/xm10itascygtu93j +set_tests_properties(common PROPERTIES TIMEOUT 20) +set_tests_properties(crypto PROPERTIES TIMEOUT 10) +set_tests_properties(compress PROPERTIES TIMEOUT 80) +set_tests_properties(raidfile PROPERTIES TIMEOUT 32) +set_tests_properties(basicserver PROPERTIES TIMEOUT 80) +set_tests_properties(backupstore PROPERTIES TIMEOUT 1320) +set_tests_properties(backupstorefix PROPERTIES TIMEOUT 180) +set_tests_properties(backupstorepatch PROPERTIES TIMEOUT 320) +set_tests_properties(backupdiff PROPERTIES TIMEOUT 32) +set_tests_properties(bbackupd PROPERTIES TIMEOUT 1200) +set_tests_properties(s3store PROPERTIES TIMEOUT 20) +set_tests_properties(httpserver PROPERTIES TIMEOUT 40) + +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Box Backup is an open source, completely automatic, on-line backup system") +set(CPACK_PACKAGE_VENDOR "www.BoxBackup.org") +set(CPACK_PACKAGE_DESCRIPTION_FILE "${base_dir}/README.md") +set(CPACK_RESOURCE_FILE_LICENSE "${base_dir}/LICENSE.txt") +set(CPACK_PACKAGE_VERSION ${boxbackup_version}) +set(CPACK_PACKAGE_INSTALL_DIRECTORY "Box Backup") +set(CPACK_COMPONENTS_ALL Applications Extras) +set(CPACK_GENERATOR "ZIP;NSIS") +set(CPACK_NSIS_DISPLAY_NAME "Box Backup") +set(CPACK_NSIS_HELP_LINK "http://www.boxbackup.org/") +set(CPACK_NSIS_URL_INFO_ABOUT "http://www.boxbackup.org/") +set(CPACK_NSIS_CONTACT "boxbackup@boxbackup.org") +set(CPACK_NSIS_MODIFY_PATH ON) +include(CPack) diff --git a/infrastructure/cmake/FindReadline.cmake b/infrastructure/cmake/FindReadline.cmake new file mode 100644 index 00000000..3ba4d21d --- /dev/null +++ b/infrastructure/cmake/FindReadline.cmake @@ -0,0 +1,84 @@ +# https://github.com/bro/cmake/blob/master/FindReadline.cmake +# +# Copyright (c) 1995-2015, The Regents of the University of California +# through the Lawrence Berkeley National Laboratory and the +# International Computer Science Institute. 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 of California, Lawrence Berkeley +# National Laboratory, U.S. Dept. of Energy, International Computer +# Science Institute, nor the names of contributors may be used to endorse +# or promote products derived from this software without specific prior +# written permission. +# +# 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. +# +# Note that some files in the distribution may carry their own copyright +# notices. + +# - Try to find readline include dirs and libraries +# +# Usage of this module as follows: +# +# find_package(Readline) +# +# Variables used by this module, they can change the default behaviour and need +# to be set before calling find_package: +# +# Readline_ROOT_DIR Set this variable to the root installation of +# readline if the module has problems finding the +# proper installation path. +# +# Variables defined by this module: +# +# READLINE_FOUND System has readline, include and lib dirs found +# Readline_INCLUDE_DIR The readline include directories. +# Readline_LIBRARY The readline library. + +find_path(Readline_ROOT_DIR + NAMES include/readline/readline.h +) + +find_path(Readline_INCLUDE_DIR + NAMES readline/readline.h + HINTS ${Readline_ROOT_DIR}/include +) + +find_library(Readline_LIBRARY + NAMES readline + HINTS ${Readline_ROOT_DIR}/lib +) + +if(Readline_INCLUDE_DIR AND Readline_LIBRARY AND Ncurses_LIBRARY) + set(READLINE_FOUND TRUE) +else(Readline_INCLUDE_DIR AND Readline_LIBRARY AND Ncurses_LIBRARY) + FIND_LIBRARY(Readline_LIBRARY NAMES readline) + include(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(Readline DEFAULT_MSG Readline_INCLUDE_DIR Readline_LIBRARY ) + MARK_AS_ADVANCED(Readline_INCLUDE_DIR Readline_LIBRARY) +endif(Readline_INCLUDE_DIR AND Readline_LIBRARY AND Ncurses_LIBRARY) + +mark_as_advanced( + Readline_ROOT_DIR + Readline_INCLUDE_DIR + Readline_LIBRARY +) diff --git a/infrastructure/cmake/build/bin_bbackupd.vcxproj.user b/infrastructure/cmake/build/bin_bbackupd.vcxproj.user index 51928554..fa1f3d34 100755 --- a/infrastructure/cmake/build/bin_bbackupd.vcxproj.user +++ b/infrastructure/cmake/build/bin_bbackupd.vcxproj.user @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LocalDebuggerCommandArguments>testfiles\bbackupd.conf</LocalDebuggerCommandArguments>
- <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\bbackupd</LocalDebuggerWorkingDirectory>
- <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
- </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LocalDebuggerCommandArguments>testfiles\bbackupd.conf</LocalDebuggerCommandArguments> + <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\bbackupd</LocalDebuggerWorkingDirectory> + <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/infrastructure/cmake/build/bin_bbstored.vcxproj.user b/infrastructure/cmake/build/bin_bbstored.vcxproj.user index e48b8383..339cddee 100755 --- a/infrastructure/cmake/build/bin_bbstored.vcxproj.user +++ b/infrastructure/cmake/build/bin_bbstored.vcxproj.user @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LocalDebuggerCommandArguments>testfiles/bbstored.conf</LocalDebuggerCommandArguments>
- <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\backupstorefix</LocalDebuggerWorkingDirectory>
- <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
- </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LocalDebuggerCommandArguments>testfiles/bbstored.conf</LocalDebuggerCommandArguments> + <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\backupstorefix</LocalDebuggerWorkingDirectory> + <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/infrastructure/cmake/build/test_backupstore.vcxproj.user b/infrastructure/cmake/build/test_backupstore.vcxproj.user index 79ef7571..7d7b3158 100755 --- a/infrastructure/cmake/build/test_backupstore.vcxproj.user +++ b/infrastructure/cmake/build/test_backupstore.vcxproj.user @@ -1,9 +1,9 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\backupstore</LocalDebuggerWorkingDirectory>
- <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
- <LocalDebuggerCommandArguments>
- </LocalDebuggerCommandArguments>
- </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\backupstore</LocalDebuggerWorkingDirectory> + <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> + <LocalDebuggerCommandArguments> + </LocalDebuggerCommandArguments> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/infrastructure/cmake/build/test_backupstorefix.vcxproj.user b/infrastructure/cmake/build/test_backupstorefix.vcxproj.user index c0895191..170fb496 100755 --- a/infrastructure/cmake/build/test_backupstorefix.vcxproj.user +++ b/infrastructure/cmake/build/test_backupstorefix.vcxproj.user @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\backupstorefix</LocalDebuggerWorkingDirectory>
- <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
- </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\backupstorefix</LocalDebuggerWorkingDirectory> + <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/infrastructure/cmake/build/test_bbackupd.vcxproj.user b/infrastructure/cmake/build/test_bbackupd.vcxproj.user index 9ca2b5e9..ebf8c6a3 100755 --- a/infrastructure/cmake/build/test_bbackupd.vcxproj.user +++ b/infrastructure/cmake/build/test_bbackupd.vcxproj.user @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LocalDebuggerCommandArguments>-e test_basics</LocalDebuggerCommandArguments>
- <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\bbackupd</LocalDebuggerWorkingDirectory>
- <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
- </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LocalDebuggerCommandArguments>-e test_basics</LocalDebuggerCommandArguments> + <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\bbackupd</LocalDebuggerWorkingDirectory> + <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/infrastructure/cmake/build/test_common.vcxproj.user b/infrastructure/cmake/build/test_common.vcxproj.user index 7a375f10..e5854a80 100755 --- a/infrastructure/cmake/build/test_common.vcxproj.user +++ b/infrastructure/cmake/build/test_common.vcxproj.user @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\common</LocalDebuggerWorkingDirectory>
- <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
- </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\common</LocalDebuggerWorkingDirectory> + <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/infrastructure/cmake/build/test_httpserver.vcxproj.user b/infrastructure/cmake/build/test_httpserver.vcxproj.user index b2da015c..ac1512a8 100755 --- a/infrastructure/cmake/build/test_httpserver.vcxproj.user +++ b/infrastructure/cmake/build/test_httpserver.vcxproj.user @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\httpserver</LocalDebuggerWorkingDirectory>
- <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
- </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\httpserver</LocalDebuggerWorkingDirectory> + <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/infrastructure/cmake/build/test_raidfile.vcxproj.user b/infrastructure/cmake/build/test_raidfile.vcxproj.user index d2c2fc34..620aa4bb 100755 --- a/infrastructure/cmake/build/test_raidfile.vcxproj.user +++ b/infrastructure/cmake/build/test_raidfile.vcxproj.user @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\raidfile</LocalDebuggerWorkingDirectory>
- <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
- </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\raidfile</LocalDebuggerWorkingDirectory> + <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/infrastructure/cmake/getversion.pl b/infrastructure/cmake/getversion.pl new file mode 100755 index 00000000..d7ca0333 --- /dev/null +++ b/infrastructure/cmake/getversion.pl @@ -0,0 +1,13 @@ +#!perl + +use File::Basename; +$basedir = dirname($0)."/../.."; + +-d $basedir or die "Base directory $basedir does not exist!"; +chdir $basedir or die "Failed to change to base directory: $basedir: $!"; + +require "$basedir/infrastructure/BoxPlatform.pm.in"; + +print "$BoxPlatform::product_version\n"; + +exit 0; diff --git a/infrastructure/cmake/msvc/bin_bbackupd.vcxproj.user b/infrastructure/cmake/msvc/bin_bbackupd.vcxproj.user new file mode 100755 index 00000000..fa1f3d34 --- /dev/null +++ b/infrastructure/cmake/msvc/bin_bbackupd.vcxproj.user @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LocalDebuggerCommandArguments>testfiles\bbackupd.conf</LocalDebuggerCommandArguments> + <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\bbackupd</LocalDebuggerWorkingDirectory> + <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> + </PropertyGroup> +</Project>
\ No newline at end of file diff --git a/infrastructure/cmake/msvc/bin_bbstored.vcxproj.user b/infrastructure/cmake/msvc/bin_bbstored.vcxproj.user new file mode 100755 index 00000000..339cddee --- /dev/null +++ b/infrastructure/cmake/msvc/bin_bbstored.vcxproj.user @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LocalDebuggerCommandArguments>testfiles/bbstored.conf</LocalDebuggerCommandArguments> + <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\backupstorefix</LocalDebuggerWorkingDirectory> + <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> + </PropertyGroup> +</Project>
\ No newline at end of file diff --git a/infrastructure/cmake/msvc/test_backupstore.vcxproj.user b/infrastructure/cmake/msvc/test_backupstore.vcxproj.user new file mode 100755 index 00000000..7d7b3158 --- /dev/null +++ b/infrastructure/cmake/msvc/test_backupstore.vcxproj.user @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\backupstore</LocalDebuggerWorkingDirectory> + <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> + <LocalDebuggerCommandArguments> + </LocalDebuggerCommandArguments> + </PropertyGroup> +</Project>
\ No newline at end of file diff --git a/infrastructure/cmake/msvc/test_backupstorefix.vcxproj.user b/infrastructure/cmake/msvc/test_backupstorefix.vcxproj.user new file mode 100755 index 00000000..170fb496 --- /dev/null +++ b/infrastructure/cmake/msvc/test_backupstorefix.vcxproj.user @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\backupstorefix</LocalDebuggerWorkingDirectory> + <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> + </PropertyGroup> +</Project>
\ No newline at end of file diff --git a/infrastructure/cmake/msvc/test_bbackupd.vcxproj.user b/infrastructure/cmake/msvc/test_bbackupd.vcxproj.user new file mode 100755 index 00000000..ebf8c6a3 --- /dev/null +++ b/infrastructure/cmake/msvc/test_bbackupd.vcxproj.user @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LocalDebuggerCommandArguments>-e test_basics</LocalDebuggerCommandArguments> + <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\bbackupd</LocalDebuggerWorkingDirectory> + <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> + </PropertyGroup> +</Project>
\ No newline at end of file diff --git a/infrastructure/cmake/msvc/test_common.vcxproj.user b/infrastructure/cmake/msvc/test_common.vcxproj.user new file mode 100755 index 00000000..e5854a80 --- /dev/null +++ b/infrastructure/cmake/msvc/test_common.vcxproj.user @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\common</LocalDebuggerWorkingDirectory> + <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> + </PropertyGroup> +</Project>
\ No newline at end of file diff --git a/infrastructure/cmake/msvc/test_httpserver.vcxproj.user b/infrastructure/cmake/msvc/test_httpserver.vcxproj.user new file mode 100755 index 00000000..ac1512a8 --- /dev/null +++ b/infrastructure/cmake/msvc/test_httpserver.vcxproj.user @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\httpserver</LocalDebuggerWorkingDirectory> + <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> + </PropertyGroup> +</Project>
\ No newline at end of file diff --git a/infrastructure/cmake/msvc/test_raidfile.vcxproj.user b/infrastructure/cmake/msvc/test_raidfile.vcxproj.user new file mode 100755 index 00000000..620aa4bb --- /dev/null +++ b/infrastructure/cmake/msvc/test_raidfile.vcxproj.user @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\debug\test\raidfile</LocalDebuggerWorkingDirectory> + <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> + </PropertyGroup> +</Project>
\ No newline at end of file diff --git a/infrastructure/cmake/windows/CMakeLists.txt b/infrastructure/cmake/windows/CMakeLists.txt new file mode 100644 index 00000000..49a1ea4d --- /dev/null +++ b/infrastructure/cmake/windows/CMakeLists.txt @@ -0,0 +1,137 @@ +cmake_minimum_required(VERSION 2.6) + +project(BoxBackup_Windows) + +set(boxbackup_dir ${CMAKE_SOURCE_DIR}/../../..) +set_property(DIRECTORY PROPERTY EP_BASE .) +set(install_dir ${CMAKE_BINARY_DIR}/install) + +# Automate the process of downloading, building and "installing" dependencies on Windows, +# as used by AppVeyor. + +# Version of zlib to download, build, and compile Box Backup against: +set(ZLIB_VERSION 1.2.11) +# Hash of zlib-${ZLIB_VERSION}.tar.gz, to be verified after download: +set(ZLIB_HASH SHA256=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1) + +# Version of OpenSSL to download, build, and compile Box Backup against: +set(OPENSSL_VERSION 1.1.0g) +# Hash of openssl-${OPENSSL_VERSION}.tar.gz, to be verified after download: +set(OPENSSL_HASH SHA256=de4d501267da39310905cb6dc8c6121f7a2cad45a7707f76df828fe1b85073af) + +# Version of PCRE to download, build, and compile Box Backup against: +set(PCRE_VERSION 8.39) +# Hash of pcre-${PCRE_VERSION}.tar.gz, to be verified after download: +set(PCRE_HASH SHA256=ccdf7e788769838f8285b3ee672ed573358202305ee361cfec7a4a4fb005bbc7) + +# Version of Boost to download, unpack, and compile Box Backup against: +set(BOOST_VERSION 1.62.0) +# Hash of the Boost download file, to be verified after download: +set(BOOST_HASH SHA1=5fd97433c3f859d8cbab1eaed4156d3068ae3648) + +include(ExternalProject) + +ExternalProject_Add(zlib + URL "http://zlib.net/zlib-${ZLIB_VERSION}.tar.gz" + URL_HASH ${ZLIB_HASH} + DOWNLOAD_NO_PROGRESS 1 + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${install_dir} ${SUB_CMAKE_EXTRA_ARGS} + # We need to build both versions, debug and release, because cmake requires both to be + # present to generate its multi-configuration project files for Visual Studio/MSBuild. + INSTALL_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target install --config Debug + COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target install --config Release + STEP_TARGETS configure install +) + +if(WIN32) + ExternalProject_Add(openssl + DEPENDS zlib + URL "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" + URL_HASH ${OPENSSL_HASH} + DOWNLOAD_NO_PROGRESS 1 + CONFIGURE_COMMAND perl Configure debug-VC-WIN32 no-asm no-shared + --prefix=${install_dir} + --openssldir=etc + # Run tests before install, but don't make the main target depend on them, so that + # we don't have to run them whenever we build manually on Windows. + TEST_BEFORE_INSTALL 1 + TEST_EXCLUDE_FROM_MAIN 1 + # You would expect us to use nt.mak to compile a static library here, but mk1mf.pl uses the /MT[d] + # CRT in that case, which is incompatible with our dynamic runtime, /MD[d]. It seems that the libs + # built by ntdll.mak, which are compiled with /MD[d], are full libraries and not import libs, + # so we can link statically against them and still get a dynamic runtime. + BUILD_IN_SOURCE 1 + BUILD_COMMAND nmake /s + TEST_COMMAND nmake /s test + INSTALL_COMMAND nmake /s install + ) +elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + ExternalProject_Add(openssl + DEPENDS zlib + URL "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" + URL_HASH ${OPENSSL_HASH} + DOWNLOAD_NO_PROGRESS 1 + CONFIGURE_COMMAND perl Configure darwin64-x86_64-cc --prefix=${install_dir} + BUILD_IN_SOURCE 1 + ) +else() + ExternalProject_Add(openssl + DEPENDS zlib + URL "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" + URL_HASH ${OPENSSL_HASH} + DOWNLOAD_NO_PROGRESS 1 + CONFIGURE_COMMAND ./config --prefix=${install_dir} + BUILD_IN_SOURCE 1 + ) + +endif() + +ExternalProject_Add(pcre + # Temporarily use SVN repo until the PCRE_STATIC issue in 8.40 is fixed: + # https://vcs.pcre.org/pcre?view=revision&revision=1677 + SVN_REPOSITORY svn://vcs.exim.org/pcre/code/trunk + SVN_REVISION -r 1677 + DOWNLOAD_NO_PROGRESS 1 + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${install_dir} ${SUB_CMAKE_EXTRA_ARGS} + -DPCRE_SUPPORT_LIBREADLINE=OFF + -DPCRE_SUPPORT_LIBBZ2=OFF + # We need to build both versions, debug and release, because cmake requires both to be + # present to generate its multi-configuration project files for Visual Studio/MSBuild. + INSTALL_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target install --config Debug + COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target install --config Release +) + +string(REPLACE "." "_" BOOST_VERSION_UNDERSCORES ${BOOST_VERSION}) +ExternalProject_Add(boost + URL "http://downloads.sourceforge.net/project/boost/boost/${BOOST_VERSION}/boost_${BOOST_VERSION_UNDERSCORES}.tar.bz2" + URL_HASH ${BOOST_HASH} + # DOWNLOAD_NO_PROGRESS 1 + # Disable automatic updating (untarring) as it's slow and not necessary + UPDATE_DISCONNECTED 1 + CONFIGURE_COMMAND ${CMAKE_COMMAND} -E echo "No configure step needed" + BUILD_COMMAND ${CMAKE_COMMAND} -E echo "No build step needed" + INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "No install step needed" +) + +if(BOXBACKUP_VERSION) + list(APPEND boxbackup_cmake_args "-DBOXBACKUP_VERSION=${BOXBACKUP_VERSION}") +endif() +string(REPLACE ";" " " boxbackup_cmake_args "${boxbackup_cmake_args}") + +ExternalProject_Add(boxbackup + DEPENDS zlib openssl pcre boost + SOURCE_DIR ${boxbackup_dir}/infrastructure/cmake + CMAKE_ARGS + -DZLIB_ROOT=${install_dir} + -DOPENSSL_ROOT_DIR=${install_dir} + -DPCRE_ROOT=${install_dir} + -DBOOST_ROOT=${CMAKE_BINARY_DIR}/Source/boost + -DBOX_SUPPORT_READLINE=OFF + -DCMAKE_INSTALL_PREFIX=${install_dir} + -DAPPVEYOR_MODE=1 + -DDEBUG=${DEBUG} + ${boxbackup_cmake_args} + ${SUB_CMAKE_EXTRA_ARGS} + INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "No install step needed" + STEP_TARGETS configure build +) diff --git a/infrastructure/m4/ax_check_compile_flag.m4 b/infrastructure/m4/ax_check_compile_flag.m4 new file mode 100644 index 00000000..c3a8d695 --- /dev/null +++ b/infrastructure/m4/ax_check_compile_flag.m4 @@ -0,0 +1,72 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the current language's compiler +# or gives an error. (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de> +# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com> +# +# 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, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see <http://www.gnu.org/licenses/>. +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 2 + +AC_DEFUN([AX_CHECK_COMPILE_FLAG], +[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ + ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS + _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) +AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS diff --git a/infrastructure/m4/boxbackup_tests.m4 b/infrastructure/m4/boxbackup_tests.m4 index 09d73e04..59467e66 100644 --- a/infrastructure/m4/boxbackup_tests.m4 +++ b/infrastructure/m4/boxbackup_tests.m4 @@ -10,10 +10,30 @@ solaris*) ;; esac -if test "x$GXX" = "xyes"; then - # Use -Wall if we have gcc. This gives better warnings - AC_SUBST([CXXFLAGS_STRICT], ['-Wall -Wundef -Werror=return-type']) +# Enable some compiler flags if the compiler supports them. This gives better warnings +# and detects some problems early. +AX_CHECK_COMPILE_FLAG(-Wall, [cxxflags_strict="$cxxflags_strict -Wall"]) +# -Wundef would be a good idea, but Boost is full of undefined variable use, so we need +# to disable it for now so that we can concentrate on real errors: +dnl AX_CHECK_COMPILE_FLAG(-Wundef, [cxxflags_strict="$cxxflags_strict -Wundef"]) +AX_CHECK_COMPILE_FLAG(-Werror=return-type, + [cxxflags_strict="$cxxflags_strict -Werror=return-type"]) +AX_CHECK_COMPILE_FLAG(-Werror=delete-non-virtual-dtor, + [cxxflags_strict="$cxxflags_strict -Werror=delete-non-virtual-dtor"]) +AX_CHECK_COMPILE_FLAG(-Werror=undefined-bool-conversion, + [cxxflags_strict="$cxxflags_strict -Werror=undefined-bool-conversion"]) +# We should really enable -Werror=sometimes-uninitialized, but QDBM violates it: +dnl AX_CHECK_COMPILE_FLAG(-Werror=sometimes-uninitialized, +dnl [cxxflags_strict="$cxxflags_strict -Werror=sometimes-uninitialized"]) +# This error is detected by MSVC, but not usually by GCC/Clang: +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58114 +AX_CHECK_COMPILE_FLAG(-Werror=delete-incomplete, + [cxxflags_strict="$cxxflags_strict -Werror=delete-incomplete"]) +AX_CHECK_COMPILE_FLAG(-Wno-deprecated-declarations, + [cxxflags_strict="$cxxflags_strict -Wno-deprecated-declarations"]) +AC_SUBST([CXXFLAGS_STRICT], [$cxxflags_strict]) +if test "x$GXX" = "xyes"; then # Don't check for gcc -rdynamic on Solaris as it's broken, but returns 0. # On Cygwin it does nothing except cause gcc to emit a warning message. case $build_os in @@ -37,7 +57,6 @@ if test "x$GXX" = "xyes"; then LDFLAGS=$save_LDFLAGS ;; esac - fi AC_PATH_PROG([PERL], [perl], [AC_MSG_ERROR([[perl executable was not found]])]) @@ -101,7 +120,7 @@ AX_PATH_BDB([1.x or 4.1], [ ]) # need to find libdl before trying to link openssl, apparently -AC_SEARCH_LIBS([dlsym], ["dl"]) +AC_SEARCH_LIBS([dlsym], [dl]) AC_CHECK_FUNCS([dlsym dladdr]) ## Check for Open SSL, use old versions only if explicitly requested @@ -126,20 +145,12 @@ Upgrade or read the documentation for alternatives]]) ### Checks for header files. -case $target_os in -mingw32*) ;; -winnt*) ;; -*) - AC_HEADER_DIRENT - ;; -esac - AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([dlfcn.h fcntl.h getopt.h netdb.h process.h pwd.h signal.h]) -AC_CHECK_HEADERS([syslog.h time.h cxxabi.h]) +AC_CHECK_HEADERS([cxxabi.h dirent.h dlfcn.h fcntl.h getopt.h netdb.h process.h pwd.h signal.h]) +AC_CHECK_HEADERS([syslog.h time.h unistd.h]) AC_CHECK_HEADERS([netinet/in.h netinet/tcp.h]) -AC_CHECK_HEADERS([sys/file.h sys/param.h sys/poll.h sys/socket.h sys/time.h]) +AC_CHECK_HEADERS([sys/file.h sys/param.h sys/poll.h sys/socket.h sys/stat.h sys/time.h]) AC_CHECK_HEADERS([sys/types.h sys/uio.h sys/un.h sys/wait.h sys/xattr.h]) AC_CHECK_HEADERS([sys/ucred.h],,, [ #ifdef HAVE_SYS_PARAM_H @@ -193,11 +204,11 @@ AC_TYPE_OFF_T AC_TYPE_PID_T AC_TYPE_SIZE_T -AC_CHECK_MEMBERS([struct stat.st_flags]) -AC_CHECK_MEMBERS([struct stat.st_atim]) -AC_CHECK_MEMBERS([struct stat.st_atimespec]) -AC_CHECK_MEMBERS([struct stat.st_atim.tv_nsec]) -AC_CHECK_MEMBERS([struct stat.st_atimensec]) +AC_CHECK_MEMBERS([struct stat.st_flags],,, [[#include <sys/stat.h>]]) +AC_CHECK_MEMBERS([struct stat.st_atim],,, [[#include <sys/stat.h>]]) +AC_CHECK_MEMBERS([struct stat.st_atimespec],,, [[#include <sys/stat.h>]]) +AC_CHECK_MEMBERS([struct stat.st_atim.tv_nsec],,, [[#include <sys/stat.h>]]) +AC_CHECK_MEMBERS([struct stat.st_atimensec],,, [[#include <sys/stat.h>]]) AC_CHECK_MEMBERS([struct sockaddr_in.sin_len],,, [[ #include <sys/types.h> #include <netinet/in.h> @@ -206,13 +217,14 @@ AC_CHECK_MEMBERS([DIR.d_fd],,, [[#include <dirent.h>]]) AC_CHECK_MEMBERS([DIR.dd_fd],,, [[#include <dirent.h>]]) AC_CHECK_MEMBERS([struct tcp_info.tcpi_rtt],,, [[#include <netinet/tcp.h>]]) -AC_CHECK_DECLS([O_BINARY]) +AC_CHECK_DECLS([O_BINARY],,, [[#include <fcntl.h>]]) AC_CHECK_DECLS([ENOTSUP],,, [[#include <sys/errno.h>]]) AC_CHECK_DECLS([INFTIM],,, [[#include <poll.h>]]) AC_CHECK_DECLS([SO_PEERCRED],,, [[#include <sys/socket.h>]]) AC_CHECK_DECLS([SOL_TCP],,, [[#include <netinet/tcp.h>]]) AC_CHECK_DECLS([TCP_INFO],,, [[#include <netinet/tcp.h>]]) +AC_CHECK_DECLS([SYS_open, SYS_openat],,, [[#include <sys/syscall.h>]]) if test -n "$have_sys_socket_h"; then AC_CHECK_DECLS([SO_SNDBUF],,, [[#include <sys/socket.h>]]) @@ -285,7 +297,7 @@ AC_TYPE_SIGNAL AC_FUNC_STAT AC_CHECK_FUNCS([ftruncate getpeereid getpeername getpid gettimeofday lchown]) AC_CHECK_FUNCS([setproctitle utimensat]) -AC_SEARCH_LIBS([setproctitle], ["bsd"]) +AC_SEARCH_LIBS([setproctitle], [bsd]) # NetBSD implements kqueue too differently for us to get it fixed by 0.10 # TODO: Remove this when NetBSD kqueue implementation is working. The main @@ -345,4 +357,10 @@ fi ;; esac - +AC_CHECK_PROGS(default_debugger, [lldb gdb]) +AC_ARG_WITH([debugger], + [AS_HELP_STRING([--with-debugger=<gdb|lldb|...>], + [use this debugger in t-gdb scripts to debug tests @<:@default=lldb if present, otherwise gdb@:>@])], + [], + [with_debugger=$default_debugger]) +AC_SUBST([with_debugger]) diff --git a/infrastructure/makebuildenv.pl.in b/infrastructure/makebuildenv.pl.in index 5f1b0618..d5ac9f2f 100755 --- a/infrastructure/makebuildenv.pl.in +++ b/infrastructure/makebuildenv.pl.in @@ -14,7 +14,10 @@ $|=1; print "Box build environment setup.\n"; -my @implicit_deps = ('lib/common'); +# Modules that everything else depends on, without being explicitly specified. +# Deprecated because we can't specify dependencies between them in the usual way, +# and it's totally unnecessary anyway: +my @implicit_deps; # work out platform variables use lib 'infrastructure'; @@ -26,10 +29,6 @@ print "Building on '$build_os $build_os_ver' using ". # keep copy of command line args my $makebuildenv_args = join(' ',@ARGV); -# do command line arguments -my $compile_line_extra = $platform_compile_line_extra; -my $link_line_extra = $platform_link_line_extra; - # make sure local files directory exists unless(-d 'local') { @@ -40,9 +39,6 @@ unless(-d 'local') # flags about the environment my %env_flags; -$module_dependency{"lib/common"} = ["lib/win32"]; -push @implicit_deps, "lib/win32"; - # print "Flag: $_\n" for(keys %env_flags); # seed autogen code @@ -377,17 +373,159 @@ for my $mod (@modules, @implicit_deps) closedir DIR; } -# Then write a makefile for each module +my $default_cflags = '@CFLAGS@'; +my $default_cxxflags = '@CXXFLAGS@'; +$default_cflags =~ s/ -O2//g; +$default_cxxflags =~ s/ -O2//g; +my $debug_base_dir = 'debug'; +my $release_base_dir = 'release'; +my $debugger = '@with_debugger@'; + +my $release_flags = "-O2"; +if ($target_windows) +{ + $release_flags = "-O0 -g"; +} + +# Then write a master Makefile, and a mini-Makefile for each module print "done\n\nGenerating Makefiles...\n"; -my %module_resources_win32; +my $makefile_ifdef_prefix = $bsd_make ? "." : ""; +my $autoconf_cppflags = '@CPPFLAGS@'; +my $autoconf_cxxflags = '@CXXFLAGS_STRICT@'; +my $autoconf_ldflags = '@LDFLAGS@'; + +open MASTER_MAKEFILE, ">Makefile" or die "Makefile: $!"; +print MASTER_MAKEFILE <<__E; +# +# AUTOMATICALLY GENERATED FILE +# do not edit! +# +# + +# "parcels" is defined near the end of this Makefile. +default: parcels + +CC = @CC@ +CXX = @CXX@ +AR = @AR@ +RANLIB = @RANLIB@ +PERL = @PERL@ +WINDRES = @WINDRES@ + +# Work around a mistake in QDBM (using <angled> includes for a file not in the +# system path) by adding it to the include path with -I. +DEFAULT_CFLAGS = $autoconf_cppflags $default_cflags $autoconf_cxxflags \\ + $extra_platform_defines $platform_compile_line_extra \\ + -DBOX_VERSION="\\"$product_version\\"" -Iqdbm +DEFAULT_CXXFLAGS = $autoconf_cppflags $default_cxxflags $autoconf_cxxflags \\ + $extra_platform_defines $platform_compile_line_extra \\ + -DBOX_VERSION="\\"$product_version\\"" +LDFLAGS += $autoconf_ldflags \@LDADD_RDYNAMIC@ $platform_link_line_extra + +RELEASE_CFLAGS = \$(DEFAULT_CFLAGS) -DBOX_RELEASE_BUILD $release_flags +RELEASE_CXXFLAGS = \$(DEFAULT_CXXFLAGS) -DBOX_RELEASE_BUILD $release_flags +RELEASE_OUTBASE = $release_base_dir +# http://gcc.gnu.org/onlinedocs/libstdc++/manual/debug_mode_using.html#debug_mode.using.mode +DEBUG_CFLAGS = \$(DEFAULT_CFLAGS) -g -O0 -D_GLIBCXX_DEBUG +DEBUG_CXXFLAGS = \$(DEFAULT_CXXFLAGS) -g -O0 -D_GLIBCXX_DEBUG +DEBUG_OUTBASE = $debug_base_dir + +__E + +if ($bsd_make) +{ + print MASTER_MAKEFILE <<__E; +.ifdef V +HIDE = +_CC = \$(CC) +_CXX = \$(CXX) +_LINK = \$(CXX) +_WINDRES = \$(WINDRES) +_AR = \$(AR) +_RANLIB = \$(RANLIB) +_PERL = \$(PERL) +.else +HIDE = @ +_CC = @ echo " [CC] " \$(*F) && \$(CC) +_CXX = @ echo " [CXX] " \$(*F) && \$(CXX) +_LINK = @ echo " [LINK] " \$(*F) && \$(CXX) +_WINDRES = @ echo " [WINDRES]" \$(*F) && \$(WINDRES) +_AR = @ echo " [AR] " \$(*F) && \$(AR) +_RANLIB = @ echo " [RANLIB] " \$(*F) && \$(RANLIB) +_PERL = @ echo " [PERL] " \$(*F) && \$(PERL) >/dev/null +.endif + +__E +} +else +{ + print MASTER_MAKEFILE <<__E; +HIDE = \$(if \$(V),,@) +_CC = \$(if \$(V),\$(CC), @ echo " [CC] \$<" && \$(CC)) +_CXX = \$(if \$(V),\$(CXX), @ echo " [CXX] \$<" && \$(CXX)) +_LINK = \$(if \$(V),\$(CXX), @ echo " [LINK] \$@" && \$(CXX)) +_WINDRES = \$(if \$(V),\$(WINDRES), @ echo " [WINDRES] \$<" && \$(WINDRES)) +_AR = \$(if \$(V),\$(AR), @ echo " [AR] \$@" && \$(AR)) +_RANLIB = \$(if \$(V),\$(RANLIB), @ echo " [RANLIB] \$@" && \$(RANLIB)) +_PERL = \$(if \$(V),\$(PERL), @ echo " [PERL] \$@" && \$(PERL) >/dev/null) + +__E +} +my %module_resources_win32; +my @debug_build_targets; +my @release_build_targets; +my @all_clean_targets; +my @all_realclean_targets; +my %mod_type_name; +my %mod_end_targets; +my %library_targets; + +# First, loop over all modules and quickly categorise them and generate the target filenames. +# We need this to write correct dependency info into the makefile when modules are listed +# out of order in modules.txt, which isn't strictly necessary but may look tidier. for my $mod (@implicit_deps, @modules) { print $mod,"\n"; my ($type,$name) = split /\//,$mod; - + if (not $name) + { + # External modules such as qdbm have no "type" in the directory path. + $name = $mod; + $type = 'lib'; + } + + # is target a library? + my $target_is_library = ($type ne 'bin' && $type ne 'test'); + + # make target name + my $end_target_file = $name; + + if ($target_is_library) + { + $end_target_file .= '.a'; + } + else + { + $end_target_file .= $platform_exe_ext; + } + + $end_target_file = '_test'.$platform_exe_ext if $type eq 'test'; + + $mod_type_name{$mod} = [$type, $name]; + $mod_end_targets{$mod} = $end_target_file; + $library_targets{$mod} = $target_is_library; +} + +# Now loop over them again, generating makefile instructions etc. +for my $mod (@implicit_deps, @modules) +{ + my ($type,$name) = @{$mod_type_name{$mod}}; + my $end_target_file = $mod_end_targets{$mod}; + my $target_is_library = $library_targets{$mod}; + # add additional files for tests if($type eq 'test') { @@ -478,11 +616,20 @@ __E close TESTFILE; } - writetestfile("$mod/_t", "GLIBCXX_FORCE_NEW=1 ". + writetestfile("$mod/t", "GLIBCXX_FORCE_NEW=1 ". './_test' . $platform_exe_ext . ' "$@"', $mod); - writetestfile("$mod/_t-gdb", "GLIBCXX_FORCE_NEW=1 ". - 'gdb ./_test' . $platform_exe_ext . ' "$@"', $mod); - + + if($debugger) + { + writetestfile("$mod/t-gdb", "GLIBCXX_FORCE_NEW=1 ". + $debugger . ' ./_test' . $platform_exe_ext . ' "$@"', $mod); + } + else + { + writetestfile("$mod/t-gdb", + "echo 'No debugger was detected by configure script'\n". + "exit 2"); + } } my @all_deps_for_module; @@ -516,124 +663,70 @@ __E } } } - - - # make include path - my $include_paths = join(' ',map {'-I../../'.$_} @all_deps_for_module); - # is target a library? - my $target_is_library = ($type ne 'bin' && $type ne 'test'); - - # make target name - my $end_target = $name; + # get the list of library things to add -- in order of dependency + # so things link properly + my @lib_files; + my @dep_targets; + my @include_search_dirs; - if ($target_is_library) - { - $end_target .= '.a'; - } - else + foreach my $dep (reverse @all_deps_for_module) { - $end_target .= $platform_exe_ext; + my $dep_target = $mod_end_targets{$dep}; + die "No output file found for $dep" unless $dep_target; + $dep_target = "$dep/$dep_target"; + push @dep_targets, $dep_target; + + if ($dep =~ m|^lib\/(.+)$|) + { + push @lib_files, $dep_target; + push @include_search_dirs, $dep; + } + elsif ($dep =~ m|^([^/]+)$|) + { + push @lib_files, $dep_target; + push @include_search_dirs, $dep; + } } - $end_target = '_test'.$platform_exe_ext if $type eq 'test'; + # make include path + my $cpp_include_paths = join(' ',map {"-I$_"} @include_search_dirs); + print MASTER_MAKEFILE "${type}_${name}_includes = $cpp_include_paths\n"; # adjust for outdir - $end_target = '$(OUTDIR)/' . $end_target; + my $debug_end_target = "\$(DEBUG_OUTBASE)/$mod/$end_target_file"; + my $release_end_target = "\$(RELEASE_OUTBASE)/$mod/$end_target_file"; + push @debug_build_targets, $debug_end_target; + push @release_build_targets, $release_end_target; # start the makefile - my $mk_name_extra = ($bsd_make)?'':'X'; - open MAKE,">$mod/Makefile".$mk_name_extra or die "Can't open Makefile for $mod\n"; - my $debug_link_extra = ($target_is_library)?'':'../../debug/lib/debug/debug.a'; - - my $default_cxxflags = '@CXXFLAGS@'; - $default_cxxflags =~ s/ -O2//g; - - my $release_flags = "-O2"; - if ($target_windows) - { - $release_flags = "-O0 -g"; - } - - print MAKE <<__E; + open MINI_MODULE_MAKEFILE,">$mod/Makefile" or die "Can't open Makefile for $mod\n"; + print MINI_MODULE_MAKEFILE <<__E; # # AUTOMATICALLY GENERATED FILE # do not edit! # -# -CXX = @CXX@ -AR = @AR@ -RANLIB = @RANLIB@ -PERL = @PERL@ -WINDRES = @WINDRES@ +${makefile_ifdef_prefix}ifdef RELEASE +TARGET = $release_base_dir/$mod/$end_target_file +${makefile_ifdef_prefix}else +TARGET = $debug_base_dir/$mod/$end_target_file +${makefile_ifdef_prefix}endif -DEFAULT_CXXFLAGS = @CPPFLAGS@ $default_cxxflags @CXXFLAGS_STRICT@ \\ - $include_paths $extra_platform_defines \\ - -DBOX_VERSION="\\"$product_version\\"" -LDFLAGS += @LDFLAGS@ @LDADD_RDYNAMIC@ - -.ifdef RELEASE -CXXFLAGS += \$(DEFAULT_CXXFLAGS) -DBOX_RELEASE_BUILD $release_flags -OUTBASE = ../../release -OUTDIR = ../../release/$mod -DEPENDMAKEFLAGS = -D RELEASE -VARIENT = RELEASE -.else -# http://gcc.gnu.org/onlinedocs/libstdc++/manual/debug_mode_using.html#debug_mode.using.mode -CXXFLAGS += \$(DEFAULT_CXXFLAGS) -g -O0 -D_GLIBCXX_DEBUG -OUTBASE = ../../debug -OUTDIR = ../../debug/$mod -DEPENDMAKEFLAGS = -VARIENT = DEBUG -.endif - -__E +.PHONY: default +default: + \$(MAKE) -C ../.. \$(TARGET) - if ($bsd_make) - { - print MAKE <<__E; -.ifdef V -HIDE = -_CXX = \$(CXX) -_LINK = \$(CXX) -_WINDRES = \$(WINDRES) -_AR = \$(AR) -_RANLIB = \$(RANLIB) -_PERL = \$(PERL) -.else -HIDE = @ -_CXX = @ echo " [CXX] " \$(*F) && \$(CXX) -_LINK = @ echo " [LINK] " \$(*F) && \$(CXX) -_WINDRES = @ echo " [WINDRES]" \$(*F) && \$(WINDRES) -_AR = @ echo " [AR] " \$(*F) && \$(AR) -_RANLIB = @ echo " [RANLIB] " \$(*F) && \$(RANLIB) -_PERL = @ echo " [PERL] " \$(*F) && \$(PERL) >/dev/null -.endif - -__E - } - else - { - print MAKE <<__E; -HIDE = \$(if \$(V),,@) -_CXX = \$(if \$(V),\$(CXX), @ echo " [CXX] $mod/\$<" && \$(CXX)) -_LINK = \$(if \$(V),\$(CXX), @ echo " [LINK] $mod/\$@" && \$(CXX)) -_WINDRES = \$(if \$(V),\$(WINDRES), @ echo " [WINDRES] $mod/\$<" && \$(WINDRES)) -_AR = \$(if \$(V),\$(AR), @ echo " [AR] $mod/\$@" && \$(AR)) -_RANLIB = \$(if \$(V),\$(RANLIB), @ echo " [RANLIB] $mod/\$@" && \$(RANLIB)) -_PERL = \$(if \$(V),\$(PERL), @ echo " [PERL] $mod/\$@" && \$(PERL) >/dev/null) +.PHONY: clean +clean: + \$(MAKE) -C ../.. clean_${type}_${name} +.PHONY: realclean +realclean: + \$(MAKE) -C ../.. realclean_${type}_${name} __E - } + close MINI_MODULE_MAKEFILE; - # if there is a Makefile.pre, include it now - if(-e "$mod/Makefile.pre") - { - print MAKE ".include <Makefile.pre>\n\n"; - } - - # read directory - opendir DIR,$mod; + opendir DIR, $mod; my @items = readdir DIR; closedir DIR; @@ -646,10 +739,10 @@ __E { # Read items my $d = "$mod/$di"; - opendir DIR,$d; + opendir DIR, $d; my @i = readdir DIR; closedir DIR; - for(@i) + for (@i) { next if m/\A\./; push @autogen_items,"$di/$_" @@ -678,294 +771,587 @@ __E } } - # ready for the rest of the details... - my $make; - - # then... do the cpp files... - my @obj_base; - for my $file (@items) + # write the recipes for debug and release builds of each file + foreach my $var_prefix ('DEBUG', 'RELEASE') { - my $is_cpp = $file =~ m/\A(.+)\.cpp\Z/i; - my $is_rc = $file =~ m/\A(.+)\.rc\Z/i; - my $base = $1; + my $make; - if ($target_windows) - { - next if not $is_cpp and not $is_rc; - } - else + # then... do the cpp files... + my @obj_base; + for my $file (@items) { - next if not $is_cpp; - } + my $is_c = $file =~ m/\A(.+)\.c\Z/i; + my $is_cpp = $file =~ m/\A(.+)\.cpp\Z/i; + my $is_rc = $file =~ m/\A(.+)\.rc\Z/i; + my $base = $1; - next if $file =~ /\A\._/; # Temp Mac OS Resource hack + # Don't try to compile .rc files except on Windows: + next if not $is_c and not $is_cpp and not ($is_rc and $target_windows); + next if $file =~ /\A\._/; # Temp Mac OS Resource hack - # store for later - push @obj_base,$base; - - # get the file... - open FL,"$mod/$file"; - my $f; - read FL,$f,-s "$mod/$file"; - close FL; + # store for later + push @obj_base, $base; - my %dep; + # get the file... + open FL, "$mod/$file"; + my $f; + read FL, $f, -s "$mod/$file"; + close FL; + + my %dep; - while($f =~ m/\#include\s+"([^"]+?)"/g) - { - insert_dep($1, \%dep) if exists $hfiles{$1}; + while($f =~ m/\#include\s+"([^"]+?)"/g) + { + insert_dep($1, \%dep) if exists $hfiles{$1}; + } + + # output filename + my $out_name = "\$(${var_prefix}_OUTBASE)/$mod/$base.o"; + + # write the line for this cpp file + my @dep_paths = map + { + ($hfiles{$_} eq $mod) + ? "$mod/$_" + : $hfiles{$_}."/$_" + } + keys %dep; + + $make .= "$out_name: $mod/$file @dep_paths\n"; + + if ($is_c) + { + $make .= "\t\$(_CC) \$(${var_prefix}_CFLAGS) ". + "\$(${type}_${name}_includes) -DBOX_MODULE=\"\\\"$mod\\\"\" " . + "-c $mod/$file -o $out_name\n\n"; + } + if ($is_cpp) + { + $make .= "\t\$(_CXX) \$(${var_prefix}_CXXFLAGS) ". + "\$(${type}_${name}_includes) -DBOX_MODULE=\"\\\"$mod\\\"\" " . + "-c $mod/$file -o $out_name\n\n"; + } + elsif ($is_rc) + { + $make .= "\t\$(_WINDRES) $file $out_name\n\n"; + my $res_list = $module_resources_win32{$mod}; + $res_list ||= []; + push @$res_list, $base.'.o'; + $module_resources_win32{$mod} = $res_list; + } } + + # need to see if the extra makefile fragments require extra object files + # or include any more makefiles + my @objs = @obj_base; + my @makefile_includes; - # output filename - my $out_name = '$(OUTDIR)/'.$base.'.o'; + additional_objects_from_make_fragment("$mod/Makefile.extra", \@objs, \@makefile_includes); + additional_objects_from_make_fragment("$mod/Makefile.extra.$build_os", \@objs, \@makefile_includes); + + my $prefixed_end_target = "\$(${var_prefix}_OUTBASE)/$mod/$end_target_file"; + my $o_file_list = join(' ',map {"\$(${var_prefix}_OUTBASE)/$mod/$_.o"} sort @objs); + my @prefixed_lib_files = map {"\$(${var_prefix}_OUTBASE)/$_"} @lib_files; + my @prefixed_dep_targets = map {"\$(${var_prefix}_OUTBASE)/$_"} @dep_targets; + + print MASTER_MAKEFILE "$prefixed_end_target: $o_file_list"; + print MASTER_MAKEFILE " @prefixed_dep_targets" unless $target_is_library; + print MASTER_MAKEFILE "\n"; - # write the line for this cpp file - my @dep_paths = map - { - ($hfiles{$_} eq $mod) - ? $_ - : '../../'.$hfiles{$_}."/$_" + if ($target_windows) + { + foreach my $dep (@all_deps_for_module) + { + my $res_list = $module_resources_win32{$dep}; + next unless $res_list; + $o_file_list .= ' '.join(' ', + map {"\$(${var_prefix}_OUTBASE)/$dep/$_"} @$res_list); + } } - keys %dep; - - $make .= $out_name.': '.join(' ',$file,@dep_paths)."\n"; - if ($is_cpp) + # stuff to make the final target... + if($target_is_library) { - $make .= "\t\$(_CXX) \$(CXXFLAGS) $compile_line_extra ". - "-DBOX_MODULE=\"\\\"$mod\\\"\" " . - "-c $file -o $out_name\n\n"; + # make a library archive... + print MASTER_MAKEFILE "\t\$(HIDE) (rm -f $prefixed_end_target)\n"; + print MASTER_MAKEFILE "\t\$(_AR) cq $prefixed_end_target $o_file_list\n"; + print MASTER_MAKEFILE "\t\$(_RANLIB) $prefixed_end_target\n"; } - elsif ($is_rc) + else { - $make .= "\t\$(_WINDRES) $file $out_name\n\n"; - my $res_list = $module_resources_win32{$mod}; - $res_list ||= []; - push @$res_list, $base.'.o'; - $module_resources_win32{$mod} = $res_list; + # work out library options + # need to be... least used first, in absolute order they appear in the modules.txt file + my @libops; + + sub libops_fill + { + my ($module, $libops_ref) = @_; + + my $library_link_opts = $module_library_link_opts{$module}; + if ($library_link_opts) + { + push @$libops_ref, @$library_link_opts; + } + + my $deps = $module_dependency{$module}; + foreach my $dep (@$deps) + { + libops_fill($dep, $libops_ref); + } + } + + libops_fill($mod,\@libops); + + my $lo = ''; + my %ldone; + for(@libops) + { + next if exists $ldone{$_}; + $lo .= ' '.$_; + $ldone{$_} = 1; + } + + # link line... + print MASTER_MAKEFILE "\t\$(_LINK) \$(LDFLAGS) " . + "-o $prefixed_end_target $o_file_list " . + "@prefixed_lib_files $lo $platform_lib_files\n"; } - } - - my $has_deps = ($#{$module_dependency{$mod}} >= 0); -# ----- # always has dependencies with debug library - $has_deps = 1; - $has_deps = 0 if $target_is_library; - # Dependency stuff - my $deps_makeinfo; - if($has_deps) - { - if($bsd_make) + # tests need to copy the test file over + if($type eq 'test') { - $deps_makeinfo = <<'__E'; -.BEGIN:: -.ifndef NODEPS -. if $(.TARGETS) == "" + print MASTER_MAKEFILE <<__E; + \$(HIDE) cp $mod/t \$(${var_prefix}_OUTBASE)/$mod/t + \$(HIDE) chmod u+x \$(${var_prefix}_OUTBASE)/$mod/t + \$(HIDE) cp $mod/t-gdb \$(${var_prefix}_OUTBASE)/$mod/t-gdb + \$(HIDE) chmod u+x \$(${var_prefix}_OUTBASE)/$mod/t-gdb __E } - else + + print MASTER_MAKEFILE $make,"\n"; + + for(@makefile_includes) { - # gnu make - $deps_makeinfo = <<'__E'; -.PHONY: dep_modules -dep_modules: -ifndef NODEPS -ifeq ($(strip $(.TARGETS)),) -__E + print MASTER_MAKEFILE "\n.include <$_>\n"; } +} + + print MASTER_MAKEFILE <<__E; +clean_${type}_${name}: + rm -rf \$(DEBUG_OUTBASE)/$mod/* + rm -rf \$(RELEASE_OUTBASE)/$mod/* + +realclean_${type}_${name}: clean_${type}_${name} + rm -f $mod/t $mod/t-gdb $mod/Makefile + find $mod -name 'autogen_*' -type f -exec rm -f {} \\; +__E + push @all_clean_targets, "clean_${type}_${name}"; + push @all_realclean_targets, "realclean_${type}_${name}"; + + my $includes = ""; + + if(-e "$mod/Makefile.extra") + { + $includes .= ".include <$mod/Makefile.extra>\n\n"; + } + if(-e "$mod/Makefile.extra.$build_os") + { + $includes .= ".include <$mod/Makefile.extra.$build_os>\n\n"; + } + + if(!$bsd_make) + { + # need to post process this into a GNU makefile + $includes =~ s/\A\.\s*(ifdef|else|endif|ifndef)/$1/; + $includes =~ s/\A\.\s*include\s+<(.+?)>/include $1/; + $includes =~ s/-D\s+(\w+)/$1=1/g; + } + + print MASTER_MAKEFILE $includes; +} + +my @parcels; +my %parcel_contents; + +sub starts_with ($$) +{ + my ($string,$expected) = @_; + return substr($string, 0, length $expected) eq $expected; +} + +sub os_matches ($) +{ + my ($prefix_string) = @_; + my @prefixes = split m'\,', $prefix_string; + foreach my $prefix (@prefixes) + { + return 1 if starts_with($build_os, $prefix); + return 1 if starts_with($ac_target_os, $prefix); + return 1 if starts_with("$ac_target_cpu-$ac_target_os", + $prefix); + return 1 if starts_with($ac_target, $prefix); + } + return 0; +} + +my $copy_command = "cp -p"; + +open PARCELS,"parcels.txt" or die "Can't open parcels file"; +{ + my $cur_parcel = ''; + while(<PARCELS>) + { + chomp; s/#.+\Z//; s/\s+\Z//; s/\s+/ /g; + next unless m/\S/; - # run make for things we require - for my $dep (@all_deps_for_module) + # omit bits on some platforms? + next if m/\AEND-OMIT/; + if(m/\AOMIT:(.+)/) { - my $dep_target = ""; - if ($dep =~ m|^lib/(.*)|) + if (os_matches($1)) { - $dep_target = "\$(OUTBASE)/$dep/$1.a"; + while(<PARCELS>) + { + last if m/\AEND-OMIT/; + } } - elsif ($dep =~ m|^.*/(.*)|) + next; + } + + if (m'\AONLY:(.+)') + { + if (not os_matches($1)) { - $dep_target = "\$(OUTBASE)/$dep/$1$platform_exe_ext"; + while (<PARCELS>) + { + last if m'\AEND-ONLY'; + } } - else + next; + } + next if (m'\AEND-ONLY'); + + if (m'\AEXCEPT:(.+)') + { + if (os_matches($1)) { - $dep_target = "lib$dep.a"; + while (<PARCELS>) + { + last if m'\AEND-EXCEPT'; + } } - - $deps_makeinfo .= <<EOF; - \$(HIDE) ( \\ - cd ../../$dep; \\ - \$(MAKE) $sub_make_options -q \$(DEPENDMAKEFLAGS) -D NODEPS $dep_target \\ - || \$(MAKE) $sub_make_options \$(DEPENDMAKEFLAGS) -D NODEPS $dep_target \\ - ) -EOF + next; } - - $deps_makeinfo .= ".\tendif\n.endif\n\n"; - } - print MAKE $deps_makeinfo if $bsd_make; - - # get the list of library things to add -- in order of dependency - # so things link properly - my @lib_files; - foreach my $dep (reverse @all_deps_for_module) - { - if ($dep =~ m|^lib\/(.+)$|) + next if (m'\AEND-EXCEPT'); + + # new parcel, or a new parcel definition? + if(m/\A\s+(.+)\Z/) { - push @lib_files, "\$(OUTBASE)/$dep/$1.a"; + push @{$parcel_contents{$cur_parcel}},$1 } - elsif ($dep =~ m|^([^/]+)$|) + else { - push @lib_files, "../../$dep/lib$1.a"; + $cur_parcel = $_; + push @parcels,$_; } } +} +close PARCELS; - # need to see if the extra makefile fragments require extra object files - # or include any more makefiles - my @objs = @obj_base; - my @makefile_includes; - - additional_objects_from_make_fragment("$mod/Makefile.extra", \@objs, \@makefile_includes); - additional_objects_from_make_fragment("$mod/Makefile.extra.$build_os", \@objs, \@makefile_includes); +# create parcels directory +mkdir "parcels",0755; +mkdir "parcels/scripts",0755; + +print MASTER_MAKEFILE "parcels:\t",join(' ',map {"build-".$_} @parcels),"\n\n"; + +my $runtest_script = $target_windows ? './infrastructure/mingw/runtest.sh' + : './runtest.pl'; + +print MASTER_MAKEFILE <<__END_OF_FRAGMENT; +.PHONY: test +test: debug_tests release_tests + +.PHONY: debug_tests +debug_tests: + $runtest_script ALL debug + +.PHONY: release_tests +release_tests: + $runtest_script ALL release - my $o_file_list = join(' ',map {'$(OUTDIR)/'.$_.'.o'} sort @objs); +.PHONY: docs +docs: + cd docs; \$(MAKE) - if ($has_deps and not $bsd_make) +__END_OF_FRAGMENT + +my $release_flag = BoxPlatform::make_flag('RELEASE'); +my @parcel_targets; + +for my $parcel (@parcels) +{ + my $version = BoxPlatform::parcel_root($parcel); + my $make_target = BoxPlatform::parcel_target($parcel); + my $dir = BoxPlatform::parcel_dir($parcel); + my @parcel_deps; + + # Need to use BSD install on Solaris + my $install_bin = $build_os eq 'SunOS' ? '/usr/ucb/install' : 'install'; + + unless ($target_windows) { - print MAKE ".PHONY: all\n" . - "all: dep_modules $end_target\n\n"; + open SCRIPT,">parcels/scripts/install-$parcel" or die + "Can't open installer script for $parcel for writing"; + print SCRIPT "#!/bin/sh\n\n"; } - print MAKE $end_target,': ',$o_file_list; - print MAKE " @lib_files" unless $target_is_library; - print MAKE "\n"; - - if ($target_windows) + for(@{$parcel_contents{$parcel}}) { - foreach my $dep (@all_deps_for_module) + my @args = split /\s+/; + + my ($type,$name,$dest) = @args; + my $optional = 0; + my $install = 1; + + if ($type eq 'optional') { - my $res_list = $module_resources_win32{$dep}; - next unless $res_list; - $o_file_list .= ' '.join(' ', - map {'$(OUTBASE)/'.$dep."/$_"} @$res_list); + $optional = 1; + shift @args; + ($type,$name,$dest) = @args; } - } - # stuff to make the final target... - if($target_is_library) - { - # make a library archive... - print MAKE "\t\$(HIDE) (echo -n > $end_target; rm $end_target)\n"; - print MAKE "\t\$(_AR) cq $end_target $o_file_list\n"; - print MAKE "\t\$(_RANLIB) $end_target\n"; - } - else - { - # work out library options - # need to be... least used first, in absolute order they appear in the modules.txt file - my @libops; - - sub libops_fill + if ($type eq 'noinstall') { - my ($module, $libops_ref) = @_; - - my $library_link_opts = $module_library_link_opts{$module}; - if ($library_link_opts) + $install = 0; + shift @args; + ($type,$name,$dest) = @args; + } + + if($type eq 'bin') + { + my $exeext = $platform_exe_ext; + print MASTER_MAKEFILE <<EOF; +$dir/$name$exeext: release/bin/$name/$name$exeext + mkdir -p $dir + $copy_command release/bin/$name/$name$exeext $dir + +EOF + push @parcel_deps, "$dir/$name$exeext"; + } + elsif ($type eq 'script') + { + # Replace any variables ($ac_target etc.) with their + # values. + $name =~ s|(\$[^/ ]+)|$1|eeg; + my $fullpath = $name; + my $filename = $name; + # remove path from script name + $filename =~ s{.*/}{}; + + print MASTER_MAKEFILE <<EOF; +$dir/$filename: $fullpath + mkdir -p $dir +EOF + + if ($optional) { - push @$libops_ref, @$library_link_opts; + print MASTER_MAKEFILE "\ttest -r $fullpath " . + "&& $copy_command $fullpath $dir || true\n"; } - - my $deps = $module_dependency{$module}; - foreach my $dep (@$deps) + else { - libops_fill($dep, $libops_ref); + print MASTER_MAKEFILE "\t$copy_command $fullpath $dir\n"; } + + print MASTER_MAKEFILE "\n"; + + push @parcel_deps, "$dir/$filename"; } - - libops_fill($mod,\@libops); - - my $lo = ''; - my %ldone; - for(@libops) + elsif($type eq 'man') { - next if exists $ldone{$_}; - $lo .= ' '.$_; - $ldone{$_} = 1; + print MASTER_MAKEFILE <<EOF; +$dir/${name}.gz: docs/man/${name}.gz + mkdir -p $dir + $copy_command docs/man/${name}.gz $dir + +EOF + # Releases have the docs pre-made, but users + # may want to rebuild them for some reason. + my $docbook_source = "docs/docbook/${name}"; + $docbook_source =~ s/\.[58]$/.xml/; + print MASTER_MAKEFILE <<EOF; +docs/man/${name}.gz: $docbook_source docs/docbook/bb-man.xsl + cd docs; \$(MAKE) man/${name}.gz + +EOF + push @parcel_deps, "$dir/${name}.gz"; } - - # link line... - print MAKE "\t\$(_LINK) \$(LDFLAGS) $link_line_extra " . - "-o $end_target $o_file_list " . - "@lib_files $lo $platform_lib_files\n"; - } + elsif($type eq 'html') + { + print MASTER_MAKEFILE <<EOF; +$dir/docs/${name}.html: docs/htmlguide/man-html/${name}.html + mkdir -p $dir/docs + $copy_command docs/htmlguide/man-html/${name}.html $dir/docs - # tests need to copy the test file over - if($type eq 'test') - { - print MAKE "\tcp _t \$(OUTDIR)/t\n\tchmod u+x \$(OUTDIR)/t\n"; - print MAKE "\tcp _t-gdb \$(OUTDIR)/t-gdb\n\tchmod u+x \$(OUTDIR)/t-gdb\n"; +EOF + # Releases have the docs pre-made, but users + # may want to rebuild them for some reason. + my $docbook_source = "docs/docbook/${name}.xml"; + print MASTER_MAKEFILE <<EOF; +docs/htmlguide/man-html/${name}.html: $docbook_source docs/docbook/bb-nochunk-book.xsl + cd docs; \$(MAKE) htmlguide/man-html/${name}.html + +EOF + push @parcel_deps, "$dir/docs/${name}.html"; + } + elsif ($type eq 'subdir') + { + push @parcel_deps, "build_${type}_${name}"; + } } - # dependency line? - print MAKE "\n"; + print MASTER_MAKEFILE <<EOF; +build-$parcel: $make_target - # module dependencies for GNU make? - print MAKE $deps_makeinfo if !$bsd_make; - - # print the rest of the file - print MAKE $make,"\n"; - - # and a clean target - print MAKE <<EOF; -clean: - -rm -rf \$(OUTDIR)/* -. ifndef SUBCLEAN +$make_target: @parcel_deps + test -d $dir || mkdir $dir EOF - for my $dep (@all_deps_for_module) - { - print MAKE "\t\$(HIDE) (cd ../../$dep; \$(MAKE) \$(DEPENDMAKEFLAGS) -D SUBCLEAN clean)\n"; - } - print MAKE ".\tendif\n"; + + push @parcel_targets, "build-$parcel"; - # include any extra stuff - print MAKE "\n\n"; - if(-e "$mod/Makefile.extra") - { - print MAKE ".include <Makefile.extra>\n\n"; - } - if(-e "$mod/Makefile.extra.$build_os") + for(@{$parcel_contents{$parcel}}) { - print MAKE ".include <Makefile.extra.$build_os>\n\n"; + my @args = split /\s+/; + + my ($type,$name,$dest) = @args; + + my $optional = 0; + my $install = 1; + + if ($type eq 'optional') + { + $optional = 1; + shift @args; + ($type,$name,$dest) = @args; + } + + if ($type eq 'noinstall') + { + $install = 0; + shift @args; + ($type,$name,$dest) = @args; + } + + if ($type eq 'script') + { + # remove path from script name + $name =~ s{.*/}{}; + } + + if ($type eq 'html') + { + $dest = "share/doc/@PACKAGE_TARNAME@"; + $name = "docs/$name.html"; + } + + if ($type eq 'man') + { + $name =~ /([0-9])$/; + $dest = "man/man$1"; + $name =~ s/$/\.gz/; + } + + if ($install and not $target_windows and not $type eq "subdir") + { + my $local_install_dir = $install_into_dir; + if (defined $dest) + { + if ($dest =~ m,^/,) + { + # Don't add $prefix if $dest is a literal path + $local_install_dir = $dest; + } + else + { + $local_install_dir = "@prefix@/$dest"; + } + } + print SCRIPT "mkdir -p " . + "\${DESTDIR}$local_install_dir/\n"; + print SCRIPT "$install_bin $name " . + "\${DESTDIR}$local_install_dir\n"; + } } - for(@makefile_includes) - { - print MAKE ".include <$_>\n\n"; + + unless ($target_windows) + { + close SCRIPT; + chmod 0755,"parcels/scripts/install-$parcel"; } - # and finally a target for rebuilding the build system - print MAKE "\nbuildsystem:\n\t(cd ../..; perl ./infrastructure/makebuildenv.pl $makebuildenv_args)\n\n"; - - close MAKE; + my $root = BoxPlatform::parcel_root($parcel); - if(!$bsd_make) + unless ($target_windows) { - # need to post process this into a GNU makefile - open MAKE,">$mod/Makefile"; - open MAKEB,"$mod/MakefileX"; + print MASTER_MAKEFILE "\tcp parcels/scripts/install-$parcel $dir\n"; + } - while(<MAKEB>) - { - s/\A\.\s*(ifdef|else|endif|ifndef)/$1/; - s/\A\.\s*include\s+<(.+?)>/include $1/; - s/-D\s+(\w+)/$1=1/g; - print MAKE; - } + print MASTER_MAKEFILE "\t(cd parcels; tar cf - $root | gzip -9 - > $root.tgz )\n"; + + print MASTER_MAKEFILE "\n"; - close MAKEB; - close MAKE; - unlink "$mod/MakefileX"; + unless ($target_windows) + { + print MASTER_MAKEFILE "install-$parcel:\n"; + print MASTER_MAKEFILE "\t(cd $dir; ./install-$parcel)\n\n"; } } +print MASTER_MAKEFILE <<EOF; + +debug_build: @debug_build_targets +release_build: @release_build_targets +parcels: @parcel_targets + +# well-known targets that users might expect to be able to build: +install: + cat local/install.msg + +clean: @all_clean_targets + cd docs; \$(MAKE) clean + +realclean: clean @all_realclean_targets + find release debug -type f -exec rm -f {} \\; + +# and finally a target for rebuilding the build system: +buildsystem: + perl ./infrastructure/makebuildenv.pl $makebuildenv_args +EOF + +for my $parcel (@parcels) +{ + # need to use -f to avoid error if they don't exist (already cleaned) + print MASTER_MAKEFILE "\trm -rf ", BoxPlatform::parcel_dir($parcel), "\n"; + print MASTER_MAKEFILE "\trm -f ", BoxPlatform::parcel_target($parcel), "\n"; +} + +open INSTALLMSG,">local/install.msg" or die "Can't open install message file for writing"; +print INSTALLMSG <<__E; + +Parcels need to be installed separately, and as root. Type one of the following: + +__E + +for(@parcels) +{ + print INSTALLMSG " $make_command install-".$_."\n"; +} +print INSTALLMSG "\n"; + +close INSTALLMSG; + +close MASTER_MAKEFILE; + print "\nType 'cd <module_dir>; $make_command' to build a module\n\n"; if($modules_omitted) diff --git a/infrastructure/makeparcels.pl.in b/infrastructure/makeparcels.pl.in deleted file mode 100755 index 56c4ca66..00000000 --- a/infrastructure/makeparcels.pl.in +++ /dev/null @@ -1,417 +0,0 @@ -#!@PERL@ - -use strict; -use lib 'infrastructure'; -use BoxPlatform; - -my @parcels; -my %parcel_contents; - -sub starts_with ($$) -{ - my ($string,$expected) = @_; - return substr($string, 0, length $expected) eq $expected; -} - -sub os_matches ($) -{ - my ($prefix_string) = @_; - my @prefixes = split m'\,', $prefix_string; - foreach my $prefix (@prefixes) - { - return 1 if starts_with($build_os, $prefix); - return 1 if starts_with($ac_target_os, $prefix); - return 1 if starts_with("$ac_target_cpu-$ac_target_os", - $prefix); - return 1 if starts_with($ac_target, $prefix); - } - return 0; -} - -my $copy_command = "cp -p"; - -if ($build_os eq 'CYGWIN') -{ - $copy_command = "cp -pu"; # faster -} - -open PARCELS,"parcels.txt" or die "Can't open parcels file"; -{ - my $cur_parcel = ''; - while(<PARCELS>) - { - chomp; s/#.+\Z//; s/\s+\Z//; s/\s+/ /g; - next unless m/\S/; - - # omit bits on some platforms? - next if m/\AEND-OMIT/; - if(m/\AOMIT:(.+)/) - { - if (os_matches($1)) - { - while(<PARCELS>) - { - last if m/\AEND-OMIT/; - } - } - next; - } - - if (m'\AONLY:(.+)') - { - if (not os_matches($1)) - { - while (<PARCELS>) - { - last if m'\AEND-ONLY'; - } - } - next; - } - next if (m'\AEND-ONLY'); - - if (m'\AEXCEPT:(.+)') - { - if (os_matches($1)) - { - while (<PARCELS>) - { - last if m'\AEND-EXCEPT'; - } - } - next; - } - next if (m'\AEND-EXCEPT'); - - # new parcel, or a new parcel definition? - if(m/\A\s+(.+)\Z/) - { - push @{$parcel_contents{$cur_parcel}},$1 - } - else - { - $cur_parcel = $_; - push @parcels,$_; - } - } -} -close PARCELS; - -# create parcels directory -mkdir "parcels",0755; -mkdir "parcels/scripts",0755; - -# write master makefile - -open MAKE,">Makefile" or die "Can't open master Makefile for writing"; - -print MAKE <<__E; -# -# AUTOMATICALLY GENERATED FILE -# do not edit! -# -# - -MAKE = $make_command - -__E - -print MAKE "all:\t",join(' ',map {"build-".$_} @parcels),"\n\n"; - -my $runtest_script = $target_windows ? './infrastructure/mingw/runtest.sh' - : './runtest.pl'; - -print MAKE <<__END_OF_FRAGMENT; -test: debug/common/test release/common/test - -debug/common/test: - $runtest_script ALL debug - -release/common/test: - $runtest_script ALL release - -.PHONY: docs -docs: - cd docs; \$(MAKE) - -__END_OF_FRAGMENT - -my $release_flag = BoxPlatform::make_flag('RELEASE'); -my @clean_deps; - -for my $parcel (@parcels) -{ - my $version = BoxPlatform::parcel_root($parcel); - my $make_target = BoxPlatform::parcel_target($parcel); - my $dir = BoxPlatform::parcel_dir($parcel); - my @parcel_deps; - - # Need to use BSD install on Solaris - my $install_bin = $build_os eq 'SunOS' ? '/usr/ucb/install' : 'install'; - - unless ($target_windows) - { - open SCRIPT,">parcels/scripts/install-$parcel" or die - "Can't open installer script for $parcel for writing"; - print SCRIPT "#!/bin/sh\n\n"; - } - - for(@{$parcel_contents{$parcel}}) - { - my @args = split /\s+/; - - my ($type,$name,$dest) = @args; - my $optional = 0; - my $install = 1; - - if ($type eq 'optional') - { - $optional = 1; - shift @args; - ($type,$name,$dest) = @args; - } - - if ($type eq 'noinstall') - { - $install = 0; - shift @args; - ($type,$name,$dest) = @args; - } - - if($type eq 'bin') - { - my $exeext = $platform_exe_ext; - print MAKE <<EOF; -$dir/$name$exeext: release/bin/$name/$name$exeext - mkdir -p $dir - $copy_command release/bin/$name/$name$exeext $dir - -.PHONY: release/bin/$name/$name$exeext -release/bin/$name/$name$exeext: - (cd bin/$name; \$(MAKE) $release_flag) - -EOF - push @parcel_deps, "$dir/$name$exeext"; - } - elsif ($type eq 'script') - { - # Replace any variables ($ac_target etc.) with their - # values. - $name =~ s|(\$[^/ ]+)|$1|eeg; - my $fullpath = $name; - my $filename = $name; - # remove path from script name - $filename =~ s{.*/}{}; - - print MAKE <<EOF; -$dir/$filename: $fullpath - mkdir -p $dir -EOF - - if ($optional) - { - print MAKE "\ttest -r $fullpath " . - "&& $copy_command $fullpath $dir || true\n"; - } - else - { - print MAKE "\t$copy_command $fullpath $dir\n"; - } - - print MAKE "\n"; - - push @parcel_deps, "$dir/$filename"; - } - elsif($type eq 'man') - { - print MAKE <<EOF; -$dir/${name}.gz: docs/man/${name}.gz - mkdir -p $dir - $copy_command docs/man/${name}.gz $dir - -EOF - # Releases have the docs pre-made, but users - # may want to rebuild them for some reason. - my $docbook_source = "docs/docbook/${name}"; - $docbook_source =~ s/\.[58]$/.xml/; - print MAKE <<EOF; -docs/man/${name}.gz: $docbook_source docs/docbook/bb-man.xsl - cd docs; \$(MAKE) man/${name}.gz - -EOF - push @parcel_deps, "$dir/${name}.gz"; - } - elsif($type eq 'html') - { - print MAKE <<EOF; -$dir/docs/${name}.html: docs/htmlguide/man-html/${name}.html - mkdir -p $dir/docs - $copy_command docs/htmlguide/man-html/${name}.html $dir/docs - -EOF - # Releases have the docs pre-made, but users - # may want to rebuild them for some reason. - my $docbook_source = "docs/docbook/${name}.xml"; - print MAKE <<EOF; -docs/htmlguide/man-html/${name}.html: $docbook_source docs/docbook/bb-nochunk-book.xsl - cd docs; \$(MAKE) htmlguide/man-html/${name}.html - -EOF - push @parcel_deps, "$dir/docs/${name}.html"; - } - elsif ($type eq 'subdir') - { - shift @args; - my $subdir = shift @args; - print MAKE <<EOF; -.PHONY: $name-build $name-clean - -$name-build: - cd $subdir; \$(MAKE) @args - -$name-clean: - cd $name; \$(MAKE) clean -EOF - push @parcel_deps, "$name-build"; - push @clean_deps, "$name-clean"; - } - } - - print MAKE <<EOF; -build-$parcel: $make_target - -$make_target: @parcel_deps - test -d $dir || mkdir $dir -EOF - - for(@{$parcel_contents{$parcel}}) - { - my @args = split /\s+/; - - my ($type,$name,$dest) = @args; - - my $optional = 0; - my $install = 1; - - if ($type eq 'optional') - { - $optional = 1; - shift @args; - ($type,$name,$dest) = @args; - } - - if ($type eq 'noinstall') - { - $install = 0; - shift @args; - ($type,$name,$dest) = @args; - } - - if ($type eq 'script') - { - # remove path from script name - $name =~ s{.*/}{}; - } - - if ($type eq 'html') - { - $dest = "share/doc/@PACKAGE_TARNAME@"; - $name = "docs/$name.html"; - } - - if ($type eq 'man') - { - $name =~ /([0-9])$/; - $dest = "man/man$1"; - $name =~ s/$/\.gz/; - } - - if ($install and not $target_windows and not $type eq "subdir") - { - my $local_install_dir = $install_into_dir; - if (defined $dest) - { - if ($dest =~ m,^/,) - { - # Don't add $prefix if $dest is a literal path - $local_install_dir = $dest; - } - else - { - $local_install_dir = "@prefix@/$dest"; - } - } - print SCRIPT "mkdir -p " . - "\${DESTDIR}$local_install_dir/\n"; - print SCRIPT "$install_bin $name " . - "\${DESTDIR}$local_install_dir\n"; - } - } - - unless ($target_windows) - { - close SCRIPT; - chmod 0755,"parcels/scripts/install-$parcel"; - } - - my $root = BoxPlatform::parcel_root($parcel); - - unless ($target_windows) - { - print MAKE "\tcp parcels/scripts/install-$parcel $dir\n"; - } - - print MAKE "\t(cd parcels; tar cf - $root | gzip -9 - > $root.tgz )\n"; - - print MAKE "\n"; - - unless ($target_windows) - { - print MAKE "install-$parcel:\n"; - print MAKE "\t(cd $dir; ./install-$parcel)\n\n"; - } -} - -print MAKE <<EOF; -install: - cat local/install.msg - -clean: @clean_deps - cd docs; \$(MAKE) clean -EOF - -if ($build_os eq 'CYGWIN') -{ - print MAKE "\tfind release debug -type f | xargs -r rm\n"; - print MAKE "\tfind . -name 'autogen_*' -type f | xargs -r rm\n"; -} -else -{ - print MAKE "\tfind release debug -type f -exec rm -f {} \\;\n"; - print MAKE "\tfind . -name 'autogen_*' -type f -exec rm -f {} \\;\n"; -} - -for my $parcel (@parcels) -{ - # need to use -f to avoid error if they don't exist (already cleaned) - print MAKE "\trm -rf ", BoxPlatform::parcel_dir($parcel), "\n"; - print MAKE "\trm -f ", BoxPlatform::parcel_target($parcel), "\n"; -} - -close MAKE; - -open INSTALLMSG,">local/install.msg" or die "Can't open install message file for writing"; -print INSTALLMSG <<__E; - -Parcels need to be installed separately, and as root. Type one of the following: - -__E - -for(@parcels) -{ - print INSTALLMSG " $make_command install-".$_."\n"; -} -print INSTALLMSG "\n"; - -close INSTALLMSG; - diff --git a/infrastructure/mingw/compile-boxbackup-cygwin.sh b/infrastructure/mingw/compile-boxbackup-cygwin.sh deleted file mode 100755 index 02b05852..00000000 --- a/infrastructure/mingw/compile-boxbackup-cygwin.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh - -set -e -set -x - -basedir=`cd $(dirname $0)/../../.. && pwd` -cd $basedir - -wget -c https://cygwin.com/setup-x86_64.exe \ -|| powershell wget https://cygwin.com/setup-x86_64.exe -UseBasicParsing -outfile setup-x86_64.exe - -chmod a+x setup-x86_64.exe -./setup-x86_64.exe --quiet-mode --packages \ - "autoconf,automake,gdb,make,mingw64-x86_64-gcc,mingw64-x86_64-gcc-g++, - ,mingw64-x86_64-zlib,libxml2,libxslt,perl,subversion,unzip,vim,wget" - -install_prefix=/usr/x86_64-w64-mingw32 -compiler_prefix=x86_64-w64-mingw32 - -openssl_source=https://www.openssl.org/source/ -latest_openssl=`wget -O- -q $openssl_source \ -| grep '<td><a href="openssl-1.0.*.tar.gz">' \ -| sed -e 's/.tar.gz">.*//' -e 's/.*"//' | sort | tail -1` - -wget -c $openssl_source/$latest_openssl.tar.gz -tar xzf $latest_openssl.tar.gz --exclude $latest_openssl/Makefile -( - cd $latest_openssl - ./Configure --prefix=$install_prefix mingw64 \ - --cross-compile-prefix=$compiler_prefix- - - # Avoid recompilation by caching the previous Makefile for its timestamp, - # and reusing if it hasn't changed. - if diff --brief Makefile ../openssl.makefile.cache; then - cp -a ../openssl.makefile.cache Makefile - else - cp -a Makefile ../openssl.makefile.cache - fi - - make - make install_sw -) - -pcre_url=`wget -O- -q ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \ -| grep 'pcre-8.*.tar.bz2"' | sed -e 's/">pcre-.*//' | sed -e 's/.*<a href="//' \ -| tail -1` -pcre_version=`basename $pcre_url .tar.bz2` -wget -c $pcre_url -tar xjf `basename $pcre_url` -( - cd $pcre_version - ./configure --prefix=$install_prefix --disable-shared \ - --host=$compiler_prefix - make - make install -) - diff --git a/infrastructure/mingw/configure.sh b/infrastructure/mingw/configure.sh deleted file mode 100755 index 98c0cb49..00000000 --- a/infrastructure/mingw/configure.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh - -source `dirname $0`/environment.sh - -if [ ! -r "$DEP_PATH/lib/libssl.a" ]; then - echo "Error: install OpenSSL as instructed by" \ - "docs/backup/win32_build_on_cygwin_using_mingw.txt" >&2 - exit 2 -fi - -if [ ! -r "$DEP_PATH/lib/libpcreposix.a" \ - -o ! -r "$DEP_PATH/lib/libpcre.a" \ - -o ! -r "$DEP_PATH/include/pcreposix.h" ]; then - echo "Error: install PCRE as instructed by" \ - "docs/backup/win32_build_on_cygwin_using_mingw.txt" >&2 - exit 2 -fi - -LIBZ_PATH="${DEP_PATH}/sys-root/mingw/lib" - -if [ ! -r "$LIBZ_PATH/libz.dll.a" ]; then - echo "Error: upgrade your Cygwin mingw-zlib-devel package" >&2 - exit 2 -fi - -if [ ! -x "configure" ]; then - if ! ./bootstrap; then - echo "Error: bootstrap failed, aborting." >&2 - exit 1 - fi -fi - -if ! ./configure "$@" --host=$target \ - --with-ssl-headers="${DEP_PATH}/include" \ - --with-ssl-lib="${DEP_PATH}/lib" \ - CFLAGS="-mthreads" \ - CXXFLAGS="-mthreads" \ - LDFLAGS="-Wl,-Bstatic -mthreads -L${LIBZ_PATH}" \ - LIBS="-lws2_32 -lgdi32" -then - echo "Error: configure failed, aborting." >&2 - exit 1 -fi - -exit 0 diff --git a/infrastructure/mingw/environment.sh b/infrastructure/mingw/environment.sh deleted file mode 100644 index 1f2f14c2..00000000 --- a/infrastructure/mingw/environment.sh +++ /dev/null @@ -1,11 +0,0 @@ -case "`uname -m`" in -x86_64) - DEP_PATH=/usr/x86_64-w64-mingw32 - target=x86_64-w64-mingw32 ;; -i686) - DEP_PATH=/usr/i686-pc-mingw32 - target=i686-pc-mingw32 ;; -*) - echo "Error: unknown machine type `uname -m`" >&2; exit 1 ;; -esac - diff --git a/infrastructure/mingw/runtest.sh b/infrastructure/mingw/runtest.sh deleted file mode 100755 index 4deecb47..00000000 --- a/infrastructure/mingw/runtest.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -source `dirname $0`/environment.sh - -export PATH=$DEP_PATH/sys-root/mingw/bin:$PATH - -exec `dirname $0`/../../runtest.pl "$@" diff --git a/infrastructure/msvc/2003/bbackupctl.vcproj b/infrastructure/msvc/2003/bbackupctl.vcproj deleted file mode 100644 index 02f7482e..00000000 --- a/infrastructure/msvc/2003/bbackupctl.vcproj +++ /dev/null @@ -1,159 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="bbackupctl"
- ProjectGUID="{9FD51412-E945-4457-A17A-CA3C505CF431}"
- Keyword="Win32Proj">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\..\..\Debug"
- IntermediateDirectory="..\..\..\Debug"
- ConfigurationType="1"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\..\db-4.2.52.NC\build_win32";"$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\include";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;BOX_RELEASE_BUILD "
- MinimalRebuild="TRUE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="4"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\Debug\common.lib"
- OutputFile="$(OutDir)/bbackupctl.exe"
- LinkIncremental="2"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="$(OutDir)/bbackupctl.pdb"
- SubSystem="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="..\..\..\Release"
- IntermediateDirectory="..\..\..\Release"
- ConfigurationType="1"
- CharacterSet="2"
- WholeProgramOptimization="TRUE">
- <Tool
- Name="VCCLCompilerTool"
- EnableFiberSafeOptimizations="TRUE"
- OptimizeForProcessor="1"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\include";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\""
- PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING"
- RuntimeLibrary="0"
- BufferSecurityCheck="FALSE"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\Release\common.lib"
- OutputFile="$(OutDir)/bbackupctl.exe"
- LinkIncremental="1"
- IgnoreDefaultLibraryNames=""
- GenerateDebugInformation="TRUE"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
- <Filter
- Name="bin"
- Filter="">
- <Filter
- Name="bbackupctl"
- Filter="">
- <File
- RelativePath="..\..\..\bin\bbackupctl\bbackupctl.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\win32\WinNamedPipeStream.cpp">
- </File>
- </Filter>
- </Filter>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
- <File
- RelativePath="..\..\..\lib\win32\WinNamedPipeStream.h">
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
- <File
- RelativePath="..\..\..\lib\win32\messages.rc">
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/infrastructure/msvc/2003/bbackupd.vcproj b/infrastructure/msvc/2003/bbackupd.vcproj deleted file mode 100644 index f34db0cc..00000000 --- a/infrastructure/msvc/2003/bbackupd.vcproj +++ /dev/null @@ -1,219 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="bbackupd"
- ProjectGUID="{22D325FB-9131-4BD6-B390-968F0491D687}"
- Keyword="Win32Proj">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\..\..\Debug"
- IntermediateDirectory="..\..\..\Debug"
- ConfigurationType="1"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)..\..\..\..\db-4.2.52.NC\build_win32";"$(SolutionDir)..\..\..\..\boost_1_31_0";"$(SolutionDir)..\..\..\..\openssl\include";"$(SolutionDir)..\..\..\..\zlib\include";"$(SolutionDir)..\..\..\lib\backupclient";"$(SolutionDir)..\..\..\lib\server";"$(SolutionDir)..\..\..\lib\crypto";"$(SolutionDir)..\..\..\lib\compress";"$(SolutionDir)..\..\..\lib\win32";"$(SolutionDir)..\..\..\lib\common\""
- PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;BOX_RELEASE_BUILD "
- MinimalRebuild="TRUE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="4"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\Debug\common.lib"
- OutputFile="$(OutDir)/bbackupd.exe"
- LinkIncremental="2"
- IgnoreAllDefaultLibraries="FALSE"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="$(OutDir)/bbackupd.pdb"
- SubSystem="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="..\..\..\Release"
- IntermediateDirectory="..\..\..\Release"
- ConfigurationType="1"
- CharacterSet="2"
- WholeProgramOptimization="TRUE">
- <Tool
- Name="VCCLCompilerTool"
- EnableFiberSafeOptimizations="TRUE"
- OptimizeForProcessor="1"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\include";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\";"$(SolutionDir)..\..\..\..\boost_1_31_0""
- PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;BOOST_REGEX_NO_LIB"
- RuntimeLibrary="0"
- BufferSecurityCheck="FALSE"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\Release\common.lib"
- OutputFile="$(OutDir)/bbackupd.exe"
- LinkIncremental="1"
- IgnoreDefaultLibraryNames=""
- GenerateDebugInformation="TRUE"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
- <Filter
- Name="bin"
- Filter="">
- <Filter
- Name="bbackupd"
- Filter="">
- <File
- RelativePath="..\..\..\bin\bbackupd\autogen_ClientException.cpp">
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\BackupClientContext.cpp">
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\BackupClientDeleteList.cpp">
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\BackupClientDirectoryRecord.cpp">
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\BackupClientInodeToIDMap.cpp">
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\BackupDaemon.cpp">
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\bbackupd.cpp">
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\Win32BackupService.cpp">
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\Win32ServiceFunctions.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\win32\WinNamedPipeStream.cpp">
- </File>
- </Filter>
- </Filter>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
- <Filter
- Name="bin"
- Filter="">
- <Filter
- Name="bbackupd"
- Filter="">
- <File
- RelativePath="..\..\..\bin\bbackupd\autogen_ClientException.h">
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\BackupClientContext.h">
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\BackupClientDeleteList.h">
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\BackupClientDirectoryRecord.h">
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\BackupClientInodeToIDMap.h">
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\BackupDaemon.h">
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\Win32BackupService.h">
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\Win32ServiceFunctions.h">
- </File>
- <File
- RelativePath="..\..\..\lib\win32\WinNamedPipeStream.h">
- </File>
- </Filter>
- </Filter>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
- <File
- RelativePath="..\..\..\lib\win32\messages.rc">
- </File>
- </Filter>
- <File
- RelativePath="..\..\..\ReadMe.txt">
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/infrastructure/msvc/2003/boxbackup.sln b/infrastructure/msvc/2003/boxbackup.sln deleted file mode 100644 index d9a28041..00000000 --- a/infrastructure/msvc/2003/boxbackup.sln +++ /dev/null @@ -1,57 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boxquery", "boxquery.vcproj", "{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}"
- ProjectSection(ProjectDependencies) = postProject
- {A089CEE6-EBF0-4232-A0C0-74850A8127A6} = {A089CEE6-EBF0-4232-A0C0-74850A8127A6}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcproj", "{A089CEE6-EBF0-4232-A0C0-74850A8127A6}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbackupd", "bbackupd.vcproj", "{22D325FB-9131-4BD6-B390-968F0491D687}"
- ProjectSection(ProjectDependencies) = postProject
- {A089CEE6-EBF0-4232-A0C0-74850A8127A6} = {A089CEE6-EBF0-4232-A0C0-74850A8127A6}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32test", "win32test.vcproj", "{28C29E72-76A2-4D0C-B35B-12D446733D2E}"
- ProjectSection(ProjectDependencies) = postProject
- {A089CEE6-EBF0-4232-A0C0-74850A8127A6} = {A089CEE6-EBF0-4232-A0C0-74850A8127A6}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbackupctl", "bbackupctl.vcproj", "{9FD51412-E945-4457-A17A-CA3C505CF431}"
- ProjectSection(ProjectDependencies) = postProject
- {A089CEE6-EBF0-4232-A0C0-74850A8127A6} = {A089CEE6-EBF0-4232-A0C0-74850A8127A6}
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- Release = Release
- EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Debug.ActiveCfg = Debug|Win32
- {FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Debug.Build.0 = Debug|Win32
- {FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Release.ActiveCfg = Release|Win32
- {FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Release.Build.0 = Release|Win32
- {A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Debug.ActiveCfg = Debug|Win32
- {A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Debug.Build.0 = Debug|Win32
- {A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Release.ActiveCfg = Release|Win32
- {A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Release.Build.0 = Release|Win32
- {22D325FB-9131-4BD6-B390-968F0491D687}.Debug.ActiveCfg = Debug|Win32
- {22D325FB-9131-4BD6-B390-968F0491D687}.Debug.Build.0 = Debug|Win32
- {22D325FB-9131-4BD6-B390-968F0491D687}.Release.ActiveCfg = Release|Win32
- {22D325FB-9131-4BD6-B390-968F0491D687}.Release.Build.0 = Release|Win32
- {28C29E72-76A2-4D0C-B35B-12D446733D2E}.Debug.ActiveCfg = Debug|Win32
- {28C29E72-76A2-4D0C-B35B-12D446733D2E}.Debug.Build.0 = Debug|Win32
- {28C29E72-76A2-4D0C-B35B-12D446733D2E}.Release.ActiveCfg = Release|Win32
- {28C29E72-76A2-4D0C-B35B-12D446733D2E}.Release.Build.0 = Release|Win32
- {9FD51412-E945-4457-A17A-CA3C505CF431}.Debug.ActiveCfg = Debug|Win32
- {9FD51412-E945-4457-A17A-CA3C505CF431}.Debug.Build.0 = Debug|Win32
- {9FD51412-E945-4457-A17A-CA3C505CF431}.Release.ActiveCfg = Release|Win32
- {9FD51412-E945-4457-A17A-CA3C505CF431}.Release.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
diff --git a/infrastructure/msvc/2003/boxquery.vcproj b/infrastructure/msvc/2003/boxquery.vcproj deleted file mode 100644 index 6ac09024..00000000 --- a/infrastructure/msvc/2003/boxquery.vcproj +++ /dev/null @@ -1,174 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="boxquery"
- ProjectGUID="{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}"
- RootNamespace="boxquery"
- Keyword="Win32Proj">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\..\..\Debug"
- IntermediateDirectory="..\..\..\Debug"
- ConfigurationType="1"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\include";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\";"$(SolutionDir)..\..\..\..\boost_1_31_0""
- PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;BOX_RELEASE_BUILD "
- MinimalRebuild="TRUE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="4"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\Debug\common.lib"
- OutputFile="$(OutDir)/bbackupquery.exe"
- LinkIncremental="2"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="$(OutDir)/boxquery.pdb"
- SubSystem="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="..\..\..\Release"
- IntermediateDirectory="..\..\..\Release"
- ConfigurationType="1"
- CharacterSet="2"
- WholeProgramOptimization="TRUE">
- <Tool
- Name="VCCLCompilerTool"
- EnableFiberSafeOptimizations="TRUE"
- OptimizeForProcessor="1"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\include";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\";"$(SolutionDir)..\..\..\..\boost_1_31_0""
- PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;BOOST_REGEX_NO_LIB"
- RuntimeLibrary="0"
- BufferSecurityCheck="FALSE"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\Release\common.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib"
- OutputFile="$(OutDir)/bbackupquery.exe"
- LinkIncremental="1"
- IgnoreDefaultLibraryNames=""
- GenerateDebugInformation="FALSE"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
- <Filter
- Name="bin"
- Filter="">
- <Filter
- Name="backupquery"
- Filter="">
- <File
- RelativePath="..\..\..\bin\bbackupquery\autogen_Documentation.cpp">
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupquery\BackupQueries.cpp">
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupquery\bbackupquery.cpp">
- </File>
- </Filter>
- </Filter>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
- <Filter
- Name="bin"
- Filter="">
- <Filter
- Name="backupquery"
- Filter="">
- <File
- RelativePath="..\..\..\bin\bbackupquery\BackupQueries.h">
- </File>
- </Filter>
- </Filter>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
- <File
- RelativePath="..\..\..\lib\win32\messages.rc">
- </File>
- </Filter>
- <File
- RelativePath="..\..\..\ReadMe.txt">
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/infrastructure/msvc/2003/common.vcproj b/infrastructure/msvc/2003/common.vcproj deleted file mode 100644 index fb18b76a..00000000 --- a/infrastructure/msvc/2003/common.vcproj +++ /dev/null @@ -1,672 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="common"
- ProjectGUID="{A089CEE6-EBF0-4232-A0C0-74850A8127A6}"
- Keyword="Win32Proj">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\..\..\Debug"
- IntermediateDirectory="..\..\..\Debug"
- ConfigurationType="4"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\include";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\";"$(SolutionDir)..\..\..\..\boost_1_31_0\""
- PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;BOX_RELEASE_BUILD "
- MinimalRebuild="TRUE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="4"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/common.lib"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="..\..\..\Release"
- IntermediateDirectory="..\..\..\Release"
- ConfigurationType="4"
- CharacterSet="2"
- WholeProgramOptimization="TRUE">
- <Tool
- Name="VCCLCompilerTool"
- EnableFiberSafeOptimizations="TRUE"
- OptimizeForProcessor="1"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\include";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\";"$(SolutionDir)..\..\..\..\boost_1_31_0\""
- PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;BOX_RELEASE_BUILD;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING"
- RuntimeLibrary="0"
- BufferSecurityCheck="FALSE"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/common.lib"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
- <Filter
- Name="lib"
- Filter="">
- <Filter
- Name="compress"
- Filter="">
- <File
- RelativePath="..\..\..\lib\compress\autogen_CompressException.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\compress\CompressStream.cpp">
- </File>
- </Filter>
- <Filter
- Name="common"
- Filter="">
- <File
- RelativePath="..\..\..\lib\common\autogen_CommonException.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\autogen_ConversionException.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\BoxException.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\BoxTime.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\BoxTimeToText.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\CollectInBufferStream.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\Configuration.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\ConversionString.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\DebugAssertFailed.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\DebugMemLeakFinder.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\DebugPrintf.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\EventWatchFilesystemObject.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\ExcludeList.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\FdGetLine.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\FileStream.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\IOStream.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\IOStreamGetLine.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\Logging.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\MemBlockStream.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\PartialReadStream.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\PathUtils.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\ReadGatherStream.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\ReadLoggingStream.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\StreamableMemBlock.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\UnixUser.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\Utils.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\common\WaitForEvent.cpp">
- </File>
- </Filter>
- <Filter
- Name="backupclient"
- Filter="">
- <File
- RelativePath="..\..\..\lib\backupclient\autogen_BackupProtocolClient.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\autogen_BackupStoreException.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupClientCryptoKeys.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupClientFileAttributes.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupClientMakeExcludeList.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupClientRestore.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupDaemonConfigVerify.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreDirectory.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFile.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFileCmbDiff.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFileCmbIdx.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFileCombine.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFileCryptVar.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFileDiff.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFileEncodeStream.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFilename.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFilenameClear.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFileRevDiff.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreObjectDump.cpp">
- </File>
- </Filter>
- <Filter
- Name="crypto"
- Filter="">
- <File
- RelativePath="..\..\..\lib\crypto\autogen_CipherException.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\CipherAES.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\CipherBlowfish.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\CipherContext.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\CipherDescription.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\MD5Digest.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\Random.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\RollingChecksum.cpp">
- </File>
- </Filter>
- <Filter
- Name="win32"
- Filter="">
- <File
- RelativePath="..\..\..\lib\win32\emu.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\win32\getopt_long.cxx">
- </File>
- </Filter>
- <Filter
- Name="server"
- Filter="">
- <File
- RelativePath="..\..\..\lib\server\autogen_ConnectionException.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\server\autogen_ServerException.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\server\Daemon.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\server\LocalProcessStream.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\server\Protocol.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\server\ProtocolObject.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\server\ProtocolUncertainStream.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\server\Socket.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\server\SocketStream.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\server\SocketStreamTLS.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\server\SSLLib.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\server\TLSContext.cpp">
- </File>
- <File
- RelativePath="..\..\..\lib\server\WinNamedPipeStream.cpp">
- </File>
-
- </Filter>
- </Filter>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
- <Filter
- Name="lib"
- Filter="">
- <Filter
- Name="compress"
- Filter="">
- <File
- RelativePath="..\..\..\lib\compress\autogen_CompressException.h">
- </File>
- <File
- RelativePath="..\..\..\lib\compress\Compress.h">
- </File>
- <File
- RelativePath="..\..\..\lib\compress\CompressException.h">
- </File>
- <File
- RelativePath="..\..\..\lib\compress\CompressStream.h">
- </File>
- </Filter>
- <Filter
- Name="common"
- Filter="">
- <File
- RelativePath="..\..\..\lib\common\autogen_CommonException.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\autogen_ConversionException.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\BannerText.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\BeginStructPackForWire.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\Box.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\BoxException.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\BoxPlatform.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\BoxPortsAndFiles.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\BoxTime.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\BoxTimeToText.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\BoxTimeToUnix.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\CollectInBufferStream.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\CommonException.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\Configuration.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\Conversion.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\EndStructPackForWire.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\EventWatchFilesystemObject.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\ExcludeList.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\FdGetLine.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\FileModificationTime.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\FileStream.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\Guards.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\IOStream.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\IOStreamGetLine.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\LinuxWorkaround.h">
- </File>
- <File
- RelativePath="..\..\..\lib\server\LocalProcessStream.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\Logging.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\MainHelper.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\MemBlockStream.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\MemLeakFinder.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\MemLeakFindOff.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\MemLeakFindOn.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\NamedLock.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\PartialReadStream.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\PathUtils.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\ReadGatherStream.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\StreamableMemBlock.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\TemporaryDirectory.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\Test.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\Timer.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\UnixUser.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\Utils.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\WaitForEvent.h">
- </File>
- <File
- RelativePath="..\..\..\lib\common\BoxVersion.h">
- </File>
- </Filter>
- <Filter
- Name="backupclient"
- Filter="">
- <File
- RelativePath="..\..\..\lib\backupclient\autogen_BackupProtocolClient.h">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\autogen_BackupStoreException.h">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupClientCryptoKeys.h">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupClientFileAttributes.h">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupClientMakeExcludeList.h">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupClientRestore.h">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupDaemonConfigVerify.h">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreConstants.h">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreDirectory.h">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreException.h">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFile.h">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFileCryptVar.h">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFileEncodeStream.h">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFilename.h">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFilenameClear.h">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFileWire.h">
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreObjectMagic.h">
- </File>
- </Filter>
- <Filter
- Name="crypto"
- Filter="">
- <File
- RelativePath="..\..\..\lib\crypto\autogen_CipherException.h">
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\CipherAES.h">
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\CipherBlowfish.h">
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\CipherContext.h">
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\CipherDescription.h">
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\CipherException.h">
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\MD5Digest.h">
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\Random.h">
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\RollingChecksum.h">
- </File>
- </Filter>
- <Filter
- Name="win32"
- Filter="">
- <File
- RelativePath="..\..\..\lib\win32\emu.h">
- </File>
- <File
- RelativePath="..\..\..\lib\win32\getopt.h">
- </File>
- <File
- RelativePath="..\..\..\lib\win32\WinNamedPipeStream.h">
- </File>
- </Filter>
- <Filter
- Name="server"
- Filter="">
- <File
- RelativePath="..\..\..\lib\server\autogen_ConnectionException.h">
- </File>
- <File
- RelativePath="..\..\..\lib\server\autogen_ServerException.h">
- </File>
- <File
- RelativePath="..\..\..\lib\server\Daemon.h">
- </File>
- <File
- RelativePath="..\..\..\lib\server\Protocol.h">
- </File>
- <File
- RelativePath="..\..\..\lib\server\ProtocolObject.h">
- </File>
- <File
- RelativePath="..\..\..\lib\server\ProtocolUncertainStream.h">
- </File>
- <File
- RelativePath="..\..\..\lib\server\ProtocolWire.h">
- </File>
- <File
- RelativePath="..\..\..\lib\server\ServerException.h">
- </File>
- <File
- RelativePath="..\..\..\lib\server\ServerStream.h">
- </File>
- <File
- RelativePath="..\..\..\lib\server\ServerTLS.h">
- </File>
- <File
- RelativePath="..\..\..\lib\server\Socket.h">
- </File>
- <File
- RelativePath="..\..\..\lib\server\SocketListen.h">
- </File>
- <File
- RelativePath="..\..\..\lib\server\SocketStream.h">
- </File>
- <File
- RelativePath="..\..\..\lib\server\SocketStreamTLS.h">
- </File>
- <File
- RelativePath="..\..\..\lib\server\SSLLib.h">
- </File>
- <File
- RelativePath="..\..\..\lib\server\TLSContext.h">
- </File>
- <File
- RelativePath="..\..\..\lib\server\WinNamedPipeStream.h">
- </File>
- </Filter>
- </Filter>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/infrastructure/msvc/2003/win32test.vcproj b/infrastructure/msvc/2003/win32test.vcproj deleted file mode 100644 index 2ef7164e..00000000 --- a/infrastructure/msvc/2003/win32test.vcproj +++ /dev/null @@ -1,148 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="win32test"
- ProjectGUID="{28C29E72-76A2-4D0C-B35B-12D446733D2E}"
- Keyword="Win32Proj">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\..\..\Debug"
- IntermediateDirectory="..\..\..\Debug"
- ConfigurationType="1"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\bin\bbackupd";"$(ProjectDir)..\..\..\..\db-4.2.52.NC\build_win32";"$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\include";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING"
- MinimalRebuild="TRUE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="4"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\Debug\common.lib"
- OutputFile="$(OutDir)/win32test.exe"
- LinkIncremental="2"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="$(OutDir)/win32test.pdb"
- SubSystem="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="..\..\..\Release"
- IntermediateDirectory="..\..\..\Release"
- ConfigurationType="1"
- CharacterSet="2"
- WholeProgramOptimization="TRUE">
- <Tool
- Name="VCCLCompilerTool"
- EnableFiberSafeOptimizations="TRUE"
- OptimizeForProcessor="1"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\bin\bbackupd";"$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\include";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\""
- PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING"
- RuntimeLibrary="0"
- BufferSecurityCheck="FALSE"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib $(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib $(ProjectDir)..\..\..\Release\common.lib"
- OutputFile="$(OutDir)/win32test.exe"
- LinkIncremental="1"
- IgnoreDefaultLibraryNames=""
- GenerateDebugInformation="TRUE"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
- <File
- RelativePath="..\..\..\lib\win32\emu.cpp">
- </File>
- <File
- RelativePath="..\..\..\test\win32\testlibwin32.cpp">
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
- </Filter>
- <File
- RelativePath="..\..\..\ReadMe.txt">
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/infrastructure/msvc/2005/bbackupctl.vcproj b/infrastructure/msvc/2005/bbackupctl.vcproj deleted file mode 100644 index 216a284b..00000000 --- a/infrastructure/msvc/2005/bbackupctl.vcproj +++ /dev/null @@ -1,222 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="bbackupctl"
- ProjectGUID="{9FD51412-E945-4457-A17A-CA3C505CF431}"
- RootNamespace="bbackupctl"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\..\..\Debug"
- IntermediateDirectory="..\..\..\Debug"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\common";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\..\openssl\inc32";"$(ProjectDir)..\..\..\..\zlib\include""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Ws2_32.lib Advapi32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\out32dll\libeay32.lib $(ProjectDir)..\..\..\..\openssl\out32dll\ssleay32.lib $(ProjectDir)..\..\..\Debug\common.lib $(ProjectDir)..\..\..\..\pcre\bin\debug\pcreposix.lib $(ProjectDir)..\..\..\..\pcre\bin\debug\pcre.lib"
- OutputFile="$(OutDir)/bbackupctl.exe"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/bbackupctl.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="..\..\..\Release"
- IntermediateDirectory="..\..\..\Release"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- EnableFiberSafeOptimizations="true"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\inc32";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\""
- PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"
- RuntimeLibrary="0"
- BufferSecurityCheck="false"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\out32dll\libeay32.lib $(ProjectDir)..\..\..\..\openssl\out32dll\ssleay32.lib $(ProjectDir)..\..\..\Release\common.lib $(ProjectDir)..\..\..\..\pcre\bin\release\lib_pcreposix.lib $(ProjectDir)..\..\..\..\pcre\bin\release\lib_pcre.lib"
- OutputFile="$(OutDir)/bbackupctl.exe"
- LinkIncremental="1"
- IgnoreDefaultLibraryNames=""
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <Filter
- Name="bin"
- >
- <Filter
- Name="bbackupctl"
- >
- <File
- RelativePath="..\..\..\bin\bbackupctl\bbackupctl.cpp"
- >
- </File>
- </Filter>
- </Filter>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- <File
- RelativePath="..\..\..\lib\win32\messages.rc"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/infrastructure/msvc/2005/bbackupd.vcproj b/infrastructure/msvc/2005/bbackupd.vcproj deleted file mode 100644 index ac8eb86a..00000000 --- a/infrastructure/msvc/2005/bbackupd.vcproj +++ /dev/null @@ -1,299 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="bbackupd"
- ProjectGUID="{22D325FB-9131-4BD6-B390-968F0491D687}"
- RootNamespace="bbackupd"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\..\..\Debug"
- IntermediateDirectory="..\..\..\Debug"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)..\..\..\lib\backupclient";"$(SolutionDir)..\..\..\lib\common";"$(SolutionDir)..\..\..\lib\compress";"$(SolutionDir)..\..\..\lib\crypto";"$(SolutionDir)..\..\..\lib\server";"$(SolutionDir)..\..\..\lib\win32";"$(SolutionDir)..\..\..\..\openssl\inc32";"$(SolutionDir)..\..\..\..\zlib\include""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Ws2_32.lib Advapi32.lib User32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\out32dll\libeay32.lib $(ProjectDir)..\..\..\..\openssl\out32dll\ssleay32.lib $(ProjectDir)..\..\..\Debug\common.lib $(ProjectDir)..\..\..\..\pcre\bin\debug\pcreposix.lib $(ProjectDir)..\..\..\..\pcre\bin\debug\pcre.lib"
- OutputFile="$(OutDir)/bbackupd.exe"
- LinkIncremental="2"
- IgnoreAllDefaultLibraries="false"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/bbackupd.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="..\..\..\Release"
- IntermediateDirectory="..\..\..\Release"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- EnableFiberSafeOptimizations="true"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(SolutionDir)..\..\..\..\openssl\inc32";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\""
- PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"
- RuntimeLibrary="0"
- BufferSecurityCheck="false"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\out32dll\libeay32.lib $(ProjectDir)..\..\..\..\openssl\out32dll\ssleay32.lib $(ProjectDir)..\..\..\Release\common.lib $(ProjectDir)..\..\..\..\pcre\bin\release\lib_pcreposix.lib $(ProjectDir)..\..\..\..\pcre\bin\release\lib_pcre.lib"
- OutputFile="$(OutDir)/bbackupd.exe"
- LinkIncremental="1"
- IgnoreDefaultLibraryNames=""
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <Filter
- Name="bin"
- >
- <Filter
- Name="bbackupd"
- >
- <File
- RelativePath="..\..\..\bin\bbackupd\autogen_ClientException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\BackupClientContext.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\BackupClientDeleteList.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\BackupClientDirectoryRecord.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\BackupClientInodeToIDMap.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\BackupDaemon.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\bbackupd.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\Win32BackupService.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\Win32ServiceFunctions.cpp"
- >
- </File>
- </Filter>
- </Filter>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <Filter
- Name="bin"
- >
- <Filter
- Name="bbackupd"
- >
- <File
- RelativePath="..\..\..\bin\bbackupd\autogen_ClientException.h"
- >
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\BackupClientContext.h"
- >
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\BackupClientDeleteList.h"
- >
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\BackupClientDirectoryRecord.h"
- >
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\BackupClientInodeToIDMap.h"
- >
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\BackupDaemon.h"
- >
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\Win32BackupService.h"
- >
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupd\Win32ServiceFunctions.h"
- >
- </File>
- </Filter>
- </Filter>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- <File
- RelativePath="..\..\..\lib\win32\messages.rc"
- >
- </File>
- </Filter>
- <File
- RelativePath="..\..\..\ReadMe.txt"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/infrastructure/msvc/2005/boxbackup.sln b/infrastructure/msvc/2005/boxbackup.sln deleted file mode 100644 index 833066e9..00000000 --- a/infrastructure/msvc/2005/boxbackup.sln +++ /dev/null @@ -1,55 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boxquery", "boxquery.vcproj", "{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}"
- ProjectSection(ProjectDependencies) = postProject
- {A089CEE6-EBF0-4232-A0C0-74850A8127A6} = {A089CEE6-EBF0-4232-A0C0-74850A8127A6}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcproj", "{A089CEE6-EBF0-4232-A0C0-74850A8127A6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbackupd", "bbackupd.vcproj", "{22D325FB-9131-4BD6-B390-968F0491D687}"
- ProjectSection(ProjectDependencies) = postProject
- {A089CEE6-EBF0-4232-A0C0-74850A8127A6} = {A089CEE6-EBF0-4232-A0C0-74850A8127A6}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32test", "win32test.vcproj", "{28C29E72-76A2-4D0C-B35B-12D446733D2E}"
- ProjectSection(ProjectDependencies) = postProject
- {A089CEE6-EBF0-4232-A0C0-74850A8127A6} = {A089CEE6-EBF0-4232-A0C0-74850A8127A6}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbackupctl", "bbackupctl.vcproj", "{9FD51412-E945-4457-A17A-CA3C505CF431}"
- ProjectSection(ProjectDependencies) = postProject
- {A089CEE6-EBF0-4232-A0C0-74850A8127A6} = {A089CEE6-EBF0-4232-A0C0-74850A8127A6}
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Debug|Win32.ActiveCfg = Debug|Win32
- {FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Debug|Win32.Build.0 = Debug|Win32
- {FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Release|Win32.ActiveCfg = Release|Win32
- {FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Release|Win32.Build.0 = Release|Win32
- {A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Debug|Win32.ActiveCfg = Debug|Win32
- {A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Debug|Win32.Build.0 = Debug|Win32
- {A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Release|Win32.ActiveCfg = Release|Win32
- {A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Release|Win32.Build.0 = Release|Win32
- {22D325FB-9131-4BD6-B390-968F0491D687}.Debug|Win32.ActiveCfg = Debug|Win32
- {22D325FB-9131-4BD6-B390-968F0491D687}.Debug|Win32.Build.0 = Debug|Win32
- {22D325FB-9131-4BD6-B390-968F0491D687}.Release|Win32.ActiveCfg = Release|Win32
- {22D325FB-9131-4BD6-B390-968F0491D687}.Release|Win32.Build.0 = Release|Win32
- {28C29E72-76A2-4D0C-B35B-12D446733D2E}.Debug|Win32.ActiveCfg = Debug|Win32
- {28C29E72-76A2-4D0C-B35B-12D446733D2E}.Debug|Win32.Build.0 = Debug|Win32
- {28C29E72-76A2-4D0C-B35B-12D446733D2E}.Release|Win32.ActiveCfg = Release|Win32
- {28C29E72-76A2-4D0C-B35B-12D446733D2E}.Release|Win32.Build.0 = Release|Win32
- {9FD51412-E945-4457-A17A-CA3C505CF431}.Debug|Win32.ActiveCfg = Debug|Win32
- {9FD51412-E945-4457-A17A-CA3C505CF431}.Debug|Win32.Build.0 = Debug|Win32
- {9FD51412-E945-4457-A17A-CA3C505CF431}.Release|Win32.ActiveCfg = Release|Win32
- {9FD51412-E945-4457-A17A-CA3C505CF431}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/infrastructure/msvc/2005/boxbackup.suo b/infrastructure/msvc/2005/boxbackup.suo Binary files differdeleted file mode 100644 index 534f337c..00000000 --- a/infrastructure/msvc/2005/boxbackup.suo +++ /dev/null diff --git a/infrastructure/msvc/2005/boxquery.vcproj b/infrastructure/msvc/2005/boxquery.vcproj deleted file mode 100644 index 776c0ac9..00000000 --- a/infrastructure/msvc/2005/boxquery.vcproj +++ /dev/null @@ -1,246 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="boxquery"
- ProjectGUID="{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}"
- RootNamespace="boxquery"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\..\..\Debug"
- IntermediateDirectory="..\..\..\Debug"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\common";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\..\pcre";"$(ProjectDir)..\..\..\..\openssl\inc32";"$(ProjectDir)..\..\..\..\zlib\include""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Ws2_32.lib Advapi32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\out32dll\libeay32.lib $(ProjectDir)..\..\..\..\openssl\out32dll\ssleay32.lib $(ProjectDir)..\..\..\Debug\common.lib $(ProjectDir)..\..\..\..\pcre\bin\debug\pcreposix.lib $(ProjectDir)..\..\..\..\pcre\bin\debug\pcre.lib"
- OutputFile="$(OutDir)/bbackupquery.exe"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/boxquery.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="..\..\..\Release"
- IntermediateDirectory="..\..\..\Release"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- EnableFiberSafeOptimizations="true"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\include";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\""
- PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;PCRE_STATIC"
- RuntimeLibrary="0"
- BufferSecurityCheck="false"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\Release\common.lib $(ProjectDir)..\..\..\..\openssl\out32dll\libeay32.lib $(ProjectDir)..\..\..\..\openssl\out32dll\ssleay32.lib $(ProjectDir)..\..\..\..\pcre\bin\release\lib_pcreposix.lib $(ProjectDir)..\..\..\..\pcre\bin\release\lib_pcre.lib"
- OutputFile="$(OutDir)/bbackupquery.exe"
- LinkIncremental="1"
- IgnoreDefaultLibraryNames=""
- GenerateDebugInformation="false"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <Filter
- Name="bin"
- >
- <Filter
- Name="backupquery"
- >
- <File
- RelativePath="..\..\..\bin\bbackupquery\autogen_Documentation.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupquery\BackupQueries.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\bin\bbackupquery\bbackupquery.cpp"
- >
- </File>
- </Filter>
- </Filter>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <Filter
- Name="bin"
- >
- <Filter
- Name="backupquery"
- >
- <File
- RelativePath="..\..\..\bin\bbackupquery\BackupQueries.h"
- >
- </File>
- </Filter>
- </Filter>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- <File
- RelativePath="..\..\..\lib\win32\messages.rc"
- >
- </File>
- </Filter>
- <File
- RelativePath="..\..\..\ReadMe.txt"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/infrastructure/msvc/2005/common.vcproj b/infrastructure/msvc/2005/common.vcproj deleted file mode 100644 index 256bce06..00000000 --- a/infrastructure/msvc/2005/common.vcproj +++ /dev/null @@ -1,896 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="common"
- ProjectGUID="{A089CEE6-EBF0-4232-A0C0-74850A8127A6}"
- RootNamespace="common"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\..\..\Debug"
- IntermediateDirectory="..\..\..\Debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- Description="Determining Version Number"
- CommandLine="perl $(InputDir)..\getversion.pl"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\common";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\..\openssl\inc32";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\..\pcre";$(NOINHERIT)"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- WarnAsError="false"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/common.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="..\..\..\Release"
- IntermediateDirectory="..\..\..\Release"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- EnableFiberSafeOptimizations="true"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\common\";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\..\openssl\inc32";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\..\pcre\pcre-6.7\""
- PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"
- RuntimeLibrary="0"
- BufferSecurityCheck="false"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/common.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <Filter
- Name="lib"
- >
- <Filter
- Name="compress"
- >
- <File
- RelativePath="..\..\..\lib\compress\autogen_CompressException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\compress\CompressStream.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="common"
- >
- <File
- RelativePath="..\..\..\lib\common\autogen_CommonException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\autogen_ConversionException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\BoxException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\BoxTime.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\BoxTimeToText.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\CollectInBufferStream.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\Configuration.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\ConversionString.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\DebugAssertFailed.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\DebugMemLeakFinder.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\DebugPrintf.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\EventWatchFilesystemObject.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\ExcludeList.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\FdGetLine.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\FileStream.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\IOStream.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\IOStreamGetLine.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\Logging.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\MemBlockStream.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\PartialReadStream.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\PathUtils.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\ReadGatherStream.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\ReadLoggingStream.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\StreamableMemBlock.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\Timer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\UnixUser.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\Utils.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\WaitForEvent.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="backupclient"
- >
- <File
- RelativePath="..\..\..\lib\backupclient\autogen_BackupProtocolClient.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\autogen_BackupStoreException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupClientCryptoKeys.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupClientFileAttributes.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupClientMakeExcludeList.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupClientRestore.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupDaemonConfigVerify.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreDirectory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFile.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFileCmbDiff.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFileCmbIdx.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFileCombine.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFileCryptVar.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFileDiff.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFileEncodeStream.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFilename.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFilenameClear.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFileRevDiff.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreObjectDump.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="crypto"
- >
- <File
- RelativePath="..\..\..\lib\crypto\autogen_CipherException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\CipherAES.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\CipherBlowfish.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\CipherContext.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\CipherDescription.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\MD5Digest.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\Random.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\RollingChecksum.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="win32"
- >
- <File
- RelativePath="..\..\..\lib\win32\emu.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\win32\getopt_long.cxx"
- >
- </File>
- </Filter>
- <Filter
- Name="server"
- >
- <File
- RelativePath="..\..\..\lib\server\autogen_ConnectionException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\autogen_ServerException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\Daemon.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\LocalProcessStream.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\Protocol.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\ProtocolObject.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\ProtocolUncertainStream.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\Socket.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\SocketStream.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\SocketStreamTLS.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\SSLLib.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\TLSContext.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\WinNamedPipeStream.cpp"
- >
- </File>
- </Filter>
- </Filter>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <Filter
- Name="lib"
- >
- <Filter
- Name="compress"
- >
- <File
- RelativePath="..\..\..\lib\compress\autogen_CompressException.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\compress\Compress.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\compress\CompressException.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\compress\CompressStream.h"
- >
- </File>
- </Filter>
- <Filter
- Name="common"
- >
- <File
- RelativePath="..\..\..\lib\common\autogen_CommonException.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\autogen_ConversionException.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\BannerText.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\BeginStructPackForWire.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\Box.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\BoxConfig-MSVC.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\BoxException.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\BoxPlatform.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\BoxPortsAndFiles.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\BoxTime.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\BoxTimeToText.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\BoxTimeToUnix.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\BoxVersion.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\CollectInBufferStream.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\CommonException.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\Configuration.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\Conversion.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\EndStructPackForWire.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\EventWatchFilesystemObject.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\ExcludeList.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\FdGetLine.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\FileModificationTime.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\FileStream.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\Guards.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\IOStream.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\IOStreamGetLine.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\LocalProcessStream.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\Logging.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\MainHelper.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\MemBlockStream.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\MemLeakFinder.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\MemLeakFindOff.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\MemLeakFindOn.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\NamedLock.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\PartialReadStream.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\PathUtils.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\ReadGatherStream.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\ReadLoggingStream.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\StreamableMemBlock.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\TemporaryDirectory.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\Test.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\Timer.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\UnixUser.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\Utils.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\common\WaitForEvent.h"
- >
- </File>
- </Filter>
- <Filter
- Name="backupclient"
- >
- <File
- RelativePath="..\..\..\lib\backupclient\autogen_BackupProtocolClient.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\autogen_BackupStoreException.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupClientCryptoKeys.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupClientFileAttributes.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupClientMakeExcludeList.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupClientRestore.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupDaemonConfigVerify.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreConstants.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreDirectory.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreException.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFile.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFileCryptVar.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFileEncodeStream.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFilename.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFilenameClear.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreFileWire.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\backupclient\BackupStoreObjectMagic.h"
- >
- </File>
- </Filter>
- <Filter
- Name="crypto"
- >
- <File
- RelativePath="..\..\..\lib\crypto\autogen_CipherException.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\CipherAES.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\CipherBlowfish.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\CipherContext.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\CipherDescription.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\CipherException.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\MD5Digest.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\Random.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\crypto\RollingChecksum.h"
- >
- </File>
- </Filter>
- <Filter
- Name="win32"
- >
- <File
- RelativePath="..\..\..\lib\win32\emu.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\win32\getopt.h"
- >
- </File>
- </Filter>
- <Filter
- Name="server"
- >
- <File
- RelativePath="..\..\..\lib\server\autogen_ConnectionException.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\autogen_ServerException.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\Daemon.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\Protocol.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\ProtocolObject.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\ProtocolUncertainStream.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\ProtocolWire.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\ServerException.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\ServerStream.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\ServerTLS.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\Socket.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\SocketListen.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\SocketStream.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\SocketStreamTLS.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\SSLLib.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\TLSContext.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\server\WinNamedPipeStream.h"
- >
- </File>
- </Filter>
- </Filter>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/infrastructure/msvc/2005/win32test.vcproj b/infrastructure/msvc/2005/win32test.vcproj deleted file mode 100644 index 0f97c302..00000000 --- a/infrastructure/msvc/2005/win32test.vcproj +++ /dev/null @@ -1,218 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="win32test"
- ProjectGUID="{28C29E72-76A2-4D0C-B35B-12D446733D2E}"
- RootNamespace="win32test"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\..\..\Debug"
- IntermediateDirectory="..\..\..\Debug"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\bin\bbackupd";"$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\common";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\..\openssl\inc32";"$(ProjectDir)..\..\..\..\zlib\include""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Ws2_32.lib Advapi32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\out32dll\libeay32.lib $(ProjectDir)..\..\..\..\openssl\out32dll\ssleay32.lib $(ProjectDir)..\..\..\Debug\common.lib $(ProjectDir)..\..\..\..\pcre\bin\debug\pcreposix.lib $(ProjectDir)..\..\..\..\pcre\bin\debug\pcre.lib"
- OutputFile="$(OutDir)/win32test.exe"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/win32test.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="..\..\..\Release"
- IntermediateDirectory="..\..\..\Release"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- EnableFiberSafeOptimizations="true"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\bin\bbackupd";"$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\common\";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\..\openssl\inc32";"$(ProjectDir)..\..\..\..\zlib\include""
- PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"
- RuntimeLibrary="0"
- BufferSecurityCheck="false"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="Ws2_32.lib $(ProjectDir)..\..\..\..\zlib\lib\zdll.lib $(ProjectDir)..\..\..\..\openssl\out32dll\libeay32.lib $(ProjectDir)..\..\..\..\openssl\out32dll\ssleay32.lib $(ProjectDir)..\..\..\Release\common.lib $(ProjectDir)..\..\..\..\pcre\bin\release\lib_pcreposix.lib $(ProjectDir)..\..\..\..\pcre\bin\release\lib_pcre.lib"
- OutputFile="$(OutDir)/win32test.exe"
- LinkIncremental="1"
- IgnoreDefaultLibraryNames=""
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\..\..\lib\win32\emu.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\test\win32\testlibwin32.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- <File
- RelativePath="..\..\..\ReadMe.txt"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/infrastructure/msvc/2010/bbackupctl.vcxproj b/infrastructure/msvc/2010/bbackupctl.vcxproj deleted file mode 100644 index eb40d161..00000000 --- a/infrastructure/msvc/2010/bbackupctl.vcxproj +++ /dev/null @@ -1,109 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{9FD51412-E945-4457-A17A-CA3C505CF431}</ProjectGuid>
- <RootNamespace>bbackupctl</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\common;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\openssl-$(Platform)\include;$(ProjectDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)bbackupctl.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\..\openssl-$(Platform)\inc32;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\..\zlib\include;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\lib\common\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>Ws2_32.lib;$(ProjectDir)..\..\..\..\zlib\lib\zdll.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\out32dll\libeay32.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\out32dll\ssleay32.lib;$(ProjectDir)..\..\..\Release\common.lib;$(ProjectDir)..\..\..\..\pcre-$(Platform)\lib\pcreposixd.lib;$(ProjectDir)..\..\..\..\pcre-$(Platform)\lib\pcred.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)bbackupctl.exe</OutputFile>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\..\bin\bbackupctl\bbackupctl.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="..\..\..\lib\win32\messages.rc" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="common.vcxproj">
- <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="libbackupclient.vcxproj">
- <Project>{32604097-c934-4711-b1ad-206336640e70}</Project>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/infrastructure/msvc/2010/bbackupd.vcxproj b/infrastructure/msvc/2010/bbackupd.vcxproj deleted file mode 100644 index 47906a26..00000000 --- a/infrastructure/msvc/2010/bbackupd.vcxproj +++ /dev/null @@ -1,139 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{22D325FB-9131-4BD6-B390-968F0491D687}</ProjectGuid>
- <RootNamespace>bbackupd</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <UseOfMfc>false</UseOfMfc>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl-$(Platform)\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>ENABLE_VSS;WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>VssApi.lib;$(OutDir)\libbackupclient.lib;$(OutDir)\libbackupstore.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)bbackupd.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\..\openssl-$(Platform)\inc32;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\..\zlib\include;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\lib\common\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>Ws2_32.lib;$(ProjectDir)..\..\..\..\zlib\lib\zdll.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\out32dll\libeay32.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\out32dll\ssleay32.lib;$(ProjectDir)..\..\..\Release\common.lib;$(ProjectDir)..\..\..\..\pcre-$(Platform)\lib\pcreposixd.lib;$(ProjectDir)..\..\..\..\pcre-$(Platform)\lib\pcred.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)bbackupd.exe</OutputFile>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\..\bin\bbackupd\autogen_ClientException.cpp" />
- <ClCompile Include="..\..\..\bin\bbackupd\BackupClientContext.cpp" />
- <ClCompile Include="..\..\..\bin\bbackupd\BackupClientDeleteList.cpp" />
- <ClCompile Include="..\..\..\bin\bbackupd\BackupClientDirectoryRecord.cpp" />
- <ClCompile Include="..\..\..\bin\bbackupd\BackupClientInodeToIDMap.cpp" />
- <ClCompile Include="..\..\..\bin\bbackupd\BackupDaemon.cpp" />
- <ClCompile Include="..\..\..\bin\bbackupd\bbackupd.cpp" />
- <ClCompile Include="..\..\..\bin\bbackupd\Win32BackupService.cpp" />
- <ClCompile Include="..\..\..\bin\bbackupd\Win32ServiceFunctions.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\..\bin\bbackupd\autogen_ClientException.h" />
- <ClInclude Include="..\..\..\bin\bbackupd\BackupClientContext.h" />
- <ClInclude Include="..\..\..\bin\bbackupd\BackupClientDeleteList.h" />
- <ClInclude Include="..\..\..\bin\bbackupd\BackupClientDirectoryRecord.h" />
- <ClInclude Include="..\..\..\bin\bbackupd\BackupClientInodeToIDMap.h" />
- <ClInclude Include="..\..\..\bin\bbackupd\BackupDaemon.h" />
- <ClInclude Include="..\..\..\bin\bbackupd\Win32BackupService.h" />
- <ClInclude Include="..\..\..\bin\bbackupd\Win32ServiceFunctions.h" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="..\..\..\lib\win32\messages.rc" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="common.vcxproj">
- <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- <Private>true</Private>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- <LinkLibraryDependencies>true</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
- <ProjectReference Include="qdbm.vcxproj">
- <Project>{72af22a7-b339-4fdf-b6ae-ca6522d4bb8d}</Project>
- <Private>true</Private>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- <LinkLibraryDependencies>true</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/infrastructure/msvc/2010/bbstoreaccounts.vcxproj b/infrastructure/msvc/2010/bbstoreaccounts.vcxproj deleted file mode 100644 index f9f9d3e8..00000000 --- a/infrastructure/msvc/2010/bbstoreaccounts.vcxproj +++ /dev/null @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{C8A1509C-F91B-4140-BD51-B87FF24FB95F}</ProjectGuid>
- <RootNamespace>bbstoreaccounts</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\raidfile;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl-$(Platform)\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\..\bin\bbstoreaccounts\bbstoreaccounts.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="common.vcxproj">
- <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project>
- </ProjectReference>
- <ProjectReference Include="libbackupstore.vcxproj">
- <Project>{97d89aef-2be4-4e34-8703-03ba67bf4494}</Project>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/infrastructure/msvc/2010/bbstored.vcxproj b/infrastructure/msvc/2010/bbstored.vcxproj deleted file mode 100644 index 2d48f9a8..00000000 --- a/infrastructure/msvc/2010/bbstored.vcxproj +++ /dev/null @@ -1,93 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{D8404314-73DD-4270-8205-BE677F8FDAC7}</ProjectGuid>
- <RootNamespace>bbstored</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\raidfile;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl-$(Platform)\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ProjectReference Include="common.vcxproj">
- <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project>
- </ProjectReference>
- <ProjectReference Include="libbackupstore.vcxproj">
- <Project>{97d89aef-2be4-4e34-8703-03ba67bf4494}</Project>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\..\bin\bbstored\BackupStoreDaemon.cpp" />
- <ClCompile Include="..\..\..\bin\bbstored\bbstored.cpp" />
- <ClCompile Include="..\..\..\bin\bbstored\BBStoreDHousekeeping.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\..\bin\bbstored\BackupStoreDaemon.h" />
- </ItemGroup>
- <ItemGroup>
- <None Include="..\..\..\bin\bbstored\bbstored-certs.in" />
- <None Include="..\..\..\bin\bbstored\bbstored-config.in" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/infrastructure/msvc/2010/boxbackup.sln b/infrastructure/msvc/2010/boxbackup.sln deleted file mode 100644 index 384ff58c..00000000 --- a/infrastructure/msvc/2010/boxbackup.sln +++ /dev/null @@ -1,89 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbackupquery", "boxquery.vcxproj", "{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}"
- ProjectSection(ProjectDependencies) = postProject
- {32604097-C934-4711-B1AD-206336640E70} = {32604097-C934-4711-B1AD-206336640E70}
- {97D89AEF-2BE4-4E34-8703-03BA67BF4494} = {97D89AEF-2BE4-4E34-8703-03BA67BF4494}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcxproj", "{A089CEE6-EBF0-4232-A0C0-74850A8127A6}"
- ProjectSection(ProjectDependencies) = postProject
- {72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D} = {72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbackupd", "bbackupd.vcxproj", "{22D325FB-9131-4BD6-B390-968F0491D687}"
- ProjectSection(ProjectDependencies) = postProject
- {32604097-C934-4711-B1AD-206336640E70} = {32604097-C934-4711-B1AD-206336640E70}
- {72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D} = {72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}
- {97D89AEF-2BE4-4E34-8703-03BA67BF4494} = {97D89AEF-2BE4-4E34-8703-03BA67BF4494}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32test", "win32test.vcxproj", "{28C29E72-76A2-4D0C-B35B-12D446733D2E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbackupctl", "bbackupctl.vcxproj", "{9FD51412-E945-4457-A17A-CA3C505CF431}"
- ProjectSection(ProjectDependencies) = postProject
- {32604097-C934-4711-B1AD-206336640E70} = {32604097-C934-4711-B1AD-206336640E70}
- {97D89AEF-2BE4-4E34-8703-03BA67BF4494} = {97D89AEF-2BE4-4E34-8703-03BA67BF4494}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qdbm", "qdbm.vcxproj", "{72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbstored", "bbstored.vcxproj", "{D8404314-73DD-4270-8205-BE677F8FDAC7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbackupstore", "libbackupstore.vcxproj", "{97D89AEF-2BE4-4E34-8703-03BA67BF4494}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbstoreaccounts", "bbstoreaccounts.vcxproj", "{C8A1509C-F91B-4140-BD51-B87FF24FB95F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbackupclient", "libbackupclient.vcxproj", "{32604097-C934-4711-B1AD-206336640E70}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Debug|Win32.ActiveCfg = Debug|Win32
- {FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Debug|Win32.Build.0 = Debug|Win32
- {FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Release|Win32.ActiveCfg = Release|Win32
- {FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Release|Win32.Build.0 = Release|Win32
- {A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Debug|Win32.ActiveCfg = Debug|Win32
- {A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Debug|Win32.Build.0 = Debug|Win32
- {A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Release|Win32.ActiveCfg = Release|Win32
- {A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Release|Win32.Build.0 = Release|Win32
- {22D325FB-9131-4BD6-B390-968F0491D687}.Debug|Win32.ActiveCfg = Debug|Win32
- {22D325FB-9131-4BD6-B390-968F0491D687}.Debug|Win32.Build.0 = Debug|Win32
- {22D325FB-9131-4BD6-B390-968F0491D687}.Release|Win32.ActiveCfg = Release|Win32
- {22D325FB-9131-4BD6-B390-968F0491D687}.Release|Win32.Build.0 = Release|Win32
- {28C29E72-76A2-4D0C-B35B-12D446733D2E}.Debug|Win32.ActiveCfg = Debug|Win32
- {28C29E72-76A2-4D0C-B35B-12D446733D2E}.Debug|Win32.Build.0 = Debug|Win32
- {28C29E72-76A2-4D0C-B35B-12D446733D2E}.Release|Win32.ActiveCfg = Release|Win32
- {28C29E72-76A2-4D0C-B35B-12D446733D2E}.Release|Win32.Build.0 = Release|Win32
- {9FD51412-E945-4457-A17A-CA3C505CF431}.Debug|Win32.ActiveCfg = Debug|Win32
- {9FD51412-E945-4457-A17A-CA3C505CF431}.Debug|Win32.Build.0 = Debug|Win32
- {9FD51412-E945-4457-A17A-CA3C505CF431}.Release|Win32.ActiveCfg = Release|Win32
- {9FD51412-E945-4457-A17A-CA3C505CF431}.Release|Win32.Build.0 = Release|Win32
- {72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}.Debug|Win32.ActiveCfg = Debug|Win32
- {72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}.Debug|Win32.Build.0 = Debug|Win32
- {72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}.Release|Win32.ActiveCfg = Release|Win32
- {72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}.Release|Win32.Build.0 = Release|Win32
- {D8404314-73DD-4270-8205-BE677F8FDAC7}.Debug|Win32.ActiveCfg = Debug|Win32
- {D8404314-73DD-4270-8205-BE677F8FDAC7}.Debug|Win32.Build.0 = Debug|Win32
- {D8404314-73DD-4270-8205-BE677F8FDAC7}.Release|Win32.ActiveCfg = Release|Win32
- {D8404314-73DD-4270-8205-BE677F8FDAC7}.Release|Win32.Build.0 = Release|Win32
- {97D89AEF-2BE4-4E34-8703-03BA67BF4494}.Debug|Win32.ActiveCfg = Debug|Win32
- {97D89AEF-2BE4-4E34-8703-03BA67BF4494}.Debug|Win32.Build.0 = Debug|Win32
- {97D89AEF-2BE4-4E34-8703-03BA67BF4494}.Release|Win32.ActiveCfg = Release|Win32
- {97D89AEF-2BE4-4E34-8703-03BA67BF4494}.Release|Win32.Build.0 = Release|Win32
- {C8A1509C-F91B-4140-BD51-B87FF24FB95F}.Debug|Win32.ActiveCfg = Debug|Win32
- {C8A1509C-F91B-4140-BD51-B87FF24FB95F}.Debug|Win32.Build.0 = Debug|Win32
- {C8A1509C-F91B-4140-BD51-B87FF24FB95F}.Release|Win32.ActiveCfg = Release|Win32
- {C8A1509C-F91B-4140-BD51-B87FF24FB95F}.Release|Win32.Build.0 = Release|Win32
- {32604097-C934-4711-B1AD-206336640E70}.Debug|Win32.ActiveCfg = Debug|Win32
- {32604097-C934-4711-B1AD-206336640E70}.Debug|Win32.Build.0 = Debug|Win32
- {32604097-C934-4711-B1AD-206336640E70}.Release|Win32.ActiveCfg = Release|Win32
- {32604097-C934-4711-B1AD-206336640E70}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/infrastructure/msvc/2010/boxquery.vcxproj b/infrastructure/msvc/2010/boxquery.vcxproj deleted file mode 100644 index 4893f98c..00000000 --- a/infrastructure/msvc/2010/boxquery.vcxproj +++ /dev/null @@ -1,123 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}</ProjectGuid>
- <RootNamespace>boxquery</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- <ProjectName>bbackupquery</ProjectName>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\backupstore;$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\common;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\pcre-$(Platform)\include;$(ProjectDir)..\..\..\..\openssl-$(Platform)\include;$(ProjectDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)boxquery.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\..\openssl-$(Platform)\include;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\..\zlib\include;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\lib\common\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>Ws2_32.lib;$(ProjectDir)..\..\..\..\zlib\lib\zdll.lib;$(ProjectDir)..\..\..\Release\common.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\out32dll\libeay32.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\out32dll\ssleay32.lib;$(ProjectDir)..\..\..\..\pcre-$(Platform)\lib\pcreposixd.lib;$(ProjectDir)..\..\..\..\pcre-$(Platform)\lib\pcred.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)bbackupquery.exe</OutputFile>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\..\bin\bbackupquery\autogen_Documentation.cpp" />
- <ClCompile Include="..\..\..\bin\bbackupquery\BackupQueries.cpp" />
- <ClCompile Include="..\..\..\bin\bbackupquery\bbackupquery.cpp" />
- <ClCompile Include="..\..\..\bin\bbackupquery\CommandCompletion.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\..\bin\bbackupquery\BackupQueries.h" />
- <ClInclude Include="..\..\..\bin\bbackupquery\BoxBackupCompareParams.h" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="..\..\..\lib\win32\messages.rc" />
- </ItemGroup>
- <ItemGroup>
- <None Include="..\..\..\ReadMe.txt" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="common.vcxproj">
- <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="libbackupclient.vcxproj">
- <Project>{32604097-c934-4711-b1ad-206336640e70}</Project>
- </ProjectReference>
- <ProjectReference Include="libbackupstore.vcxproj">
- <Project>{97d89aef-2be4-4e34-8703-03ba67bf4494}</Project>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/infrastructure/msvc/2010/common.vcxproj b/infrastructure/msvc/2010/common.vcxproj deleted file mode 100644 index ceefd548..00000000 --- a/infrastructure/msvc/2010/common.vcxproj +++ /dev/null @@ -1,249 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{A089CEE6-EBF0-4232-A0C0-74850A8127A6}</ProjectGuid>
- <RootNamespace>common</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</IntDir>
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IncludePath)</IncludePath>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <PreBuildEvent />
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\qdbm;$(ProjectDir)..\..\..\lib\common;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\openssl-$(Platform)\include;$(ProjectDir)..\..\..\..\zlib\include;$(ProjectDir)..\..\..\..\pcre-$(Platform)\include</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <TreatWarningAsError>false</TreatWarningAsError>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <Lib />
- <CustomBuildStep />
- <CustomBuildStep />
- <CustomBuildStep />
- <Lib>
- <AdditionalDependencies>Ws2_32.lib;$(ProjectDir)..\..\..\..\pcre-$(Platform)\lib\pcred.lib;$(ProjectDir)..\..\..\..\pcre-$(Platform)\lib\pcreposixd.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\lib\libeay32.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\lib\ssleay32.lib;$(ProjectDir)..\..\..\..\zlib\lib\zdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Lib>
- <PreBuildEvent>
- <Command>perl $(ProjectDir)..\getversion.pl</Command>
- </PreBuildEvent>
- <PreBuildEvent>
- <Message>Determining Version Number</Message>
- </PreBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\common\;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\openssl-$(Platform)\inc32;$(ProjectDir)..\..\..\..\zlib\include;$(ProjectDir)..\..\..\..\pcre\pcre-$(Platform)\include-6.7\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;BOX_RELEASE_BUILD;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Lib>
- <OutputFile>$(OutDir)common.lib</OutputFile>
- </Lib>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\..\lib\common\BufferedStream.cpp" />
- <ClCompile Include="..\..\..\lib\common\BufferedWriteStream.cpp" />
- <ClCompile Include="..\..\..\lib\common\FileModificationTime.cpp" />
- <ClCompile Include="..\..\..\lib\common\GetLine.cpp" />
- <ClCompile Include="..\..\..\lib\common\InvisibleTempFileStream.cpp" />
- <ClCompile Include="..\..\..\lib\common\NamedLock.cpp" />
- <ClCompile Include="..\..\..\lib\common\RateLimitingStream.cpp" />
- <ClCompile Include="..\..\..\lib\compress\autogen_CompressException.cpp" />
- <ClCompile Include="..\..\..\lib\compress\CompressStream.cpp" />
- <ClCompile Include="..\..\..\lib\common\autogen_CommonException.cpp" />
- <ClCompile Include="..\..\..\lib\common\autogen_ConversionException.cpp" />
- <ClCompile Include="..\..\..\lib\common\BoxException.cpp" />
- <ClCompile Include="..\..\..\lib\common\BoxTime.cpp" />
- <ClCompile Include="..\..\..\lib\common\BoxTimeToText.cpp" />
- <ClCompile Include="..\..\..\lib\common\CollectInBufferStream.cpp" />
- <ClCompile Include="..\..\..\lib\common\Configuration.cpp" />
- <ClCompile Include="..\..\..\lib\common\ConversionString.cpp" />
- <ClCompile Include="..\..\..\lib\common\DebugAssertFailed.cpp" />
- <ClCompile Include="..\..\..\lib\common\DebugMemLeakFinder.cpp" />
- <ClCompile Include="..\..\..\lib\common\DebugPrintf.cpp" />
- <ClCompile Include="..\..\..\lib\common\ExcludeList.cpp" />
- <ClCompile Include="..\..\..\lib\common\FdGetLine.cpp" />
- <ClCompile Include="..\..\..\lib\common\FileStream.cpp" />
- <ClCompile Include="..\..\..\lib\common\IOStream.cpp" />
- <ClCompile Include="..\..\..\lib\common\IOStreamGetLine.cpp" />
- <ClCompile Include="..\..\..\lib\common\Logging.cpp" />
- <ClCompile Include="..\..\..\lib\common\MemBlockStream.cpp" />
- <ClCompile Include="..\..\..\lib\common\PartialReadStream.cpp" />
- <ClCompile Include="..\..\..\lib\common\PathUtils.cpp" />
- <ClCompile Include="..\..\..\lib\common\ReadGatherStream.cpp" />
- <ClCompile Include="..\..\..\lib\common\ReadLoggingStream.cpp" />
- <ClCompile Include="..\..\..\lib\common\StreamableMemBlock.cpp" />
- <ClCompile Include="..\..\..\lib\common\Timer.cpp" />
- <ClCompile Include="..\..\..\lib\common\UnixUser.cpp" />
- <ClCompile Include="..\..\..\lib\common\Utils.cpp" />
- <ClCompile Include="..\..\..\lib\common\WaitForEvent.cpp" />
- <ClCompile Include="..\..\..\lib\crypto\autogen_CipherException.cpp" />
- <ClCompile Include="..\..\..\lib\crypto\CipherAES.cpp" />
- <ClCompile Include="..\..\..\lib\crypto\CipherBlowfish.cpp" />
- <ClCompile Include="..\..\..\lib\crypto\CipherContext.cpp" />
- <ClCompile Include="..\..\..\lib\crypto\CipherDescription.cpp" />
- <ClCompile Include="..\..\..\lib\crypto\CryptoUtils.cpp" />
- <ClCompile Include="..\..\..\lib\crypto\MD5Digest.cpp" />
- <ClCompile Include="..\..\..\lib\crypto\Random.cpp" />
- <ClCompile Include="..\..\..\lib\crypto\RollingChecksum.cpp" />
- <ClCompile Include="..\..\..\lib\server\Message.cpp" />
- <ClCompile Include="..\..\..\lib\server\TcpNice.cpp" />
- <ClCompile Include="..\..\..\lib\win32\emu.cpp" />
- <ClCompile Include="..\..\..\lib\win32\getopt_long.cpp" />
- <ClCompile Include="..\..\..\lib\server\autogen_ConnectionException.cpp" />
- <ClCompile Include="..\..\..\lib\server\autogen_ServerException.cpp" />
- <ClCompile Include="..\..\..\lib\server\Daemon.cpp" />
- <ClCompile Include="..\..\..\lib\server\LocalProcessStream.cpp" />
- <ClCompile Include="..\..\..\lib\server\Protocol.cpp" />
- <ClCompile Include="..\..\..\lib\server\ProtocolUncertainStream.cpp" />
- <ClCompile Include="..\..\..\lib\server\Socket.cpp" />
- <ClCompile Include="..\..\..\lib\server\SocketStream.cpp" />
- <ClCompile Include="..\..\..\lib\server\SocketStreamTLS.cpp" />
- <ClCompile Include="..\..\..\lib\server\SSLLib.cpp" />
- <ClCompile Include="..\..\..\lib\server\TLSContext.cpp" />
- <ClCompile Include="..\..\..\lib\server\WinNamedPipeStream.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\..\lib\common\BufferedStream.h" />
- <ClInclude Include="..\..\..\lib\common\BufferedWriteStream.h" />
- <ClInclude Include="..\..\..\lib\common\GetLine.h" />
- <ClInclude Include="..\..\..\lib\common\InvisibleTempFileStream.h" />
- <ClInclude Include="..\..\..\lib\common\RateLimitingStream.h" />
- <ClInclude Include="..\..\..\lib\compress\autogen_CompressException.h" />
- <ClInclude Include="..\..\..\lib\compress\Compress.h" />
- <ClInclude Include="..\..\..\lib\compress\CompressException.h" />
- <ClInclude Include="..\..\..\lib\compress\CompressStream.h" />
- <ClInclude Include="..\..\..\lib\common\autogen_CommonException.h" />
- <ClInclude Include="..\..\..\lib\common\autogen_ConversionException.h" />
- <ClInclude Include="..\..\..\lib\common\BannerText.h" />
- <ClInclude Include="..\..\..\lib\common\BeginStructPackForWire.h" />
- <ClInclude Include="..\..\..\lib\common\Box.h" />
- <ClInclude Include="..\..\..\lib\common\BoxConfig-MSVC.h" />
- <ClInclude Include="..\..\..\lib\common\BoxException.h" />
- <ClInclude Include="..\..\..\lib\common\BoxPlatform.h" />
- <ClInclude Include="..\..\..\lib\common\BoxPortsAndFiles.h" />
- <ClInclude Include="..\..\..\lib\common\BoxTime.h" />
- <ClInclude Include="..\..\..\lib\common\BoxTimeToText.h" />
- <ClInclude Include="..\..\..\lib\common\BoxTimeToUnix.h" />
- <ClInclude Include="..\..\..\lib\common\BoxVersion.h" />
- <ClInclude Include="..\..\..\lib\common\CollectInBufferStream.h" />
- <ClInclude Include="..\..\..\lib\common\CommonException.h" />
- <ClInclude Include="..\..\..\lib\common\Configuration.h" />
- <ClInclude Include="..\..\..\lib\common\Conversion.h" />
- <ClInclude Include="..\..\..\lib\common\EndStructPackForWire.h" />
- <ClInclude Include="..\..\..\lib\common\ExcludeList.h" />
- <ClInclude Include="..\..\..\lib\common\FdGetLine.h" />
- <ClInclude Include="..\..\..\lib\common\FileModificationTime.h" />
- <ClInclude Include="..\..\..\lib\common\FileStream.h" />
- <ClInclude Include="..\..\..\lib\common\Guards.h" />
- <ClInclude Include="..\..\..\lib\common\IOStream.h" />
- <ClInclude Include="..\..\..\lib\common\IOStreamGetLine.h" />
- <ClInclude Include="..\..\..\lib\crypto\CryptoUtils.h" />
- <ClInclude Include="..\..\..\lib\server\LocalProcessStream.h" />
- <ClInclude Include="..\..\..\lib\common\Logging.h" />
- <ClInclude Include="..\..\..\lib\common\MainHelper.h" />
- <ClInclude Include="..\..\..\lib\common\MemBlockStream.h" />
- <ClInclude Include="..\..\..\lib\common\MemLeakFinder.h" />
- <ClInclude Include="..\..\..\lib\common\MemLeakFindOff.h" />
- <ClInclude Include="..\..\..\lib\common\MemLeakFindOn.h" />
- <ClInclude Include="..\..\..\lib\common\NamedLock.h" />
- <ClInclude Include="..\..\..\lib\common\PartialReadStream.h" />
- <ClInclude Include="..\..\..\lib\common\PathUtils.h" />
- <ClInclude Include="..\..\..\lib\common\ReadGatherStream.h" />
- <ClInclude Include="..\..\..\lib\common\ReadLoggingStream.h" />
- <ClInclude Include="..\..\..\lib\common\StreamableMemBlock.h" />
- <ClInclude Include="..\..\..\lib\common\TemporaryDirectory.h" />
- <ClInclude Include="..\..\..\lib\common\Test.h" />
- <ClInclude Include="..\..\..\lib\common\Timer.h" />
- <ClInclude Include="..\..\..\lib\common\UnixUser.h" />
- <ClInclude Include="..\..\..\lib\common\Utils.h" />
- <ClInclude Include="..\..\..\lib\common\WaitForEvent.h" />
- <ClInclude Include="..\..\..\lib\crypto\autogen_CipherException.h" />
- <ClInclude Include="..\..\..\lib\crypto\CipherAES.h" />
- <ClInclude Include="..\..\..\lib\crypto\CipherBlowfish.h" />
- <ClInclude Include="..\..\..\lib\crypto\CipherContext.h" />
- <ClInclude Include="..\..\..\lib\crypto\CipherDescription.h" />
- <ClInclude Include="..\..\..\lib\crypto\CipherException.h" />
- <ClInclude Include="..\..\..\lib\crypto\MD5Digest.h" />
- <ClInclude Include="..\..\..\lib\crypto\Random.h" />
- <ClInclude Include="..\..\..\lib\crypto\RollingChecksum.h" />
- <ClInclude Include="..\..\..\lib\server\Message.h" />
- <ClInclude Include="..\..\..\lib\server\TcpNice.h" />
- <ClInclude Include="..\..\..\lib\win32\emu.h" />
- <ClInclude Include="..\..\..\lib\win32\getopt.h" />
- <ClInclude Include="..\..\..\lib\server\autogen_ConnectionException.h" />
- <ClInclude Include="..\..\..\lib\server\autogen_ServerException.h" />
- <ClInclude Include="..\..\..\lib\server\Daemon.h" />
- <ClInclude Include="..\..\..\lib\server\Protocol.h" />
- <ClInclude Include="..\..\..\lib\server\ProtocolUncertainStream.h" />
- <ClInclude Include="..\..\..\lib\server\ProtocolWire.h" />
- <ClInclude Include="..\..\..\lib\server\ServerException.h" />
- <ClInclude Include="..\..\..\lib\server\ServerStream.h" />
- <ClInclude Include="..\..\..\lib\server\ServerTLS.h" />
- <ClInclude Include="..\..\..\lib\server\Socket.h" />
- <ClInclude Include="..\..\..\lib\server\SocketListen.h" />
- <ClInclude Include="..\..\..\lib\server\SocketStream.h" />
- <ClInclude Include="..\..\..\lib\server\SocketStreamTLS.h" />
- <ClInclude Include="..\..\..\lib\server\SSLLib.h" />
- <ClInclude Include="..\..\..\lib\server\TLSContext.h" />
- <ClInclude Include="..\..\..\lib\server\WinNamedPipeStream.h" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="qdbm.vcxproj">
- <Project>{72af22a7-b339-4fdf-b6ae-ca6522d4bb8d}</Project>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/infrastructure/msvc/2010/libbackupclient.vcxproj b/infrastructure/msvc/2010/libbackupclient.vcxproj deleted file mode 100644 index b546f8d4..00000000 --- a/infrastructure/msvc/2010/libbackupclient.vcxproj +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\..\lib\backupclient\BackupClientCryptoKeys.cpp" />
- <ClCompile Include="..\..\..\lib\backupclient\BackupClientMakeExcludeList.cpp" />
- <ClCompile Include="..\..\..\lib\backupclient\BackupClientRestore.cpp" />
- <ClCompile Include="..\..\..\lib\backupclient\BackupDaemonConfigVerify.cpp" />
- <ClCompile Include="..\..\..\lib\backupclient\BackupStoreObjectDump.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\..\lib\backupclient\BackupClientCryptoKeys.h" />
- <ClInclude Include="..\..\..\lib\backupclient\BackupClientMakeExcludeList.h" />
- <ClInclude Include="..\..\..\lib\backupclient\BackupClientRestore.h" />
- <ClInclude Include="..\..\..\lib\backupclient\BackupDaemonConfigVerify.h" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libbackupstore.vcxproj">
- <Project>{97d89aef-2be4-4e34-8703-03ba67bf4494}</Project>
- </ProjectReference>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{32604097-C934-4711-B1AD-206336640E70}</ProjectGuid>
- <RootNamespace>libbackupstore</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <TargetExt>.lib</TargetExt>
- <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\raidfile;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl-$(Platform)\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>Ws2_32.lib;Advapi32.lib;User32.lib;$(ProjectDir)..\..\..\..\zlib\lib\zdll.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\lib\libeay32.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\lib\ssleay32.lib;$(ProjectDir)..\..\..\$(Configuration)\common.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- <Lib />
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- </Link>
- </ItemDefinitionGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/infrastructure/msvc/2010/libbackupstore.vcxproj b/infrastructure/msvc/2010/libbackupstore.vcxproj deleted file mode 100644 index 6fe04cd1..00000000 --- a/infrastructure/msvc/2010/libbackupstore.vcxproj +++ /dev/null @@ -1,151 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{97D89AEF-2BE4-4E34-8703-03BA67BF4494}</ProjectGuid>
- <RootNamespace>libbackupstore</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <TargetExt>.lib</TargetExt>
- <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\raidfile;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl-$(Platform)\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>Ws2_32.lib;Advapi32.lib;User32.lib;$(ProjectDir)..\..\..\..\zlib\lib\zdll.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\lib\libeay32.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\lib\ssleay32.lib;$(ProjectDir)..\..\..\$(Configuration)\common.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- <Lib />
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\..\lib\backupstore\autogen_BackupProtocol.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\autogen_BackupStoreException.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\BackupClientFileAttributes.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\BackupCommands.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\BackupStoreAccountDatabase.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\BackupStoreAccounts.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\BackupStoreCheck.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\BackupStoreCheck2.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\BackupStoreCheckData.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\BackupStoreConfigVerify.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\BackupStoreContext.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\BackupStoreDirectory.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFile.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileCmbDiff.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileCmbIdx.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileCombine.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileCryptVar.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileDiff.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileEncodeStream.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFilename.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFilenameClear.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileRevDiff.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\BackupStoreInfo.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\BackupStoreRefCountDatabase.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\HousekeepStoreAccount.cpp" />
- <ClCompile Include="..\..\..\lib\backupstore\StoreStructure.cpp" />
- <ClCompile Include="..\..\..\lib\raidfile\autogen_RaidFileException.cpp" />
- <ClCompile Include="..\..\..\lib\raidfile\RaidFileController.cpp" />
- <ClCompile Include="..\..\..\lib\raidfile\RaidFileRead.cpp" />
- <ClCompile Include="..\..\..\lib\raidfile\RaidFileUtil.cpp" />
- <ClCompile Include="..\..\..\lib\raidfile\RaidFileWrite.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\..\lib\backupstore\autogen_BackupProtocol.h" />
- <ClInclude Include="..\..\..\lib\backupstore\autogen_BackupStoreException.h" />
- <ClInclude Include="..\..\..\lib\backupstore\BackupClientFileAttributes.h" />
- <ClInclude Include="..\..\..\lib\backupstore\BackupConstants.h" />
- <ClInclude Include="..\..\..\lib\backupstore\BackupStoreAccountDatabase.h" />
- <ClInclude Include="..\..\..\lib\backupstore\BackupStoreAccounts.h" />
- <ClInclude Include="..\..\..\lib\backupstore\BackupStoreCheck.h" />
- <ClInclude Include="..\..\..\lib\backupstore\BackupStoreConfigVerify.h" />
- <ClInclude Include="..\..\..\lib\backupstore\BackupStoreConstants.h" />
- <ClInclude Include="..\..\..\lib\backupstore\BackupStoreContext.h" />
- <ClInclude Include="..\..\..\lib\backupstore\BackupStoreDirectory.h" />
- <ClInclude Include="..\..\..\lib\backupstore\BackupStoreException.h" />
- <ClInclude Include="..\..\..\lib\backupstore\BackupStoreFile.h" />
- <ClInclude Include="..\..\..\lib\backupstore\BackupStoreFileCryptVar.h" />
- <ClInclude Include="..\..\..\lib\backupstore\BackupStoreFileEncodeStream.h" />
- <ClInclude Include="..\..\..\lib\backupstore\BackupStoreFilename.h" />
- <ClInclude Include="..\..\..\lib\backupstore\BackupStoreFilenameClear.h" />
- <ClInclude Include="..\..\..\lib\backupstore\BackupStoreFileWire.h" />
- <ClInclude Include="..\..\..\lib\backupstore\BackupStoreInfo.h" />
- <ClInclude Include="..\..\..\lib\backupstore\BackupStoreObjectMagic.h" />
- <ClInclude Include="..\..\..\lib\backupstore\BackupStoreRefCountDatabase.h" />
- <ClInclude Include="..\..\..\lib\backupstore\HousekeepStoreAccount.h" />
- <ClInclude Include="..\..\..\lib\backupstore\RunStatusProvider.h" />
- <ClInclude Include="..\..\..\lib\backupstore\StoreStructure.h" />
- <ClInclude Include="..\..\..\lib\raidfile\autogen_RaidFileException.h" />
- <ClInclude Include="..\..\..\lib\raidfile\RaidFileController.h" />
- <ClInclude Include="..\..\..\lib\raidfile\RaidFileException.h" />
- <ClInclude Include="..\..\..\lib\raidfile\RaidFileRead.h" />
- <ClInclude Include="..\..\..\lib\raidfile\RaidFileUtil.h" />
- <ClInclude Include="..\..\..\lib\raidfile\RaidFileWrite.h" />
- </ItemGroup>
- <ItemGroup>
- <None Include="..\..\..\lib\backupstore\backupprotocol.txt" />
- <None Include="..\..\..\lib\backupstore\BackupStoreException.txt" />
- <None Include="..\..\..\lib\backupstore\Makefile.extra" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="common.vcxproj">
- <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/infrastructure/msvc/2010/qdbm.vcxproj b/infrastructure/msvc/2010/qdbm.vcxproj deleted file mode 100644 index 77bf8205..00000000 --- a/infrastructure/msvc/2010/qdbm.vcxproj +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}</ProjectGuid>
- <RootNamespace>qdbm</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <TargetExt>.lib</TargetExt>
- <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
- <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <CompileAsManaged>false</CompileAsManaged>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PreprocessorDefinitions>QDBM_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- <Lib />
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClInclude Include="..\..\..\qdbm\depot.h" />
- <ClInclude Include="..\..\..\qdbm\myconf.h" />
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\..\qdbm\depot.c" />
- <ClCompile Include="..\..\..\qdbm\myconf.c" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/infrastructure/msvc/2010/win32test.vcxproj b/infrastructure/msvc/2010/win32test.vcxproj deleted file mode 100644 index ed8b0597..00000000 --- a/infrastructure/msvc/2010/win32test.vcxproj +++ /dev/null @@ -1,108 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{28C29E72-76A2-4D0C-B35B-12D446733D2E}</ProjectGuid>
- <RootNamespace>win32test</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\bin\bbackupd;$(ProjectDir)..\..\..\lib\backupstore;$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\common;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\openssl-$(Platform)\include;$(ProjectDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)win32test.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- <ShowProgress>NotSet</ShowProgress>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\bin\bbackupd;$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\common\;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\openssl-$(Platform)\inc32;$(ProjectDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>Ws2_32.lib;$(ProjectDir)..\..\..\..\zlib\lib\zdll.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\out32dll\libeay32.lib;$(ProjectDir)..\..\..\..\openssl-$(Platform)\out32dll\ssleay32.lib;$(ProjectDir)..\..\..\Release\common.lib;$(ProjectDir)..\..\..\..\pcre-$(Platform)\lib\pcreposixd.lib;$(ProjectDir)..\..\..\..\pcre-$(Platform)\lib\pcred.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)win32test.exe</OutputFile>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\..\lib\win32\emu.cpp" />
- <ClCompile Include="..\..\..\test\win32\testlibwin32.cpp" />
- </ItemGroup>
- <ItemGroup>
- <None Include="..\..\..\ReadMe.txt" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="common.vcxproj">
- <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/infrastructure/msvc/2013/bbackupctl.vcxproj b/infrastructure/msvc/2013/bbackupctl.vcxproj deleted file mode 100644 index 5f021c26..00000000 --- a/infrastructure/msvc/2013/bbackupctl.vcxproj +++ /dev/null @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{9FD51412-E945-4457-A17A-CA3C505CF431}</ProjectGuid> - <RootNamespace>bbackupctl</RootNamespace> - <Keyword>Win32Proj</Keyword> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\backupstore;$(ProjectDir)..\..\..\lib\common;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\bin\bbackupd;$(ProjectDir)..\..\..\..\openssl\include;$(ProjectDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <MinimalRebuild>true</MinimalRebuild> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <DisableSpecificWarnings>4521</DisableSpecificWarnings> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile> - <SubSystem>Console</SubSystem> - <TargetMachine>MachineX86</TargetMachine> - <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> - <AdditionalDependencies>$(OutDir)\libbackupclient.lib;$(OutDir)\libbackupstore.lib;VssApi.lib;Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\backupstore;$(ProjectDir)..\..\..\lib\common;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\bin\bbackupd;$(ProjectDir)..\..\..\..\openssl\include;$(ProjectDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <BufferSecurityCheck>true</BufferSecurityCheck> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <DisableSpecificWarnings>4521</DisableSpecificWarnings> - </ClCompile> - <Link> - <AdditionalDependencies>$(OutDir)\libbackupclient.lib;$(OutDir)\libbackupstore.lib;VssApi.lib;Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)bbackupctl.exe</OutputFile> - <IgnoreSpecificDefaultLibraries> - </IgnoreSpecificDefaultLibraries> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Console</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <TargetMachine>MachineX86</TargetMachine> - <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\..\..\bin\bbackupctl\bbackupctl.cpp" /> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="..\..\..\lib\win32\messages.rc" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="common.vcxproj"> - <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project> - <ReferenceOutputAssembly>false</ReferenceOutputAssembly> - </ProjectReference> - <ProjectReference Include="libbackupclient.vcxproj"> - <Project>{32604097-c934-4711-b1ad-206336640e70}</Project> - </ProjectReference> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/infrastructure/msvc/2013/bbackupd.vcxproj b/infrastructure/msvc/2013/bbackupd.vcxproj deleted file mode 100644 index 791e4813..00000000 --- a/infrastructure/msvc/2013/bbackupd.vcxproj +++ /dev/null @@ -1,147 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{22D325FB-9131-4BD6-B390-968F0491D687}</ProjectGuid> - <RootNamespace>bbackupd</RootNamespace> - <Keyword>Win32Proj</Keyword> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <UseOfMfc>false</UseOfMfc> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\lib\httpserver;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>ENABLE_VSS;WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <MinimalRebuild>true</MinimalRebuild> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <DisableSpecificWarnings>4521</DisableSpecificWarnings> - </ClCompile> - <Link> - <AdditionalDependencies>$(OutDir)\libbackupclient.lib;$(OutDir)\libbackupstore.lib;VssApi.lib;Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile> - <SubSystem>Console</SubSystem> - <TargetMachine>MachineX86</TargetMachine> - <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\lib\httpserver;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <BufferSecurityCheck>true</BufferSecurityCheck> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <DisableSpecificWarnings>4521</DisableSpecificWarnings> - </ClCompile> - <Link> - <AdditionalDependencies>$(OutDir)\libbackupclient.lib;$(OutDir)\libbackupstore.lib;VssApi.lib;Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)bbackupd.exe</OutputFile> - <IgnoreSpecificDefaultLibraries> - </IgnoreSpecificDefaultLibraries> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Console</SubSystem> - <OptimizeReferences> - </OptimizeReferences> - <EnableCOMDATFolding> - </EnableCOMDATFolding> - <TargetMachine>MachineX86</TargetMachine> - <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\..\..\bin\bbackupd\BackupClientContext.cpp" /> - <ClCompile Include="..\..\..\bin\bbackupd\BackupClientDeleteList.cpp" /> - <ClCompile Include="..\..\..\bin\bbackupd\BackupClientDirectoryRecord.cpp" /> - <ClCompile Include="..\..\..\bin\bbackupd\BackupClientInodeToIDMap.cpp" /> - <ClCompile Include="..\..\..\bin\bbackupd\BackupDaemon.cpp" /> - <ClCompile Include="..\..\..\bin\bbackupd\bbackupd.cpp" /> - <ClCompile Include="..\..\..\bin\bbackupd\Win32BackupService.cpp" /> - <ClCompile Include="..\..\..\bin\bbackupd\Win32ServiceFunctions.cpp" /> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="..\..\..\lib\win32\messages.rc" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="common.vcxproj"> - <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project> - <ReferenceOutputAssembly>false</ReferenceOutputAssembly> - <Private>true</Private> - <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies> - <LinkLibraryDependencies>true</LinkLibraryDependencies> - <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs> - </ProjectReference> - <ProjectReference Include="qdbm.vcxproj"> - <Project>{72af22a7-b339-4fdf-b6ae-ca6522d4bb8d}</Project> - <Private>true</Private> - <ReferenceOutputAssembly>false</ReferenceOutputAssembly> - <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies> - <LinkLibraryDependencies>true</LinkLibraryDependencies> - <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\bin\bbackupd\BackupClientContext.h" /> - <ClInclude Include="..\..\..\bin\bbackupd\BackupClientDeleteList.h" /> - <ClInclude Include="..\..\..\bin\bbackupd\BackupClientDirectoryRecord.h" /> - <ClInclude Include="..\..\..\bin\bbackupd\BackupClientInodeToIDMap.h" /> - <ClInclude Include="..\..\..\bin\bbackupd\BackupDaemon.h" /> - <ClInclude Include="..\..\..\bin\bbackupd\BackupDaemonInterface.h" /> - <ClInclude Include="..\..\..\bin\bbackupd\Win32BackupService.h" /> - <ClInclude Include="..\..\..\bin\bbackupd\Win32ServiceFunctions.h" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/infrastructure/msvc/2013/bbstoreaccounts.vcxproj b/infrastructure/msvc/2013/bbstoreaccounts.vcxproj deleted file mode 100644 index d5a37d63..00000000 --- a/infrastructure/msvc/2013/bbstoreaccounts.vcxproj +++ /dev/null @@ -1,98 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{C8A1509C-F91B-4140-BD51-B87FF24FB95F}</ProjectGuid> - <RootNamespace>bbstoreaccounts</RootNamespace> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir> - <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\raidfile;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\lib\httpserver;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <DisableSpecificWarnings>4521</DisableSpecificWarnings> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>$(OutDir)\libbackupstore.lib;Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\raidfile;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\lib\httpserver;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;BOX_RELEASE_BUILD;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <DisableSpecificWarnings>4521</DisableSpecificWarnings> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>$(OutDir)\libbackupstore.lib;Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib</AdditionalDependencies> - <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\..\..\bin\bbstoreaccounts\bbstoreaccounts.cpp" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="common.vcxproj"> - <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project> - </ProjectReference> - <ProjectReference Include="libbackupstore.vcxproj"> - <Project>{97d89aef-2be4-4e34-8703-03ba67bf4494}</Project> - </ProjectReference> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/infrastructure/msvc/2013/bbstored.vcxproj b/infrastructure/msvc/2013/bbstored.vcxproj deleted file mode 100644 index f703ab94..00000000 --- a/infrastructure/msvc/2013/bbstored.vcxproj +++ /dev/null @@ -1,109 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{D8404314-73DD-4270-8205-BE677F8FDAC7}</ProjectGuid> - <RootNamespace>bbstored</RootNamespace> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir> - <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\raidfile;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\httpserver;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4521;4996</DisableSpecificWarnings> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>$(OutDir)\libbackupstore.lib;Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;BOX_RELEASE_BUILD;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\raidfile;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\httpserver;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <DisableSpecificWarnings>4521;4996</DisableSpecificWarnings> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>$(OutDir)\libbackupstore.lib;$(OutDir)\qdbm.lib;Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib</AdditionalDependencies> - <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ProjectReference Include="common.vcxproj"> - <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project> - </ProjectReference> - <ProjectReference Include="libbackupstore.vcxproj"> - <Project>{97d89aef-2be4-4e34-8703-03ba67bf4494}</Project> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\..\bin\bbstored\BackupStoreDaemon.cpp" /> - <ClCompile Include="..\..\..\bin\bbstored\bbstored.cpp" /> - <ClCompile Include="..\..\..\bin\bbstored\BBStoreDHousekeeping.cpp" /> - <ClCompile Include="..\..\..\qdbm\depot.c" /> - </ItemGroup> - <ItemGroup> - <None Include="..\..\..\bin\bbstored\bbstored-certs.in" /> - <None Include="..\..\..\bin\bbstored\bbstored-config.in" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\bin\bbstored\BackupStoreDaemon.h" /> - <ClInclude Include="..\..\..\qdbm\depot.h" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/infrastructure/msvc/2013/boxbackup.sln b/infrastructure/msvc/2013/boxbackup.sln deleted file mode 100644 index dbd14aae..00000000 --- a/infrastructure/msvc/2013/boxbackup.sln +++ /dev/null @@ -1,89 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbackupquery", "boxquery.vcxproj", "{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}" - ProjectSection(ProjectDependencies) = postProject - {32604097-C934-4711-B1AD-206336640E70} = {32604097-C934-4711-B1AD-206336640E70} - {97D89AEF-2BE4-4E34-8703-03BA67BF4494} = {97D89AEF-2BE4-4E34-8703-03BA67BF4494} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcxproj", "{A089CEE6-EBF0-4232-A0C0-74850A8127A6}" - ProjectSection(ProjectDependencies) = postProject - {72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D} = {72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbackupd", "bbackupd.vcxproj", "{22D325FB-9131-4BD6-B390-968F0491D687}" - ProjectSection(ProjectDependencies) = postProject - {32604097-C934-4711-B1AD-206336640E70} = {32604097-C934-4711-B1AD-206336640E70} - {72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D} = {72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D} - {97D89AEF-2BE4-4E34-8703-03BA67BF4494} = {97D89AEF-2BE4-4E34-8703-03BA67BF4494} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32test", "win32test.vcxproj", "{28C29E72-76A2-4D0C-B35B-12D446733D2E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbackupctl", "bbackupctl.vcxproj", "{9FD51412-E945-4457-A17A-CA3C505CF431}" - ProjectSection(ProjectDependencies) = postProject - {32604097-C934-4711-B1AD-206336640E70} = {32604097-C934-4711-B1AD-206336640E70} - {97D89AEF-2BE4-4E34-8703-03BA67BF4494} = {97D89AEF-2BE4-4E34-8703-03BA67BF4494} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qdbm", "qdbm.vcxproj", "{72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbstored", "bbstored.vcxproj", "{D8404314-73DD-4270-8205-BE677F8FDAC7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbackupstore", "libbackupstore.vcxproj", "{97D89AEF-2BE4-4E34-8703-03BA67BF4494}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbstoreaccounts", "bbstoreaccounts.vcxproj", "{C8A1509C-F91B-4140-BD51-B87FF24FB95F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbackupclient", "libbackupclient.vcxproj", "{32604097-C934-4711-B1AD-206336640E70}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Debug|Win32.ActiveCfg = Debug|Win32 - {FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Debug|Win32.Build.0 = Debug|Win32 - {FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Release|Win32.ActiveCfg = Release|Win32 - {FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}.Release|Win32.Build.0 = Release|Win32 - {A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Debug|Win32.ActiveCfg = Debug|Win32 - {A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Debug|Win32.Build.0 = Debug|Win32 - {A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Release|Win32.ActiveCfg = Release|Win32 - {A089CEE6-EBF0-4232-A0C0-74850A8127A6}.Release|Win32.Build.0 = Release|Win32 - {22D325FB-9131-4BD6-B390-968F0491D687}.Debug|Win32.ActiveCfg = Debug|Win32 - {22D325FB-9131-4BD6-B390-968F0491D687}.Debug|Win32.Build.0 = Debug|Win32 - {22D325FB-9131-4BD6-B390-968F0491D687}.Release|Win32.ActiveCfg = Release|Win32 - {22D325FB-9131-4BD6-B390-968F0491D687}.Release|Win32.Build.0 = Release|Win32 - {28C29E72-76A2-4D0C-B35B-12D446733D2E}.Debug|Win32.ActiveCfg = Debug|Win32 - {28C29E72-76A2-4D0C-B35B-12D446733D2E}.Debug|Win32.Build.0 = Debug|Win32 - {28C29E72-76A2-4D0C-B35B-12D446733D2E}.Release|Win32.ActiveCfg = Release|Win32 - {28C29E72-76A2-4D0C-B35B-12D446733D2E}.Release|Win32.Build.0 = Release|Win32 - {9FD51412-E945-4457-A17A-CA3C505CF431}.Debug|Win32.ActiveCfg = Debug|Win32 - {9FD51412-E945-4457-A17A-CA3C505CF431}.Debug|Win32.Build.0 = Debug|Win32 - {9FD51412-E945-4457-A17A-CA3C505CF431}.Release|Win32.ActiveCfg = Release|Win32 - {9FD51412-E945-4457-A17A-CA3C505CF431}.Release|Win32.Build.0 = Release|Win32 - {72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}.Debug|Win32.ActiveCfg = Debug|Win32 - {72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}.Debug|Win32.Build.0 = Debug|Win32 - {72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}.Release|Win32.ActiveCfg = Release|Win32 - {72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}.Release|Win32.Build.0 = Release|Win32 - {D8404314-73DD-4270-8205-BE677F8FDAC7}.Debug|Win32.ActiveCfg = Debug|Win32 - {D8404314-73DD-4270-8205-BE677F8FDAC7}.Debug|Win32.Build.0 = Debug|Win32 - {D8404314-73DD-4270-8205-BE677F8FDAC7}.Release|Win32.ActiveCfg = Release|Win32 - {D8404314-73DD-4270-8205-BE677F8FDAC7}.Release|Win32.Build.0 = Release|Win32 - {97D89AEF-2BE4-4E34-8703-03BA67BF4494}.Debug|Win32.ActiveCfg = Debug|Win32 - {97D89AEF-2BE4-4E34-8703-03BA67BF4494}.Debug|Win32.Build.0 = Debug|Win32 - {97D89AEF-2BE4-4E34-8703-03BA67BF4494}.Release|Win32.ActiveCfg = Release|Win32 - {97D89AEF-2BE4-4E34-8703-03BA67BF4494}.Release|Win32.Build.0 = Release|Win32 - {C8A1509C-F91B-4140-BD51-B87FF24FB95F}.Debug|Win32.ActiveCfg = Debug|Win32 - {C8A1509C-F91B-4140-BD51-B87FF24FB95F}.Debug|Win32.Build.0 = Debug|Win32 - {C8A1509C-F91B-4140-BD51-B87FF24FB95F}.Release|Win32.ActiveCfg = Release|Win32 - {C8A1509C-F91B-4140-BD51-B87FF24FB95F}.Release|Win32.Build.0 = Release|Win32 - {32604097-C934-4711-B1AD-206336640E70}.Debug|Win32.ActiveCfg = Debug|Win32 - {32604097-C934-4711-B1AD-206336640E70}.Debug|Win32.Build.0 = Debug|Win32 - {32604097-C934-4711-B1AD-206336640E70}.Release|Win32.ActiveCfg = Release|Win32 - {32604097-C934-4711-B1AD-206336640E70}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/infrastructure/msvc/2013/boxquery.vcxproj b/infrastructure/msvc/2013/boxquery.vcxproj deleted file mode 100644 index fd871d3b..00000000 --- a/infrastructure/msvc/2013/boxquery.vcxproj +++ /dev/null @@ -1,130 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}</ProjectGuid> - <RootNamespace>boxquery</RootNamespace> - <Keyword>Win32Proj</Keyword> - <ProjectName>bbackupquery</ProjectName> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\backupstore;$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\common;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\pcre;$(ProjectDir)..\..\..\..\openssl\include;$(ProjectDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <MinimalRebuild>true</MinimalRebuild> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile> - <SubSystem>Console</SubSystem> - <TargetMachine>MachineX86</TargetMachine> - <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> - <AdditionalDependencies>Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\backupstore;$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\common;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\pcre;$(ProjectDir)..\..\..\..\openssl\include;$(ProjectDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <BufferSecurityCheck>true</BufferSecurityCheck> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <DisableSpecificWarnings>4521</DisableSpecificWarnings> - </ClCompile> - <Link> - <AdditionalDependencies>Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)bbackupquery.exe</OutputFile> - <IgnoreSpecificDefaultLibraries> - </IgnoreSpecificDefaultLibraries> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Console</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <TargetMachine>MachineX86</TargetMachine> - <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\..\..\bin\bbackupquery\autogen_Documentation.cpp" /> - <ClCompile Include="..\..\..\bin\bbackupquery\BackupQueries.cpp" /> - <ClCompile Include="..\..\..\bin\bbackupquery\bbackupquery.cpp" /> - <ClCompile Include="..\..\..\bin\bbackupquery\CommandCompletion.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\bin\bbackupquery\BackupQueries.h" /> - <ClInclude Include="..\..\..\bin\bbackupquery\BoxBackupCompareParams.h" /> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="..\..\..\lib\win32\messages.rc" /> - </ItemGroup> - <ItemGroup> - <None Include="..\..\..\ReadMe.txt" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="common.vcxproj"> - <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project> - <ReferenceOutputAssembly>false</ReferenceOutputAssembly> - </ProjectReference> - <ProjectReference Include="libbackupclient.vcxproj"> - <Project>{32604097-c934-4711-b1ad-206336640e70}</Project> - </ProjectReference> - <ProjectReference Include="libbackupstore.vcxproj"> - <Project>{97d89aef-2be4-4e34-8703-03ba67bf4494}</Project> - </ProjectReference> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/infrastructure/msvc/2013/common.vcxproj b/infrastructure/msvc/2013/common.vcxproj deleted file mode 100644 index 50c93384..00000000 --- a/infrastructure/msvc/2013/common.vcxproj +++ /dev/null @@ -1,258 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{A089CEE6-EBF0-4232-A0C0-74850A8127A6}</ProjectGuid> - <RootNamespace>common</RootNamespace> - <Keyword>Win32Proj</Keyword> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir> - <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IncludePath)</IncludePath> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <PreBuildEvent /> - <ClCompile> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\common;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\openssl\include;$(ProjectDir)..\..\..\..\zlib\include;$(ProjectDir)..\..\..\..\pcre;$(ProjectDir)..\..\..\qdbm</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <MinimalRebuild>true</MinimalRebuild> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <TreatWarningAsError>false</TreatWarningAsError> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <DisableSpecificWarnings>4521</DisableSpecificWarnings> - </ClCompile> - <Lib /> - <CustomBuildStep /> - <CustomBuildStep /> - <CustomBuildStep /> - <Lib> - <AdditionalDependencies>$(ProjectDir)..\..\..\..\pcre\build\vc2013\Debug\pcre.lib;$(ProjectDir)..\..\..\..\pcre\build\vc2013\Debug\pcreposix.lib;$(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib;$(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib;$(ProjectDir)..\..\..\..\zlib\projects\visualc10\LIB Debug\zlibd.lib;%(AdditionalDependencies)</AdditionalDependencies> - </Lib> - <PreBuildEvent> - <Command>perl $(ProjectDir)..\getversion.pl</Command> - </PreBuildEvent> - <PreBuildEvent> - <Message>Determining Version Number</Message> - </PreBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\common\;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\openssl\include;$(ProjectDir)..\..\..\..\zlib\include;$(ProjectDir)..\..\..\..\pcre;$(ProjectDir)..\..\..\qdbm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;BOX_RELEASE_BUILD;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <BufferSecurityCheck>true</BufferSecurityCheck> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <DisableSpecificWarnings>4521</DisableSpecificWarnings> - </ClCompile> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - <AdditionalDependencies>$(ProjectDir)..\..\..\..\pcre\build\vc2013\Release\pcre.lib;$(ProjectDir)..\..\..\..\pcre\build\vc2013\Release\pcreposix.lib;$(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib;$(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib;$(ProjectDir)..\..\..\..\zlib\projects\visualc10\\LIB Release\zlib.lib;%(AdditionalDependencies)</AdditionalDependencies> - </Lib> - <PreBuildEvent> - <Command>perl $(ProjectDir)..\getversion.pl</Command> - <Message>Determining Version Number</Message> - </PreBuildEvent> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\..\..\lib\common\BufferedStream.cpp" /> - <ClCompile Include="..\..\..\lib\common\BufferedWriteStream.cpp" /> - <ClCompile Include="..\..\..\lib\common\FileModificationTime.cpp" /> - <ClCompile Include="..\..\..\lib\common\GetLine.cpp" /> - <ClCompile Include="..\..\..\lib\common\InvisibleTempFileStream.cpp" /> - <ClCompile Include="..\..\..\lib\common\NamedLock.cpp" /> - <ClCompile Include="..\..\..\lib\common\RateLimitingStream.cpp" /> - <ClCompile Include="..\..\..\lib\compress\autogen_CompressException.cpp" /> - <ClCompile Include="..\..\..\lib\compress\CompressStream.cpp" /> - <ClCompile Include="..\..\..\lib\common\autogen_CommonException.cpp" /> - <ClCompile Include="..\..\..\lib\common\autogen_ConversionException.cpp" /> - <ClCompile Include="..\..\..\lib\common\BoxException.cpp" /> - <ClCompile Include="..\..\..\lib\common\BoxTime.cpp" /> - <ClCompile Include="..\..\..\lib\common\BoxTimeToText.cpp" /> - <ClCompile Include="..\..\..\lib\common\CollectInBufferStream.cpp" /> - <ClCompile Include="..\..\..\lib\common\Configuration.cpp" /> - <ClCompile Include="..\..\..\lib\common\ConversionString.cpp" /> - <ClCompile Include="..\..\..\lib\common\DebugAssertFailed.cpp" /> - <ClCompile Include="..\..\..\lib\common\DebugMemLeakFinder.cpp" /> - <ClCompile Include="..\..\..\lib\common\DebugPrintf.cpp" /> - <ClCompile Include="..\..\..\lib\common\ExcludeList.cpp" /> - <ClCompile Include="..\..\..\lib\common\FdGetLine.cpp" /> - <ClCompile Include="..\..\..\lib\common\FileStream.cpp" /> - <ClCompile Include="..\..\..\lib\common\IOStream.cpp" /> - <ClCompile Include="..\..\..\lib\common\IOStreamGetLine.cpp" /> - <ClCompile Include="..\..\..\lib\common\Logging.cpp" /> - <ClCompile Include="..\..\..\lib\common\MemBlockStream.cpp" /> - <ClCompile Include="..\..\..\lib\common\PartialReadStream.cpp" /> - <ClCompile Include="..\..\..\lib\common\PathUtils.cpp" /> - <ClCompile Include="..\..\..\lib\common\ReadGatherStream.cpp" /> - <ClCompile Include="..\..\..\lib\common\ReadLoggingStream.cpp" /> - <ClCompile Include="..\..\..\lib\common\StreamableMemBlock.cpp" /> - <ClCompile Include="..\..\..\lib\common\Timer.cpp" /> - <ClCompile Include="..\..\..\lib\common\UnixUser.cpp" /> - <ClCompile Include="..\..\..\lib\common\Utils.cpp" /> - <ClCompile Include="..\..\..\lib\common\WaitForEvent.cpp" /> - <ClCompile Include="..\..\..\lib\crypto\autogen_CipherException.cpp" /> - <ClCompile Include="..\..\..\lib\crypto\CipherAES.cpp" /> - <ClCompile Include="..\..\..\lib\crypto\CipherBlowfish.cpp" /> - <ClCompile Include="..\..\..\lib\crypto\CipherContext.cpp" /> - <ClCompile Include="..\..\..\lib\crypto\CipherDescription.cpp" /> - <ClCompile Include="..\..\..\lib\crypto\CryptoUtils.cpp" /> - <ClCompile Include="..\..\..\lib\crypto\MD5Digest.cpp" /> - <ClCompile Include="..\..\..\lib\crypto\Random.cpp" /> - <ClCompile Include="..\..\..\lib\crypto\RollingChecksum.cpp" /> - <ClCompile Include="..\..\..\lib\server\Message.cpp" /> - <ClCompile Include="..\..\..\lib\server\TcpNice.cpp" /> - <ClCompile Include="..\..\..\lib\win32\emu.cpp" /> - <ClCompile Include="..\..\..\lib\win32\getopt_long.cpp" /> - <ClCompile Include="..\..\..\lib\server\autogen_ConnectionException.cpp" /> - <ClCompile Include="..\..\..\lib\server\autogen_ServerException.cpp" /> - <ClCompile Include="..\..\..\lib\server\Daemon.cpp" /> - <ClCompile Include="..\..\..\lib\server\LocalProcessStream.cpp" /> - <ClCompile Include="..\..\..\lib\server\Protocol.cpp" /> - <ClCompile Include="..\..\..\lib\server\ProtocolUncertainStream.cpp" /> - <ClCompile Include="..\..\..\lib\server\Socket.cpp" /> - <ClCompile Include="..\..\..\lib\server\SocketStream.cpp" /> - <ClCompile Include="..\..\..\lib\server\SocketStreamTLS.cpp" /> - <ClCompile Include="..\..\..\lib\server\SSLLib.cpp" /> - <ClCompile Include="..\..\..\lib\server\TLSContext.cpp" /> - <ClCompile Include="..\..\..\lib\server\WinNamedPipeStream.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\lib\common\BufferedStream.h" /> - <ClInclude Include="..\..\..\lib\common\BufferedWriteStream.h" /> - <ClInclude Include="..\..\..\lib\common\GetLine.h" /> - <ClInclude Include="..\..\..\lib\common\InvisibleTempFileStream.h" /> - <ClInclude Include="..\..\..\lib\common\RateLimitingStream.h" /> - <ClInclude Include="..\..\..\lib\compress\autogen_CompressException.h" /> - <ClInclude Include="..\..\..\lib\compress\Compress.h" /> - <ClInclude Include="..\..\..\lib\compress\CompressException.h" /> - <ClInclude Include="..\..\..\lib\compress\CompressStream.h" /> - <ClInclude Include="..\..\..\lib\common\autogen_CommonException.h" /> - <ClInclude Include="..\..\..\lib\common\autogen_ConversionException.h" /> - <ClInclude Include="..\..\..\lib\common\BannerText.h" /> - <ClInclude Include="..\..\..\lib\common\BeginStructPackForWire.h" /> - <ClInclude Include="..\..\..\lib\common\Box.h" /> - <ClInclude Include="..\..\..\lib\common\BoxConfig-MSVC.h" /> - <ClInclude Include="..\..\..\lib\common\BoxException.h" /> - <ClInclude Include="..\..\..\lib\common\BoxPlatform.h" /> - <ClInclude Include="..\..\..\lib\common\BoxPortsAndFiles.h" /> - <ClInclude Include="..\..\..\lib\common\BoxTime.h" /> - <ClInclude Include="..\..\..\lib\common\BoxTimeToText.h" /> - <ClInclude Include="..\..\..\lib\common\BoxTimeToUnix.h" /> - <ClInclude Include="..\..\..\lib\common\BoxVersion.h" /> - <ClInclude Include="..\..\..\lib\common\CollectInBufferStream.h" /> - <ClInclude Include="..\..\..\lib\common\CommonException.h" /> - <ClInclude Include="..\..\..\lib\common\Configuration.h" /> - <ClInclude Include="..\..\..\lib\common\Conversion.h" /> - <ClInclude Include="..\..\..\lib\common\EndStructPackForWire.h" /> - <ClInclude Include="..\..\..\lib\common\ExcludeList.h" /> - <ClInclude Include="..\..\..\lib\common\FdGetLine.h" /> - <ClInclude Include="..\..\..\lib\common\FileModificationTime.h" /> - <ClInclude Include="..\..\..\lib\common\FileStream.h" /> - <ClInclude Include="..\..\..\lib\common\Guards.h" /> - <ClInclude Include="..\..\..\lib\common\IOStream.h" /> - <ClInclude Include="..\..\..\lib\common\IOStreamGetLine.h" /> - <ClInclude Include="..\..\..\lib\crypto\CryptoUtils.h" /> - <ClInclude Include="..\..\..\lib\server\LocalProcessStream.h" /> - <ClInclude Include="..\..\..\lib\common\Logging.h" /> - <ClInclude Include="..\..\..\lib\common\MainHelper.h" /> - <ClInclude Include="..\..\..\lib\common\MemBlockStream.h" /> - <ClInclude Include="..\..\..\lib\common\MemLeakFinder.h" /> - <ClInclude Include="..\..\..\lib\common\MemLeakFindOff.h" /> - <ClInclude Include="..\..\..\lib\common\MemLeakFindOn.h" /> - <ClInclude Include="..\..\..\lib\common\NamedLock.h" /> - <ClInclude Include="..\..\..\lib\common\PartialReadStream.h" /> - <ClInclude Include="..\..\..\lib\common\PathUtils.h" /> - <ClInclude Include="..\..\..\lib\common\ReadGatherStream.h" /> - <ClInclude Include="..\..\..\lib\common\ReadLoggingStream.h" /> - <ClInclude Include="..\..\..\lib\common\StreamableMemBlock.h" /> - <ClInclude Include="..\..\..\lib\common\TemporaryDirectory.h" /> - <ClInclude Include="..\..\..\lib\common\Test.h" /> - <ClInclude Include="..\..\..\lib\common\Timer.h" /> - <ClInclude Include="..\..\..\lib\common\UnixUser.h" /> - <ClInclude Include="..\..\..\lib\common\Utils.h" /> - <ClInclude Include="..\..\..\lib\common\WaitForEvent.h" /> - <ClInclude Include="..\..\..\lib\crypto\autogen_CipherException.h" /> - <ClInclude Include="..\..\..\lib\crypto\CipherAES.h" /> - <ClInclude Include="..\..\..\lib\crypto\CipherBlowfish.h" /> - <ClInclude Include="..\..\..\lib\crypto\CipherContext.h" /> - <ClInclude Include="..\..\..\lib\crypto\CipherDescription.h" /> - <ClInclude Include="..\..\..\lib\crypto\CipherException.h" /> - <ClInclude Include="..\..\..\lib\crypto\MD5Digest.h" /> - <ClInclude Include="..\..\..\lib\crypto\Random.h" /> - <ClInclude Include="..\..\..\lib\crypto\RollingChecksum.h" /> - <ClInclude Include="..\..\..\lib\server\Message.h" /> - <ClInclude Include="..\..\..\lib\server\TcpNice.h" /> - <ClInclude Include="..\..\..\lib\win32\emu.h" /> - <ClInclude Include="..\..\..\lib\win32\getopt.h" /> - <ClInclude Include="..\..\..\lib\server\autogen_ConnectionException.h" /> - <ClInclude Include="..\..\..\lib\server\autogen_ServerException.h" /> - <ClInclude Include="..\..\..\lib\server\Daemon.h" /> - <ClInclude Include="..\..\..\lib\server\Protocol.h" /> - <ClInclude Include="..\..\..\lib\server\ProtocolUncertainStream.h" /> - <ClInclude Include="..\..\..\lib\server\ProtocolWire.h" /> - <ClInclude Include="..\..\..\lib\server\ServerException.h" /> - <ClInclude Include="..\..\..\lib\server\ServerStream.h" /> - <ClInclude Include="..\..\..\lib\server\ServerTLS.h" /> - <ClInclude Include="..\..\..\lib\server\Socket.h" /> - <ClInclude Include="..\..\..\lib\server\SocketListen.h" /> - <ClInclude Include="..\..\..\lib\server\SocketStream.h" /> - <ClInclude Include="..\..\..\lib\server\SocketStreamTLS.h" /> - <ClInclude Include="..\..\..\lib\server\SSLLib.h" /> - <ClInclude Include="..\..\..\lib\server\TLSContext.h" /> - <ClInclude Include="..\..\..\lib\server\WinNamedPipeStream.h" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="qdbm.vcxproj"> - <Project>{72af22a7-b339-4fdf-b6ae-ca6522d4bb8d}</Project> - </ProjectReference> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/infrastructure/msvc/2013/libbackupclient.vcxproj b/infrastructure/msvc/2013/libbackupclient.vcxproj deleted file mode 100644 index e52e3dd5..00000000 --- a/infrastructure/msvc/2013/libbackupclient.vcxproj +++ /dev/null @@ -1,108 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\..\lib\backupclient\autogen_ClientException.cpp" /> - <ClCompile Include="..\..\..\lib\backupclient\BackupClientCryptoKeys.cpp" /> - <ClCompile Include="..\..\..\lib\backupclient\BackupClientMakeExcludeList.cpp" /> - <ClCompile Include="..\..\..\lib\backupclient\BackupClientRestore.cpp" /> - <ClCompile Include="..\..\..\lib\backupclient\BackupDaemonConfigVerify.cpp" /> - <ClCompile Include="..\..\..\lib\backupclient\BackupStoreObjectDump.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\lib\backupclient\autogen_ClientException.h" /> - <ClInclude Include="..\..\..\lib\backupclient\BackupClientCryptoKeys.h" /> - <ClInclude Include="..\..\..\lib\backupclient\BackupClientMakeExcludeList.h" /> - <ClInclude Include="..\..\..\lib\backupclient\BackupClientRestore.h" /> - <ClInclude Include="..\..\..\lib\backupclient\BackupDaemonConfigVerify.h" /> - <ClInclude Include="..\..\..\lib\backupclient\BackupDaemonInterface.h" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="libbackupstore.vcxproj"> - <Project>{97d89aef-2be4-4e34-8703-03ba67bf4494}</Project> - </ProjectReference> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{32604097-C934-4711-B1AD-206336640E70}</ProjectGuid> - <RootNamespace>libbackupstore</RootNamespace> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <TargetExt>.lib</TargetExt> - <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir> - <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\raidfile;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <DisableSpecificWarnings>4521</DisableSpecificWarnings> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>Ws2_32.lib;Advapi32.lib;User32.lib;$(ProjectDir)..\..\..\..\zlib\lib\zdll.lib;$(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib;$(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib;$(ProjectDir)..\..\..\$(Configuration)\common.lib;%(AdditionalDependencies)</AdditionalDependencies> - </Link> - <Lib /> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\raidfile;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;BOX_RELEASE_BUILD;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <DisableSpecificWarnings>4521</DisableSpecificWarnings> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/infrastructure/msvc/2013/libbackupstore.vcxproj b/infrastructure/msvc/2013/libbackupstore.vcxproj deleted file mode 100644 index 6bf54572..00000000 --- a/infrastructure/msvc/2013/libbackupstore.vcxproj +++ /dev/null @@ -1,184 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{97D89AEF-2BE4-4E34-8703-03BA67BF4494}</ProjectGuid> - <RootNamespace>libbackupstore</RootNamespace> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <TargetExt>.lib</TargetExt> - <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir> - <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\raidfile;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\lib\httpserver;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <DisableSpecificWarnings>4521</DisableSpecificWarnings> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>Ws2_32.lib;Advapi32.lib;User32.lib;$(ProjectDir)..\..\..\..\zlib\lib\zdll.lib;$(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib;$(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib;$(ProjectDir)..\..\..\$(Configuration)\common.lib;%(AdditionalDependencies)</AdditionalDependencies> - </Link> - <Lib /> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\lib\backupclient;$(SolutionDir)..\..\..\lib\backupstore;$(SolutionDir)..\..\..\lib\raidfile;$(SolutionDir)..\..\..\lib\common;$(SolutionDir)..\..\..\lib\compress;$(SolutionDir)..\..\..\lib\crypto;$(SolutionDir)..\..\..\lib\server;$(SolutionDir)..\..\..\lib\win32;$(SolutionDir)..\..\..\lib\httpserver;$(SolutionDir)..\..\..\qdbm;$(SolutionDir)..\..\..\..\openssl\include;$(SolutionDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;BOX_RELEASE_BUILD;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <DisableSpecificWarnings>4521</DisableSpecificWarnings> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\..\..\lib\backupstore\autogen_BackupProtocol.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\autogen_BackupStoreException.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\BackupAccountControl.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\BackupClientFileAttributes.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\BackupCommands.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\BackupStoreAccountDatabase.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\BackupStoreAccounts.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\BackupStoreCheck.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\BackupStoreCheck2.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\BackupStoreCheckData.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\BackupStoreConfigVerify.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\BackupStoreContext.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\BackupStoreDirectory.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFile.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileCmbDiff.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileCmbIdx.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileCombine.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileCryptVar.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileDiff.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileEncodeStream.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFilename.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFilenameClear.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\BackupStoreFileRevDiff.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\BackupStoreInfo.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\BackupStoreRefCountDatabase.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\HousekeepStoreAccount.cpp" /> - <ClCompile Include="..\..\..\lib\backupstore\StoreStructure.cpp" /> - <ClCompile Include="..\..\..\lib\httpserver\autogen_HTTPException.cpp" /> - <ClCompile Include="..\..\..\lib\httpserver\cdecode.cpp" /> - <ClCompile Include="..\..\..\lib\httpserver\cencode.cpp" /> - <ClCompile Include="..\..\..\lib\httpserver\HTTPQueryDecoder.cpp" /> - <ClCompile Include="..\..\..\lib\httpserver\HTTPRequest.cpp" /> - <ClCompile Include="..\..\..\lib\httpserver\HTTPResponse.cpp" /> - <ClCompile Include="..\..\..\lib\httpserver\HTTPServer.cpp" /> - <ClCompile Include="..\..\..\lib\httpserver\S3Client.cpp" /> - <ClCompile Include="..\..\..\lib\httpserver\S3Simulator.cpp" /> - <ClCompile Include="..\..\..\lib\raidfile\autogen_RaidFileException.cpp" /> - <ClCompile Include="..\..\..\lib\raidfile\RaidFileController.cpp" /> - <ClCompile Include="..\..\..\lib\raidfile\RaidFileRead.cpp" /> - <ClCompile Include="..\..\..\lib\raidfile\RaidFileUtil.cpp" /> - <ClCompile Include="..\..\..\lib\raidfile\RaidFileWrite.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\lib\backupstore\autogen_BackupProtocol.h" /> - <ClInclude Include="..\..\..\lib\backupstore\autogen_BackupStoreException.h" /> - <ClInclude Include="..\..\..\lib\backupstore\BackupAccountControl.h" /> - <ClInclude Include="..\..\..\lib\backupstore\BackupClientFileAttributes.h" /> - <ClInclude Include="..\..\..\lib\backupstore\BackupConstants.h" /> - <ClInclude Include="..\..\..\lib\backupstore\BackupStoreAccountDatabase.h" /> - <ClInclude Include="..\..\..\lib\backupstore\BackupStoreAccounts.h" /> - <ClInclude Include="..\..\..\lib\backupstore\BackupStoreCheck.h" /> - <ClInclude Include="..\..\..\lib\backupstore\BackupStoreConfigVerify.h" /> - <ClInclude Include="..\..\..\lib\backupstore\BackupStoreConstants.h" /> - <ClInclude Include="..\..\..\lib\backupstore\BackupStoreContext.h" /> - <ClInclude Include="..\..\..\lib\backupstore\BackupStoreDirectory.h" /> - <ClInclude Include="..\..\..\lib\backupstore\BackupStoreException.h" /> - <ClInclude Include="..\..\..\lib\backupstore\BackupStoreFile.h" /> - <ClInclude Include="..\..\..\lib\backupstore\BackupStoreFileCryptVar.h" /> - <ClInclude Include="..\..\..\lib\backupstore\BackupStoreFileEncodeStream.h" /> - <ClInclude Include="..\..\..\lib\backupstore\BackupStoreFilename.h" /> - <ClInclude Include="..\..\..\lib\backupstore\BackupStoreFilenameClear.h" /> - <ClInclude Include="..\..\..\lib\backupstore\BackupStoreFileWire.h" /> - <ClInclude Include="..\..\..\lib\backupstore\BackupStoreInfo.h" /> - <ClInclude Include="..\..\..\lib\backupstore\BackupStoreObjectMagic.h" /> - <ClInclude Include="..\..\..\lib\backupstore\BackupStoreRefCountDatabase.h" /> - <ClInclude Include="..\..\..\lib\backupstore\HousekeepStoreAccount.h" /> - <ClInclude Include="..\..\..\lib\backupstore\RunStatusProvider.h" /> - <ClInclude Include="..\..\..\lib\backupstore\StoreStructure.h" /> - <ClInclude Include="..\..\..\lib\httpserver\autogen_HTTPException.h" /> - <ClInclude Include="..\..\..\lib\httpserver\cdecode.h" /> - <ClInclude Include="..\..\..\lib\httpserver\cencode.h" /> - <ClInclude Include="..\..\..\lib\httpserver\decode.h" /> - <ClInclude Include="..\..\..\lib\httpserver\encode.h" /> - <ClInclude Include="..\..\..\lib\httpserver\HTTPQueryDecoder.h" /> - <ClInclude Include="..\..\..\lib\httpserver\HTTPRequest.h" /> - <ClInclude Include="..\..\..\lib\httpserver\HTTPResponse.h" /> - <ClInclude Include="..\..\..\lib\httpserver\HTTPServer.h" /> - <ClInclude Include="..\..\..\lib\httpserver\S3Client.h" /> - <ClInclude Include="..\..\..\lib\httpserver\S3Simulator.h" /> - <ClInclude Include="..\..\..\lib\raidfile\autogen_RaidFileException.h" /> - <ClInclude Include="..\..\..\lib\raidfile\RaidFileController.h" /> - <ClInclude Include="..\..\..\lib\raidfile\RaidFileException.h" /> - <ClInclude Include="..\..\..\lib\raidfile\RaidFileRead.h" /> - <ClInclude Include="..\..\..\lib\raidfile\RaidFileUtil.h" /> - <ClInclude Include="..\..\..\lib\raidfile\RaidFileWrite.h" /> - </ItemGroup> - <ItemGroup> - <None Include="..\..\..\lib\backupstore\backupprotocol.txt" /> - <None Include="..\..\..\lib\backupstore\BackupStoreException.txt" /> - <None Include="..\..\..\lib\backupstore\Makefile.extra" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="common.vcxproj"> - <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project> - </ProjectReference> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/infrastructure/msvc/2013/qdbm.vcxproj b/infrastructure/msvc/2013/qdbm.vcxproj deleted file mode 100644 index 296de088..00000000 --- a/infrastructure/msvc/2013/qdbm.vcxproj +++ /dev/null @@ -1,90 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}</ProjectGuid> - <RootNamespace>qdbm</RootNamespace> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <TargetExt>.lib</TargetExt> - <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir> - <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir> - <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <CompileAsManaged>false</CompileAsManaged> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PreprocessorDefinitions>QDBM_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - <Lib /> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <CompileAsManaged>false</CompileAsManaged> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClInclude Include="..\..\..\qdbm\depot.h" /> - <ClInclude Include="..\..\..\qdbm\myconf.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\..\qdbm\depot.c" /> - <ClCompile Include="..\..\..\qdbm\myconf.c" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/infrastructure/msvc/2013/win32test.vcxproj b/infrastructure/msvc/2013/win32test.vcxproj deleted file mode 100644 index 8369aabc..00000000 --- a/infrastructure/msvc/2013/win32test.vcxproj +++ /dev/null @@ -1,115 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{28C29E72-76A2-4D0C-B35B-12D446733D2E}</ProjectGuid> - <RootNamespace>win32test</RootNamespace> - <Keyword>Win32Proj</Keyword> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir> - <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\bin\bbackupd;$(ProjectDir)..\..\..\lib\backupstore;$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\common;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\openssl\include;$(ProjectDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <MinimalRebuild>true</MinimalRebuild> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <DisableSpecificWarnings>4521</DisableSpecificWarnings> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile> - <SubSystem>Console</SubSystem> - <TargetMachine>MachineX86</TargetMachine> - <ShowProgress>NotSet</ShowProgress> - <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> - <AdditionalDependencies>Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\bin\bbackupd;$(ProjectDir)..\..\..\lib\backupstore;$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\common;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\openssl\include;$(ProjectDir)..\..\..\..\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <BufferSecurityCheck>true</BufferSecurityCheck> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - </ClCompile> - <Link> - <AdditionalDependencies>Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - <IgnoreSpecificDefaultLibraries> - </IgnoreSpecificDefaultLibraries> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Console</SubSystem> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <TargetMachine>MachineX86</TargetMachine> - <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\..\..\lib\win32\emu.cpp" /> - <ClCompile Include="..\..\..\test\win32\testlibwin32.cpp" /> - </ItemGroup> - <ItemGroup> - <None Include="..\..\..\ReadMe.txt" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="common.vcxproj"> - <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project> - <ReferenceOutputAssembly>false</ReferenceOutputAssembly> - </ProjectReference> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/infrastructure/msvc/fake-config.sub.pl b/infrastructure/msvc/fake-config.sub.pl deleted file mode 100644 index fa9b6839..00000000 --- a/infrastructure/msvc/fake-config.sub.pl +++ /dev/null @@ -1,18 +0,0 @@ -#!perl
-
-use strict;
-use warnings;
-use Cwd;
-
-require "infrastructure\\BoxPlatform.pm.in";
-my $wd = getcwd();
-my $dummy = $BoxPlatform::product_version;
-
-while(<>)
-{
- s|\@build_dir@|$wd|;
- s|\@client_parcel_dir@|$wd/Debug|;
- s|\@box_version@|$BoxPlatform::product_version|;
- m|[^@](@[^@]+@)| and die "Unknown variable: $1";
- print;
-}
\ No newline at end of file diff --git a/infrastructure/msvc/getversion.pl b/infrastructure/msvc/getversion.pl deleted file mode 100755 index fe958831..00000000 --- a/infrastructure/msvc/getversion.pl +++ /dev/null @@ -1,33 +0,0 @@ -#!perl - -$basedir = $0; -$basedir =~ s|/|\\|g; -$basedir =~ s/\\[^\\]*$//; -$basedir =~ s/\\[^\\]*$//; -$basedir =~ s/\\[^\\]*$//; --d $basedir or die "$basedir: $!"; -chdir $basedir or die "$basedir: $!"; - -require "$basedir\\infrastructure\\BoxPlatform.pm.in"; - -my $verfile = "$basedir/lib/common/BoxVersion.h"; -my $newver = "#define BOX_VERSION \"$BoxPlatform::product_version\"\n"; -my $oldver = ""; - -if (-r $verfile) -{ - open VERSIONFILE, "< $verfile" or die "$verfile: $!"; - $oldver = <VERSIONFILE>; - close VERSIONFILE; - -} - -if ($newver ne $oldver) -{ - open VERSIONFILE, "> $verfile" or die "BoxVersion.h: $!"; - print VERSIONFILE $newver; - close VERSIONFILE; -} - -print $BoxPlatform::product_version; -exit 0; diff --git a/infrastructure/msvc/win32.bat b/infrastructure/msvc/win32.bat deleted file mode 100644 index 7c25723a..00000000 --- a/infrastructure/msvc/win32.bat +++ /dev/null @@ -1,44 +0,0 @@ -@echo off
-
-echo quick and dirty to get up and running by generating the required files
-echo using Cygwin and Perl
-
-cd ..\..
-
-copy .\infrastructure\BoxPlatform.pm.in .\infrastructure\BoxPlatform.pm
-copy .\lib\common\BoxPortsAndFiles.h.in .\lib\common\BoxPortsAndFiles.h
-copy .\lib\common\BoxConfig-MSVC.h .\lib\common\BoxConfig.h
-
-cd .\bin\bbackupquery\ & perl ./../../bin/bbackupquery/makedocumentation.pl.in
-cd ..\..\
-
-cd .\lib\backupstore & perl ./../../lib/common/makeexception.pl.in BackupStoreException.txt & perl ./../../lib/server/makeprotocol.pl.in backupprotocol.txt
-cd ..\..\
-
-cd .\lib\compress & perl ./../../lib/common/makeexception.pl.in CompressException.txt
-cd ..\..\
-
-cd .\lib\common & perl ./../../lib/common/makeexception.pl.in CommonException.txt & perl ./../../lib/common/makeexception.pl.in ConversionException.txt
-cd ..\..\
-
-cd .\lib\raidfile & perl ./../../lib/common/makeexception.pl.in RaidFileException.txt
-cd ..\..\
-
-cd .\lib\backupclient & perl ./../../lib/common/makeexception.pl.in ClientException.txt
-cd ..\..\
-
-cd .\lib\crypto & perl ./../../lib/common/makeexception.pl.in CipherException.txt
-cd ..\..\
-
-cd .\lib\httpserver & perl ./../../lib/common/makeexception.pl.in HTTPException.txt
-cd ..\..\
-
-echo server parts - which appears as though some of the clients rely on
-
-cd .\lib\server & perl ./../../lib/common/makeexception.pl.in ServerException.txt & perl ./../../lib/common/makeexception.pl.in ConnectionException.txt
-cd ..\..\
-
-perl -pe 's/@PERL@/perl/' ./test/bbackupd/testfiles/bbackupd.conf.in > .\test\bbackupd\testfiles\bbackupd.conf
-
-echo Generating InstallJammer configuration file
-perl infrastructure/msvc/fake-config.sub.pl ./contrib/windows/installer/boxbackup.mpi.in > ./contrib/windows/installer/boxbackup.mpi
diff --git a/infrastructure/travis-build.sh b/infrastructure/travis-build.sh new file mode 100755 index 00000000..74b58a3d --- /dev/null +++ b/infrastructure/travis-build.sh @@ -0,0 +1,53 @@ +#!/bin/sh + +set -e +set -x + +if [ "$TRAVIS_OS_NAME" = "osx" ]; then + brew update + # Travis appears to have Boost and OpenSSL installed already: + # brew install boost ccache openssl + ls /usr/local /usr/local/opt /usr/local/opt/openssl + brew install ccache +fi + +ccache -s + +if [ "$BUILD" = 'cmake' ]; then + if [ -z "$TEST_TARGET" ]; then + echo "TEST_TARGET must be set to 'release' or 'debug' for CMake builds" + exit 2 + fi + + if [ "$TRAVIS_OS_NAME" = "osx" ]; then + EXTRA_ARGS="-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DBOOST_ROOT=/usr/local/opt/boost" + fi + + cd `dirname $0` + mkdir -p cmake/build + cd cmake/build + cmake --version + cmake -DCMAKE_BUILD_TYPE:STRING=$TEST_TARGET $EXTRA_ARGS "$@" .. + make + + [ "$TEST" = "n" ] || ctest -C $TEST_TARGET -V +else + if [ "$TRAVIS_OS_NAME" = "osx" ]; then + EXTRA_ARGS="--with-ssl-lib=/usr/local/opt/openssl/lib --with-ssl-headers=/usr/local/opt/openssl/include --with-boost=/usr/local/opt/boost" + fi + + cd `dirname $0`/.. + ./bootstrap + ./configure CC="ccache $CC" CXX="ccache $CXX" $EXTRA_ARGS "$@" + grep CXX config.status + make V=1 $EXTRA_MAKE_ARGS + + [ "$TEST" = "n" ] || ./runtest.pl ALL $TEST_TARGET + + if [ "$TEST_TARGET" = "release" ]; then + make + make parcels + fi +fi + +ccache -s diff --git a/lib/backupstore/BackupAccountControl.h b/lib/backupstore/BackupAccountControl.h index bc041794..00118ec2 100644 --- a/lib/backupstore/BackupAccountControl.h +++ b/lib/backupstore/BackupAccountControl.h @@ -14,7 +14,6 @@ #include "BackupStoreAccountDatabase.h" #include "HTTPResponse.h" -#include "NamedLock.h" #include "S3Client.h" class BackupStoreDirectory; @@ -42,14 +41,12 @@ public: class S3BackupFileSystem { private: - const Configuration& mConfig; std::string mBasePath; S3Client& mrClient; public: S3BackupFileSystem(const Configuration& config, const std::string& BasePath, S3Client& rClient) - : mConfig(config), - mBasePath(BasePath), + : mBasePath(BasePath), mrClient(rClient) { } std::string GetDirectoryURI(int64_t ObjectID); diff --git a/lib/backupstore/BackupClientFileAttributes.cpp b/lib/backupstore/BackupClientFileAttributes.cpp index 7ec6f478..37140301 100644 --- a/lib/backupstore/BackupClientFileAttributes.cpp +++ b/lib/backupstore/BackupClientFileAttributes.cpp @@ -545,7 +545,7 @@ void BackupClientFileAttributes::FillAttributesLink( void BackupClientFileAttributes::FillExtendedAttr(StreamableMemBlock &outputBlock, const std::string& Filename) { -#ifdef HAVE_SYS_XATTR_H +#if defined HAVE_LLISTXATTR && defined HAVE_LGETXATTR int listBufferSize = 10000; char* list = new char[listBufferSize]; @@ -693,7 +693,7 @@ void BackupClientFileAttributes::FillExtendedAttr(StreamableMemBlock &outputBloc throw; } delete[] list; -#endif +#endif // defined HAVE_LLISTXATTR && defined HAVE_LGETXATTR } // -------------------------------------------------------------------------- @@ -992,7 +992,7 @@ void BackupClientFileAttributes::EnsureClearAvailable() const // -------------------------------------------------------------------------- void BackupClientFileAttributes::WriteExtendedAttr(const std::string& Filename, int xattrOffset) const { -#ifdef HAVE_SYS_XATTR_H +#if defined HAVE_LSETXATTR const char* buffer = static_cast<char*>(mpClearAttributes->GetBuffer()); uint32_t xattrBlockLength = 0; diff --git a/lib/backupstore/backupprotocol.txt b/lib/backupstore/BackupProtocol.txt index 5921d009..5921d009 100644 --- a/lib/backupstore/backupprotocol.txt +++ b/lib/backupstore/BackupProtocol.txt diff --git a/lib/backupstore/BackupStoreFileDiff.cpp b/lib/backupstore/BackupStoreFileDiff.cpp index 1d83d854..e6df11a6 100644 --- a/lib/backupstore/BackupStoreFileDiff.cpp +++ b/lib/backupstore/BackupStoreFileDiff.cpp @@ -16,7 +16,7 @@ #ifdef HAVE_TIME_H #include <time.h> -#elif HAVE_SYS_TIME_H +#elif defined HAVE_SYS_TIME_H #include <sys/time.h> #endif diff --git a/lib/backupstore/HousekeepStoreAccount.cpp b/lib/backupstore/HousekeepStoreAccount.cpp index f24d7227..d5acf62c 100644 --- a/lib/backupstore/HousekeepStoreAccount.cpp +++ b/lib/backupstore/HousekeepStoreAccount.cpp @@ -932,7 +932,7 @@ void HousekeepStoreAccount::UpdateDirectorySize( BackupStoreDirectory& rDirectory, IOStream::pos_type new_size_in_blocks) { -#ifndef NDEBUG +#ifndef BOX_RELEASE_BUILD { std::string dirFilename; MakeObjectFilename(rDirectory.GetObjectID(), dirFilename); diff --git a/lib/backupstore/Makefile.extra b/lib/backupstore/Makefile.extra index c55fd549..6f181abd 100644 --- a/lib/backupstore/Makefile.extra +++ b/lib/backupstore/Makefile.extra @@ -1,9 +1,9 @@ MAKEPROTOCOL = ../../lib/server/makeprotocol.pl -GEN_CMD = $(MAKEPROTOCOL) backupprotocol.txt +GEN_CMD = $(MAKEPROTOCOL) BackupProtocol.txt # AUTOGEN SEEDING -autogen_BackupProtocol.cpp autogen_BackupProtocol.h: $(MAKEPROTOCOL) backupprotocol.txt +autogen_BackupProtocol.cpp autogen_BackupProtocol.h: $(MAKEPROTOCOL) BackupProtocol.txt $(_PERL) $(GEN_CMD) diff --git a/lib/bbackupd/BackupDaemon.cpp b/lib/bbackupd/BackupDaemon.cpp index 3427a722..996c1919 100644 --- a/lib/bbackupd/BackupDaemon.cpp +++ b/lib/bbackupd/BackupDaemon.cpp @@ -922,8 +922,6 @@ std::auto_ptr<BackupClientContext> BackupDaemon::GetNewContext // it, let it be destroyed and close the connection. std::auto_ptr<BackupClientContext> BackupDaemon::RunSyncNow() { - Timers::AssertInitialised(); - // Delete the serialised store object file, // so that we don't try to reload it after a // partially completed backup diff --git a/lib/bbackupquery/documentation.txt b/lib/bbackupquery/Documentation.txt index b16a6f7c..b16a6f7c 100644 --- a/lib/bbackupquery/documentation.txt +++ b/lib/bbackupquery/Documentation.txt diff --git a/lib/bbackupquery/Makefile.extra b/lib/bbackupquery/Makefile.extra index e1049b6d..5d37c09f 100644 --- a/lib/bbackupquery/Makefile.extra +++ b/lib/bbackupquery/Makefile.extra @@ -1,6 +1,6 @@ # AUTOGEN SEEDING -autogen_Documentation.cpp: makedocumentation.pl documentation.txt +autogen_Documentation.cpp: makedocumentation.pl Documentation.txt $(_PERL) makedocumentation.pl diff --git a/lib/bbackupquery/makedocumentation.pl.in b/lib/bbackupquery/makedocumentation.pl.in index 530c4ff6..503ac9c8 100755 --- a/lib/bbackupquery/makedocumentation.pl.in +++ b/lib/bbackupquery/makedocumentation.pl.in @@ -3,7 +3,7 @@ use strict; print "Creating built-in documentation for bbackupquery...\n"; -open DOC,"documentation.txt" or die "Can't open documentation.txt file"; +open DOC, "Documentation.txt" or die "Can't open Documentation.txt file: $!"; my $section; my %help; my @in_order; diff --git a/lib/common/BoxConfig-MSVC.h b/lib/common/BoxConfig-MSVC.h index 82ab4997..2ec2edd7 100644 --- a/lib/common/BoxConfig-MSVC.h +++ b/lib/common/BoxConfig-MSVC.h @@ -2,9 +2,6 @@ /* lib/common/BoxConfig.h.in. Generated from configure.ac by autoheader. */ /* Hacked by hand to work for MSVC by Chris Wilson */ -// using std::min/max -#define NOMINMAX - /* Define to major version for BDB_VERSION */ /* #undef BDB_VERSION_MAJOR */ @@ -389,9 +386,6 @@ /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ -/* Define to `int' if <sys/types.h> doesn't define. */ -#define gid_t int - /* Define to `int' if <sys/types.h> does not define. */ /* #undef mode_t */ @@ -403,6 +397,3 @@ /* Define to `unsigned' if <sys/types.h> does not define. */ /* #undef size_t */ - -/* Define to `int' if <sys/types.h> doesn't define. */ -#define uid_t int diff --git a/lib/common/BoxPlatform.h b/lib/common/BoxPlatform.h index 35ad7a2c..f7c74bfc 100644 --- a/lib/common/BoxPlatform.h +++ b/lib/common/BoxPlatform.h @@ -21,11 +21,13 @@ #define PLATFORM_DEV_NULL "/dev/null" -#ifdef _MSC_VER -#include "BoxConfig-MSVC.h" -#define NEED_BOX_VERSION_H +#if defined BOX_CMAKE +# include "BoxConfig.cmake.h" +#elif defined _MSC_VER +# include "BoxConfig-MSVC.h" +# define NEED_BOX_VERSION_H #else -#include "BoxConfig.h" +# include "BoxConfig.h" #endif #ifdef WIN32 @@ -96,16 +98,19 @@ #endif // Handle differing xattr APIs -#ifdef HAVE_SYS_XATTR_H - #if !defined(HAVE_LLISTXATTR) && defined(HAVE_LISTXATTR) && HAVE_DECL_XATTR_NOFOLLOW - #define llistxattr(a,b,c) listxattr(a,b,c,XATTR_NOFOLLOW) - #endif - #if !defined(HAVE_LGETXATTR) && defined(HAVE_GETXATTR) && HAVE_DECL_XATTR_NOFOLLOW - #define lgetxattr(a,b,c,d) getxattr(a,b,c,d,0,XATTR_NOFOLLOW) - #endif - #if !defined(HAVE_LSETXATTR) && defined(HAVE_SETXATTR) && HAVE_DECL_XATTR_NOFOLLOW - #define lsetxattr(a,b,c,d,e) setxattr(a,b,c,d,0,(e)|XATTR_NOFOLLOW) - #endif +#if !defined(HAVE_LLISTXATTR) && defined(HAVE_LISTXATTR) && HAVE_DECL_XATTR_NOFOLLOW + #define llistxattr(a,b,c) listxattr(a,b,c,XATTR_NOFOLLOW) + #define HAVE_LLISTXATTR +#endif + +#if !defined(HAVE_LGETXATTR) && defined(HAVE_GETXATTR) && HAVE_DECL_XATTR_NOFOLLOW + #define lgetxattr(a,b,c,d) getxattr(a,b,c,d,0,XATTR_NOFOLLOW) + #define HAVE_LGETXATTR +#endif + +#if !defined(HAVE_LSETXATTR) && defined(HAVE_SETXATTR) && HAVE_DECL_XATTR_NOFOLLOW + #define lsetxattr(a,b,c,d,e) setxattr(a,b,c,d,0,(e)|XATTR_NOFOLLOW) + #define HAVE_LSETXATTR #endif #if !HAVE_DECL_INFTIM diff --git a/lib/common/BoxTime.cpp b/lib/common/BoxTime.cpp index 78269def..77daae6d 100644 --- a/lib/common/BoxTime.cpp +++ b/lib/common/BoxTime.cpp @@ -35,21 +35,30 @@ // -------------------------------------------------------------------------- box_time_t GetCurrentBoxTime() { - #ifdef HAVE_GETTIMEOFDAY - struct timeval tv; - if (gettimeofday(&tv, NULL) != 0) - { - BOX_LOG_SYS_ERROR("Failed to gettimeofday(), " - "dropping precision"); - } - else - { - box_time_t timeNow = (tv.tv_sec * MICRO_SEC_IN_SEC_LL) - + tv.tv_usec; - return timeNow; - } - #endif - +#ifdef HAVE_GETTIMEOFDAY + struct timeval tv; + if (gettimeofday(&tv, NULL) != 0) + { + BOX_LOG_SYS_ERROR("Failed to gettimeofday(), " + "dropping precision"); + } + else + { + box_time_t time_now = (tv.tv_sec * MICRO_SEC_IN_SEC_LL) + tv.tv_usec; + return time_now; + } +#elif WIN32 + // There's no Win32 API function that returns the current time as a UNIX timestamp with + // sub-second precision. So we use time(0) and add the fractional part from + // GetSystemTime() in the hope that the difference between these two (if any) is a whole + // number of seconds. + box_time_t time_now = SecondsToBoxTime(time(0)); + SYSTEMTIME system_time; + GetSystemTime(&system_time); + time_now += MilliSecondsToBoxTime(system_time.wMilliseconds); + return time_now; +#endif + return SecondsToBoxTime(time(0)); } diff --git a/lib/common/DebugMemLeakFinder.cpp b/lib/common/DebugMemLeakFinder.cpp index 81e999c4..58a82c0e 100644 --- a/lib/common/DebugMemLeakFinder.cpp +++ b/lib/common/DebugMemLeakFinder.cpp @@ -15,15 +15,19 @@ #undef realloc #undef free -#ifdef HAVE_UNISTD_H - #include <unistd.h> -#endif - #include <limits.h> #include <signal.h> #include <stdio.h> #include <string.h> +#ifdef HAVE_PROCESS_H +# include <process.h> +#endif + +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif + #include <cstdlib> // for std::atexit #include <map> #include <set> diff --git a/lib/common/ExcludeList.cpp b/lib/common/ExcludeList.cpp index f101782a..3f9f69ee 100644 --- a/lib/common/ExcludeList.cpp +++ b/lib/common/ExcludeList.cpp @@ -10,9 +10,9 @@ #include "Box.h" #ifdef HAVE_REGEX_SUPPORT - #ifdef HAVE_PCREPOSIX_H + #if defined HAVE_PCREPOSIX_H #include <pcreposix.h> - #else + #elif defined HAVE_REGEX_H #include <regex.h> #endif #define EXCLUDELIST_IMPLEMENTATION_REGEX_T_DEFINED @@ -199,11 +199,9 @@ void ExcludeList::AddRegexEntries(const std::string &rEntries) { char buf[1024]; regerror(errcode, pregex, buf, sizeof(buf)); - BOX_LOG_CATEGORY(Log::ERROR, - ConfigurationVerify::VERIFY_ERROR, + THROW_EXCEPTION_MESSAGE(CommonException, BadRegularExpression, "Invalid regular expression: " << entry << ": " << buf); - THROW_EXCEPTION(CommonException, BadRegularExpression) } // Store in list of regular expressions diff --git a/lib/common/Logging.cpp b/lib/common/Logging.cpp index a0d1ec8c..0928a4d4 100644 --- a/lib/common/Logging.cpp +++ b/lib/common/Logging.cpp @@ -13,19 +13,19 @@ #include <time.h> #include <string.h> // for stderror -// c.f. http://bugs.debian.org/512510 -#include <cstdio> +#ifdef HAVE_PROCESS_H +# include <process.h> +#endif #ifdef HAVE_SYSLOG_H - #include <syslog.h> +# include <syslog.h> #endif + #ifdef HAVE_UNISTD_H - #include <unistd.h> -#endif -#ifdef WIN32 - #include <process.h> +# include <unistd.h> #endif +#include <cstdio> #include <cstring> #include <iomanip> diff --git a/lib/common/Logging.h b/lib/common/Logging.h index 01358617..3dc3e69c 100644 --- a/lib/common/Logging.h +++ b/lib/common/Logging.h @@ -295,6 +295,32 @@ class Console : public Logger static void SetShowTimeMicros(bool enabled); static void SetShowPID(bool enabled); static bool GetShowTag() { return sShowTag; } + + class SettingsGuard + { + private: + bool mShowTag; + bool mShowTime; + bool mShowTimeMicros; + bool mShowPID; + std::string mTag; + public: + SettingsGuard() + : mShowTag(Console::sShowTag), + mShowTime(Console::sShowTime), + mShowTimeMicros(Console::sShowTimeMicros), + mShowPID(Console::sShowPID), + mTag(Console::sTag) + { } + ~SettingsGuard() + { + Console::SetShowTag(mShowTag); + Console::SetShowTime(mShowTime); + Console::SetShowTimeMicros(mShowTimeMicros); + Console::SetShowPID(mShowPID); + Console::sTag = mTag; + } + }; }; // -------------------------------------------------------------------------- diff --git a/lib/common/RateLimitingStream.h b/lib/common/RateLimitingStream.h index cd9d8271..818c90af 100644 --- a/lib/common/RateLimitingStream.h +++ b/lib/common/RateLimitingStream.h @@ -33,7 +33,7 @@ public: virtual void Write(const void *pBuffer, int NBytes, int Timeout = IOStream::TimeOutInfinite) { - Write(pBuffer, NBytes, Timeout); + mrSink.Write(pBuffer, NBytes, Timeout); } virtual pos_type BytesLeftToRead() { diff --git a/lib/common/Test.h b/lib/common/Test.h index 36cd6a59..4b5cef61 100644 --- a/lib/common/Test.h +++ b/lib/common/Test.h @@ -243,12 +243,14 @@ void safe_sleep(int seconds); std::auto_ptr<Configuration> load_config_file(const std::string& config_file, const ConfigurationVerify& verify); -#ifdef _MSC_VER - // Our CMakeFiles compile tests to different executable filenames, - // e.g. test_common.exe instead of _test.exe. - #define TEST_EXECUTABLE BOX_MODULE ".exe" -#else - #define TEST_EXECUTABLE "./_test" -#endif +#ifndef TEST_EXECUTABLE +# ifdef _MSC_VER + // Our CMakeFiles compile tests to different executable filenames, + // e.g. test_common.exe instead of _test.exe. + #define TEST_EXECUTABLE BOX_MODULE ".exe" +# else + #define TEST_EXECUTABLE "./_test" +# endif +#endif // TEST_EXECUTABLE #endif // TEST__H diff --git a/lib/common/Timer.cpp b/lib/common/Timer.cpp index 6ce84b7d..4f8c989e 100644 --- a/lib/common/Timer.cpp +++ b/lib/common/Timer.cpp @@ -123,26 +123,6 @@ void Timers::Cleanup(bool throw_exception_if_not_initialised) // -------------------------------------------------------------------------- // // Function -// Name: static void Timers::AssertInitialised() -// Purpose: Throw an assertion error if timers are not ready -// NOW. It's a common mistake (for me) when writing -// tests to forget to initialise timers first. -// Created: 15/05/2014 -// -// -------------------------------------------------------------------------- - -void Timers::AssertInitialised() -{ - if (!spTimers) - { - THROW_EXCEPTION(CommonException, TimersNotInitialised); - } - ASSERT(spTimers); -} - -// -------------------------------------------------------------------------- -// -// Function // Name: static void Timers::Add(Timer&) // Purpose: Add a new timer to the set, and reschedule next wakeup // Created: 5/11/2006 @@ -151,7 +131,6 @@ void Timers::AssertInitialised() void Timers::Add(Timer& rTimer) { ASSERT(spTimers); - ASSERT(&rTimer); BOX_TRACE(TIMER_ID_OF(rTimer) " added to global queue, rescheduling"); spTimers->push_back(&rTimer); Reschedule(); @@ -168,8 +147,6 @@ void Timers::Add(Timer& rTimer) // -------------------------------------------------------------------------- void Timers::Remove(Timer& rTimer) { - ASSERT(&rTimer); - if(!spTimers) { BOX_WARNING(TIMER_ID_OF(rTimer) " was still active after " @@ -343,7 +320,6 @@ void Timers::Reschedule() // -------------------------------------------------------------------------- void Timers::SignalHandler(int unused) { - // ASSERT(spTimers); Timers::RequestReschedule(); } diff --git a/lib/common/Timer.h b/lib/common/Timer.h index 68592aaa..17233203 100644 --- a/lib/common/Timer.h +++ b/lib/common/Timer.h @@ -44,7 +44,6 @@ class Timers public: static void Init(); static void Cleanup(bool throw_exception_if_not_initialised = true); - static void AssertInitialised(); static void Add (Timer& rTimer); static void Remove(Timer& rTimer); static void RequestReschedule(); diff --git a/lib/common/Utils.cpp b/lib/common/Utils.cpp index 4325dd88..0915f29a 100644 --- a/lib/common/Utils.cpp +++ b/lib/common/Utils.cpp @@ -381,30 +381,3 @@ std::string FormatUsageLineStart(const std::string& rName, return result.str(); } -std::string BoxGetTemporaryDirectoryName() -{ -#ifdef WIN32 - // http://msdn.microsoft.com/library/default.asp? - // url=/library/en-us/fileio/fs/creating_and_using_a_temporary_file.asp - - DWORD dwRetVal; - char lpPathBuffer[1024]; - DWORD dwBufSize = sizeof(lpPathBuffer); - - // Get the temp path. - dwRetVal = GetTempPath(dwBufSize, // length of the buffer - lpPathBuffer); // buffer for path - if (dwRetVal > dwBufSize) - { - THROW_EXCEPTION(CommonException, TempDirPathTooLong) - } - - return std::string(lpPathBuffer); -#elif defined TEMP_DIRECTORY_NAME - return std::string(TEMP_DIRECTORY_NAME); -#else - #error non-static temporary directory names not supported yet -#endif -} - - diff --git a/lib/crypto/CipherBlowfish.cpp b/lib/crypto/CipherBlowfish.cpp index e16cc6ed..4c75b1de 100644 --- a/lib/crypto/CipherBlowfish.cpp +++ b/lib/crypto/CipherBlowfish.cpp @@ -206,7 +206,7 @@ void CipherBlowfish::SetupParameters(EVP_CIPHER_CTX *pCipherContext) const } // Set key #ifndef HAVE_OLD_SSL - if(EVP_CipherInit_ex(pCipherContext, NULL, NULL, (unsigned char*)mpKey, (unsigned char*)mpInitialisationVector, -1) != 1) + if(EVP_CipherInit_ex(pCipherContext, GetCipher(), NULL, (unsigned char*)mpKey, (unsigned char*)mpInitialisationVector, -1) != 1) #else if(EVP_CipherInit(pCipherContext, NULL, (unsigned char*)mKey.c_str(), (unsigned char*)mInitialisationVector, -1) != 1) #endif diff --git a/lib/crypto/CipherContext.cpp b/lib/crypto/CipherContext.cpp index fd149395..3de88c64 100644 --- a/lib/crypto/CipherContext.cpp +++ b/lib/crypto/CipherContext.cpp @@ -2,7 +2,7 @@ // // File // Name: CipherContext.cpp -// Purpose: Context for symmetric encryption / descryption +// Purpose: Context for symmetric encryption / decryption // Created: 1/12/03 // // -------------------------------------------------------------------------- @@ -50,7 +50,7 @@ CipherContext::~CipherContext() if(mInitialised) { // Clean up - EVP_CIPHER_CTX_cleanup(&ctx); + BOX_OPENSSL_CLEANUP_CTX(ctx); mInitialised = false; } #ifdef HAVE_OLD_SSL @@ -98,7 +98,7 @@ void CipherContext::Init(CipherContext::CipherFunction Function, const CipherDes // Check for bad usage if(mInitialised) { - THROW_EXCEPTION(CipherException, AlreadyInitialised) + THROW_EXCEPTION(CipherException, AlreadyInitialised); } if(Function != Decrypt && Function != Encrypt) { @@ -109,43 +109,45 @@ void CipherContext::Init(CipherContext::CipherFunction Function, const CipherDes mFunction = Function; // Initialise the cipher -#ifndef HAVE_OLD_SSL - EVP_CIPHER_CTX_init(&ctx); // no error return code, even though the docs says it does - - if(EVP_CipherInit_ex(&ctx, rDescription.GetCipher(), NULL, NULL, NULL, - (mFunction == Encrypt) ? 1 : 0) != 1) -#else +#ifdef HAVE_OLD_SSL // Use old version of init call if(EVP_CipherInit(&ctx, rDescription.GetCipher(), NULL, NULL, (mFunction == Encrypt) ? 1 : 0) != 1) +#else + BOX_OPENSSL_INIT_CTX(ctx); + + // Don't set key or IV yet, because we will modify the parameters: + if(EVP_CipherInit_ex(BOX_OPENSSL_CTX(ctx), rDescription.GetCipher(), NULL, NULL, NULL, + (mFunction == Encrypt) ? 1 : 0) != 1) #endif { THROW_EXCEPTION_MESSAGE(CipherException, EVPInitFailure, "Failed to initialise " << rDescription.GetFullName() - << "cipher: " << LogError("initialising cipher")); + << ": " << LogError("initialising cipher")); } + UsePadding(mPaddingOn); try { mCipherName = rDescription.GetFullName(); #ifndef HAVE_OLD_SSL // Let the description set up everything else - rDescription.SetupParameters(&ctx); + mpDescription = &rDescription; #else // With the old version, a copy needs to be taken first. mpDescription = rDescription.Clone(); // Mark it as not a leak, otherwise static cipher contexts // cause spurious memory leaks to be reported MEMLEAKFINDER_NOT_A_LEAK(mpDescription); - mpDescription->SetupParameters(&ctx); #endif + mpDescription->SetupParameters(BOX_OPENSSL_CTX(ctx)); } catch(...) { THROW_EXCEPTION_MESSAGE(CipherException, EVPInitFailure, - "Failed to configure " << mCipherName << " cipher: " << + "Failed to configure " << mCipherName << ": " << LogError("configuring cipher")); - EVP_CIPHER_CTX_cleanup(&ctx); + BOX_OPENSSL_CLEANUP_CTX(ctx); throw; } @@ -166,7 +168,7 @@ void CipherContext::Reset() if(mInitialised) { // Clean up - EVP_CIPHER_CTX_cleanup(&ctx); + EVP_CIPHER_CTX_cleanup(BOX_OPENSSL_CTX(ctx)); mInitialised = false; } #ifdef HAVE_OLD_SSL @@ -177,6 +179,7 @@ void CipherContext::Reset() } #endif mWithinTransform = false; + mIV.clear(); } @@ -192,24 +195,22 @@ void CipherContext::Begin() { if(!mInitialised) { - THROW_EXCEPTION(CipherException, NotInitialised) + THROW_EXCEPTION(CipherException, NotInitialised); } - // Warn if in a transformation (not an error, because a context might not have been finalised if an exception occured) if(mWithinTransform) { - BOX_WARNING("CipherContext::Begin called when context " - "flagged as within a transform"); + THROW_EXCEPTION(CipherException, AlreadyInTransform); } - // Initialise the cipher context again - if(EVP_CipherInit(&ctx, NULL, NULL, NULL, -1) != 1) + if(EVP_CipherInit_ex(BOX_OPENSSL_CTX(ctx), NULL, NULL, NULL, + (const unsigned char *)(mIV.size() > 0 ? mIV.c_str() : NULL), + -1) != 1) { THROW_EXCEPTION_MESSAGE(CipherException, EVPInitFailure, - "Failed to reset " << mCipherName << " cipher: " << - LogError("resetting cipher")); + "Failed to set IV for " << mCipherName << ": " << LogError(GetFunction())); } - + // Mark as being within a transform mWithinTransform = true; } @@ -251,18 +252,18 @@ int CipherContext::Transform(void *pOutBuffer, int OutLength, const void *pInBuf } // Check output buffer size - if(OutLength < (InLength + EVP_CIPHER_CTX_block_size(&ctx))) + if(OutLength < (InLength + EVP_CIPHER_CTX_block_size(BOX_OPENSSL_CTX(ctx)))) { THROW_EXCEPTION(CipherException, OutputBufferTooSmall); } // Do the transform int outLength = OutLength; - if(EVP_CipherUpdate(&ctx, (unsigned char*)pOutBuffer, &outLength, (unsigned char*)pInBuffer, InLength) != 1) + if(EVP_CipherUpdate(BOX_OPENSSL_CTX(ctx), (unsigned char*)pOutBuffer, &outLength, + (unsigned char*)pInBuffer, InLength) != 1) { THROW_EXCEPTION_MESSAGE(CipherException, EVPUpdateFailure, - "Failed to " << GetFunction() << " (update) " << - mCipherName << " cipher: " << LogError(GetFunction())); + "Failed to update " << mCipherName << ": " << LogError(GetFunction())); } return outLength; @@ -300,7 +301,7 @@ int CipherContext::Final(void *pOutBuffer, int OutLength) } // Check output buffer size - if(OutLength < (2 * EVP_CIPHER_CTX_block_size(&ctx))) + if(OutLength < (2 * EVP_CIPHER_CTX_block_size(BOX_OPENSSL_CTX(ctx)))) { THROW_EXCEPTION(CipherException, OutputBufferTooSmall); } @@ -308,12 +309,11 @@ int CipherContext::Final(void *pOutBuffer, int OutLength) // Do the transform int outLength = OutLength; #ifndef HAVE_OLD_SSL - if(EVP_CipherFinal(&ctx, (unsigned char*)pOutBuffer, &outLength) != 1) + if(EVP_CipherFinal(BOX_OPENSSL_CTX(ctx), (unsigned char*)pOutBuffer, &outLength) != 1) { mWithinTransform = false; THROW_EXCEPTION_MESSAGE(CipherException, EVPFinalFailure, - "Failed to " << GetFunction() << " (final) " << - mCipherName << " cipher: " << LogError(GetFunction())); + "Failed to finalise " << mCipherName << ": " << LogError(GetFunction())); } #else OldOpenSSLFinal((unsigned char*)pOutBuffer, outLength); @@ -340,11 +340,11 @@ void CipherContext::OldOpenSSLFinal(unsigned char *Buffer, int &rOutLengthOut) // Old version needs to use a different form, and then set up the cipher again for next time around int outLength = rOutLengthOut; // Have to emulate padding off... - int blockSize = EVP_CIPHER_CTX_block_size(&ctx); + int blockSize = EVP_CIPHER_CTX_block_size(ctx); if(mPaddingOn) { // Just use normal final call - if(EVP_CipherFinal(&ctx, Buffer, &outLength) != 1) + if(EVP_CipherFinal(ctx, Buffer, &outLength) != 1) { THROW_EXCEPTION(CipherException, EVPFinalFailure) } @@ -357,13 +357,13 @@ void CipherContext::OldOpenSSLFinal(unsigned char *Buffer, int &rOutLengthOut) { // NASTY -- fiddling around with internals like this is bad. // But only way to get this working on old versions of OpenSSL. - if(!EVP_EncryptUpdate(&ctx,Buffer,&outLength,ctx.buf,0) + if(!EVP_EncryptUpdate(ctx,Buffer,&outLength,ctx.buf,0) || outLength != blockSize) { THROW_EXCEPTION(CipherException, EVPFinalFailure) } // Clean up - EVP_CIPHER_CTX_cleanup(&ctx); + EVP_CIPHER_CTX_free(ctx); } else { @@ -391,12 +391,14 @@ void CipherContext::OldOpenSSLFinal(unsigned char *Buffer, int &rOutLengthOut) } } // Reinitialise the cipher for the next time around - if(EVP_CipherInit(&ctx, mpDescription->GetCipher(), NULL, NULL, + if(EVP_CipherInit_ex(&ctx, mpDescription->GetCipher(), NULL, NULL, + (const unsigned char *)(mIV.size() > 0 ? mIV.c_str() : NULL), (mFunction == Encrypt) ? 1 : 0) != 1) { THROW_EXCEPTION(CipherException, EVPInitFailure) } mpDescription->SetupParameters(&ctx); + UsePadding(mPaddingOn); // Update length for caller rOutLengthOut = outLength; @@ -421,7 +423,7 @@ int CipherContext::InSizeForOutBufferSize(int OutLength) // Strictly speaking, the *2 is unnecessary. However... // Final() is paranoid, and requires two input blocks of space to work. - return OutLength - (EVP_CIPHER_CTX_block_size(&ctx) * 2); + return OutLength - (EVP_CIPHER_CTX_block_size(BOX_OPENSSL_CTX(ctx)) * 2); } // -------------------------------------------------------------------------- @@ -442,7 +444,7 @@ int CipherContext::MaxOutSizeForInBufferSize(int InLength) // Final() is paranoid, and requires two input blocks of space to work, and so we need to add // three blocks on to be absolutely sure. - return InLength + (EVP_CIPHER_CTX_block_size(&ctx) * 3); + return InLength + (EVP_CIPHER_CTX_block_size(BOX_OPENSSL_CTX(ctx)) * 3); } @@ -456,20 +458,8 @@ int CipherContext::MaxOutSizeForInBufferSize(int InLength) // -------------------------------------------------------------------------- int CipherContext::TransformBlock(void *pOutBuffer, int OutLength, const void *pInBuffer, int InLength) { - if(!mInitialised) - { - THROW_EXCEPTION(CipherException, NotInitialised) - } - - // Warn if in a transformation - if(mWithinTransform) - { - BOX_WARNING("CipherContext::TransformBlock called when " - "context flagged as within a transform"); - } - // Check output buffer size - if(OutLength < (InLength + EVP_CIPHER_CTX_block_size(&ctx))) + if(OutLength < (InLength + EVP_CIPHER_CTX_block_size(BOX_OPENSSL_CTX(ctx)))) { // Check if padding is off, in which case the buffer can be smaller if(!mPaddingOn && OutLength <= InLength) @@ -481,40 +471,36 @@ int CipherContext::TransformBlock(void *pOutBuffer, int OutLength, const void *p THROW_EXCEPTION(CipherException, OutputBufferTooSmall); } } - - // Initialise the cipher context again - if(EVP_CipherInit(&ctx, NULL, NULL, NULL, -1) != 1) - { - THROW_EXCEPTION(CipherException, EVPInitFailure) - } + + Begin(); // Do the entire block - int outLength = 0; + int output_space_used = OutLength; // Update - outLength = OutLength; - if(EVP_CipherUpdate(&ctx, (unsigned char*)pOutBuffer, &outLength, (unsigned char*)pInBuffer, InLength) != 1) + if(EVP_CipherUpdate(BOX_OPENSSL_CTX(ctx), (unsigned char*)pOutBuffer, &output_space_used, + (unsigned char*)pInBuffer, InLength) != 1) { THROW_EXCEPTION_MESSAGE(CipherException, EVPUpdateFailure, - "Failed to " << GetFunction() << " (update) " << - mCipherName << " cipher: " << LogError(GetFunction())); + "Failed to update " << mCipherName << ": " << LogError(GetFunction())); } // Finalise - int outLength2 = OutLength - outLength; -#ifndef HAVE_OLD_SSL - if(EVP_CipherFinal(&ctx, ((unsigned char*)pOutBuffer) + outLength, &outLength2) != 1) + int output_space_remain = OutLength - output_space_used; + +#ifdef HAVE_OLD_SSL + OldOpenSSLFinal(((unsigned char*)pOutBuffer) + output_space_used, output_space_remain); +#else + if(EVP_CipherFinal(BOX_OPENSSL_CTX(ctx), ((unsigned char*)pOutBuffer) + output_space_used, + &output_space_remain) != 1) { THROW_EXCEPTION_MESSAGE(CipherException, EVPFinalFailure, - "Failed to " << GetFunction() << " (final) " << - mCipherName << " cipher: " << LogError(GetFunction())); + "Failed to finalise " << mCipherName << ": " << LogError(GetFunction())); } -#else - OldOpenSSLFinal(((unsigned char*)pOutBuffer) + outLength, outLength2); #endif - outLength += outLength2; - return outLength; + mWithinTransform = false; + return output_space_used + output_space_remain; } @@ -533,7 +519,7 @@ int CipherContext::GetIVLength() THROW_EXCEPTION(CipherException, NotInitialised) } - return EVP_CIPHER_CTX_iv_length(&ctx); + return EVP_CIPHER_CTX_iv_length(BOX_OPENSSL_CTX(ctx)); } @@ -559,12 +545,14 @@ void CipherContext::SetIV(const void *pIV) "flagged as within a transform"); } + mIV = std::string((const char *)pIV, GetIVLength()); + // Set IV - if(EVP_CipherInit(&ctx, NULL, NULL, (unsigned char *)pIV, -1) != 1) + if(EVP_CipherInit_ex(BOX_OPENSSL_CTX(ctx), NULL, NULL, NULL, + (const unsigned char *)mIV.c_str(), -1) != 1) { THROW_EXCEPTION_MESSAGE(CipherException, EVPInitFailure, - "Failed to " << GetFunction() << " (set IV) " << - mCipherName << " cipher: " << LogError(GetFunction())); + "Failed to set IV for " << mCipherName << ": " << LogError(GetFunction())); } #ifdef HAVE_OLD_SSL @@ -601,19 +589,20 @@ const void *CipherContext::SetRandomIV(int &rLengthOut) } // Get length of IV - unsigned int ivLen = EVP_CIPHER_CTX_iv_length(&ctx); - if(ivLen > sizeof(mGeneratedIV)) + uint8_t generated_iv[CIPHERCONTEXT_MAX_GENERATED_IV_LENGTH]; + unsigned int ivLen = EVP_CIPHER_CTX_iv_length(BOX_OPENSSL_CTX(ctx)); + if(ivLen > sizeof(generated_iv)) { THROW_EXCEPTION(CipherException, IVSizeImplementationLimitExceeded) } // Generate some random data - Random::Generate(mGeneratedIV, ivLen); - SetIV(mGeneratedIV); + Random::Generate(generated_iv, ivLen); + SetIV(generated_iv); // Return the IV and it's length rLengthOut = ivLen; - return mGeneratedIV; + return mIV.c_str(); } @@ -628,9 +617,11 @@ const void *CipherContext::SetRandomIV(int &rLengthOut) void CipherContext::UsePadding(bool Padding) { #ifndef HAVE_OLD_SSL - if(EVP_CIPHER_CTX_set_padding(&ctx, Padding) != 1) + if(EVP_CIPHER_CTX_set_padding(BOX_OPENSSL_CTX(ctx), Padding) != 1) { - THROW_EXCEPTION(CipherException, EVPSetPaddingFailure) + THROW_EXCEPTION_MESSAGE(CipherException, EVPSetPaddingFailure, + "Failed to set padding for " << mCipherName << ": " << + LogError(GetFunction())); } #endif mPaddingOn = Padding; diff --git a/lib/crypto/CipherContext.h b/lib/crypto/CipherContext.h index 93c889d6..b6e97b4e 100644 --- a/lib/crypto/CipherContext.h +++ b/lib/crypto/CipherContext.h @@ -19,6 +19,22 @@ class CipherDescription; #define CIPHERCONTEXT_MAX_GENERATED_IV_LENGTH 32 +// Macros to allow compatibility with OpenSSL 1.0 and 1.1 APIs. See +// https://github.com/charybdis-ircd/charybdis/blob/release/3.5/libratbox/src/openssl_ratbox.h +// for the gory details. +#if defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER >= 0x10100000L) // OpenSSL >= 1.1 +# define BOX_OPENSSL_INIT_CTX(ctx) ctx = EVP_CIPHER_CTX_new(); +# define BOX_OPENSSL_CTX(ctx) ctx +# define BOX_OPENSSL_CLEANUP_CTX(ctx) EVP_CIPHER_CTX_free(ctx) +typedef EVP_CIPHER_CTX* BOX_EVP_CIPHER_CTX; +#else // OpenSSL < 1.1 +# define BOX_OPENSSL_INIT_CTX(ctx) EVP_CIPHER_CTX_init(&ctx); // no error return code, even though the docs says it does +# define BOX_OPENSSL_CTX(ctx) &ctx +# define BOX_OPENSSL_CLEANUP_CTX(ctx) EVP_CIPHER_CTX_cleanup(&ctx) +typedef EVP_CIPHER_CTX BOX_EVP_CIPHER_CTX; +#endif + + // -------------------------------------------------------------------------- // // Class @@ -74,16 +90,14 @@ public: #endif private: - EVP_CIPHER_CTX ctx; + BOX_EVP_CIPHER_CTX ctx; bool mInitialised; bool mWithinTransform; bool mPaddingOn; - uint8_t mGeneratedIV[CIPHERCONTEXT_MAX_GENERATED_IV_LENGTH]; CipherFunction mFunction; std::string mCipherName; -#ifdef HAVE_OLD_SSL - CipherDescription *mpDescription; -#endif + const CipherDescription *mpDescription; + std::string mIV; }; diff --git a/lib/crypto/CipherException.txt b/lib/crypto/CipherException.txt index abdbac87..494ed3cc 100644 --- a/lib/crypto/CipherException.txt +++ b/lib/crypto/CipherException.txt @@ -16,3 +16,4 @@ PseudoRandNotAvailable 12 EVPSetPaddingFailure 13 RandomInitFailed 14 Failed to read from random device LengthRequestedTooLongForRandomHex 15 +AlreadyInTransform 16 Tried to initialise crypto when already in a transform diff --git a/lib/crypto/Random.cpp b/lib/crypto/Random.cpp index 1d6a07f0..c34a6eea 100644 --- a/lib/crypto/Random.cpp +++ b/lib/crypto/Random.cpp @@ -50,7 +50,7 @@ void Random::Initialise() // -------------------------------------------------------------------------- void Random::Generate(void *pOutput, int Length) { - if(RAND_pseudo_bytes((uint8_t*)pOutput, Length) == -1) + if(RAND_bytes((uint8_t*)pOutput, Length) == -1) { THROW_EXCEPTION(CipherException, PseudoRandNotAvailable) } diff --git a/lib/httpserver/cdecode.cpp b/lib/httpserver/cdecode.cpp index e632f182..11c59d62 100644 --- a/lib/httpserver/cdecode.cpp +++ b/lib/httpserver/cdecode.cpp @@ -12,7 +12,7 @@ extern "C" int base64_decode_value(char value_in) { - static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51}; + static signed const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51}; static const char decoding_size = sizeof(decoding); value_in -= 43; if (value_in < 0 || value_in > decoding_size) return -1; diff --git a/lib/intercept/intercept.cpp b/lib/intercept/intercept.cpp index 88ea0d6e..72bd8d4e 100644 --- a/lib/intercept/intercept.cpp +++ b/lib/intercept/intercept.cpp @@ -242,6 +242,10 @@ extern "C" int open(const char *path, int flags, ...) #endif // DEFINE_ONLY_OPEN64 { + // Some newer architectures don't have an open() syscall, but use openat() instead. + // In these cases we will need to call sys_openat() instead of sys_open(). + // https://chromium.googlesource.com/linux-syscall-support/ + if(intercept_count > 0) { if(intercept_filename != NULL && @@ -264,6 +268,8 @@ extern "C" int #ifdef PLATFORM_NO_SYSCALL int r = TEST_open(path, flags, mode); +#elif HAVE_DECL_SYS_OPENAT && !HAVE_DECL_SYS_OPEN + int r = syscall(SYS_openat, AT_FDCWD, path, flags, mode); #else int r = syscall(SYS_open, path, flags, mode); #endif @@ -389,7 +395,7 @@ lseek(int fildes, off_t offset, int whence) #else #ifdef HAVE_LSEEK_DUMMY_PARAM off_t r = syscall(SYS_lseek, fildes, 0 /* extra 0 required here! */, offset, whence); - #elif defined(_FILE_OFFSET_BITS) + #elif defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 32 // Don't bother trying to call SYS__llseek on 32 bit since it is // fiddly and not needed for the tests off_t r = syscall(SYS_lseek, fildes, (uint32_t)offset, whence); diff --git a/lib/intercept/intercept.h b/lib/intercept/intercept.h index c0d61638..4de5f9f2 100644 --- a/lib/intercept/intercept.h +++ b/lib/intercept/intercept.h @@ -62,5 +62,14 @@ void intercept_setup_stat_post_hook (lstat_post_hook_t hookfn); void intercept_clear_setup(); +// Some newer architectures don't have an open() syscall, but use openat() instead. +// In these cases we define SYS_open (which is otherwise undefined) to equal SYS_openat +// (which is defined) so that everywhere else we can call intercept_setup_error(SYS_open) +// without caring about the difference. +// https://chromium.googlesource.com/linux-syscall-support/ +#if !HAVE_DECL_SYS_OPEN && HAVE_DECL_SYS_OPENAT +# define SYS_open SYS_openat +#endif + #endif // !PLATFORM_CLIB_FNS_INTERCEPTION_IMPOSSIBLE #endif // !INTERCEPT_H diff --git a/lib/server/Daemon.cpp b/lib/server/Daemon.cpp index 836948bf..d3c8441f 100644 --- a/lib/server/Daemon.cpp +++ b/lib/server/Daemon.cpp @@ -9,16 +9,20 @@ #include "Box.h" -#ifdef HAVE_UNISTD_H - #include <unistd.h> -#endif - #include <errno.h> #include <stdio.h> #include <signal.h> #include <string.h> #include <stdarg.h> +#ifdef HAVE_PROCESS_H +# include <process.h> +#endif + +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif + #ifdef HAVE_BSD_UNISTD_H #include <bsd/unistd.h> #endif @@ -26,7 +30,6 @@ #ifdef WIN32 #include <Strsafe.h> #include <ws2tcpip.h> - #include <process.h> #endif #include "depot.h" diff --git a/lib/server/TLSContext.cpp b/lib/server/TLSContext.cpp index 35e254fd..1a6d4a53 100644 --- a/lib/server/TLSContext.cpp +++ b/lib/server/TLSContext.cpp @@ -23,6 +23,17 @@ #define MAX_VERIFICATION_DEPTH 2 #define CIPHER_LIST "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH" +// Macros to allow compatibility with OpenSSL 1.0 and 1.1 APIs. See +// https://github.com/charybdis-ircd/charybdis/blob/release/3.5/libratbox/src/openssl_ratbox.h +// for the gory details. +#if defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER >= 0x10100000L) // OpenSSL >= 1.1 +# define BOX_TLS_SERVER_METHOD TLS_server_method +# define BOX_TLS_CLIENT_METHOD TLS_client_method +#else // OpenSSL < 1.1 +# define BOX_TLS_SERVER_METHOD TLSv1_server_method +# define BOX_TLS_CLIENT_METHOD TLSv1_client_method +#endif + // -------------------------------------------------------------------------- // // Function @@ -67,7 +78,7 @@ void TLSContext::Initialise(bool AsServer, const char *CertificatesFile, const c ::SSL_CTX_free(mpContext); } - mpContext = ::SSL_CTX_new(AsServer?TLSv1_server_method():TLSv1_client_method()); + mpContext = ::SSL_CTX_new(AsServer ? BOX_TLS_SERVER_METHOD() : BOX_TLS_CLIENT_METHOD()); if(mpContext == NULL) { THROW_EXCEPTION(ServerException, TLSAllocationFailed) diff --git a/lib/server/TcpNice.cpp b/lib/server/TcpNice.cpp index 40e7a6b5..79e91eeb 100644 --- a/lib/server/TcpNice.cpp +++ b/lib/server/TcpNice.cpp @@ -146,7 +146,7 @@ void NiceSocketStream::Write(const void *pBuffer, int NBytes) int socket = mapSocket->GetSocketHandle(); int rtt = 50; // WAG -# if HAVE_DECL_SOL_TCP && HAVE_DECL_TCP_INFO && HAVE_STRUCT_TCP_INFO_TCPI_RTT +# if HAVE_DECL_SOL_TCP && defined HAVE_STRUCT_TCP_INFO_TCPI_RTT struct tcp_info info; socklen_t optlen = sizeof(info); if(getsockopt(socket, SOL_TCP, TCP_INFO, &info, &optlen) == -1) @@ -164,7 +164,7 @@ void NiceSocketStream::Write(const void *pBuffer, int NBytes) { rtt = info.tcpi_rtt; } -# endif +# endif // HAVE_DECL_SOL_TCP && defined HAVE_STRUCT_TCP_INFO_TCPI_RTT int newWindow = mTcpNice.GetNextWindowSize(mBytesWrittenThisPeriod, elapsed, rtt); diff --git a/lib/win32/bsd_getopt.h b/lib/win32/bsd_getopt.h index 9cfdd32e..3e2441ca 100755 --- a/lib/win32/bsd_getopt.h +++ b/lib/win32/bsd_getopt.h @@ -1,105 +1,105 @@ -/* $OpenBSD: getopt.h,v 1.1 2002/12/03 20:24:29 millert Exp $ */
-/* $NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $ */
-
-/*-
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dieter Baron and Thomas Klausner.
- *
- * 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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#ifndef REPLACE_GETOPT
-#error You must include box_getopt.h, not bsd_getopt.h
-#endif
-
-#if REPLACE_GETOPT // defined in box_getopt.h; until end of file
-
-#ifndef _GETOPT_H_
-#define _GETOPT_H_
-
-// copied from: http://www.la.utexas.edu/lab/software/devtool/gnu/libtool/C_header_files.html
-
-/* __BEGIN_DECLS should be used at the beginning of your declarations,
- so that C++ compilers don't mangle their names. Use __END_DECLS at
- the end of C declarations. */
-#undef __BEGIN_DECLS
-#undef __END_DECLS
-#ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
-#else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
-#endif
-
-/*
- * GNU-like getopt_long() and 4.4BSD getsubopt()/optreset extensions
- */
-#define no_argument 0
-#define required_argument 1
-#define optional_argument 2
-
-struct option {
- /* name of long option */
- const char *name;
- /*
- * one of no_argument, required_argument, and optional_argument:
- * whether option takes an argument
- */
- int has_arg;
- /* if not NULL, set *flag to val when option found */
- int *flag;
- /* if flag not NULL, value to set *flag to; else return value */
- int val;
-};
-
-__BEGIN_DECLS
-int getopt_long(int, char * const *, const char *,
- const struct option *, int *);
-int getopt_long_only(int, char * const *, const char *,
- const struct option *, int *);
-#ifndef _GETOPT_DEFINED_
-#define _GETOPT_DEFINED_
-int getopt(int, char * const *, const char *);
-int getsubopt(char **, char * const *, char **);
-
-extern char *optarg; /* getopt(3) external variables */
-extern int opterr;
-extern int optind;
-extern int optopt;
-extern int optreset;
-extern char *suboptarg; /* getsubopt(3) external variable */
-#endif
-__END_DECLS
-
-#endif /* !_GETOPT_H_ */
-#endif // REPLACE_GETOPT
+/* $OpenBSD: getopt.h,v 1.1 2002/12/03 20:24:29 millert Exp $ */ +/* $NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $ */ + +/*- + * Copyright (c) 2000 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Dieter Baron and Thomas Klausner. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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. + */ + +#ifndef REPLACE_GETOPT +#error You must include box_getopt.h, not bsd_getopt.h +#endif + +#if REPLACE_GETOPT // defined in box_getopt.h; until end of file + +#ifndef _GETOPT_H_ +#define _GETOPT_H_ + +// copied from: http://www.la.utexas.edu/lab/software/devtool/gnu/libtool/C_header_files.html + +/* __BEGIN_DECLS should be used at the beginning of your declarations, + so that C++ compilers don't mangle their names. Use __END_DECLS at + the end of C declarations. */ +#undef __BEGIN_DECLS +#undef __END_DECLS +#ifdef __cplusplus +# define __BEGIN_DECLS extern "C" { +# define __END_DECLS } +#else +# define __BEGIN_DECLS /* empty */ +# define __END_DECLS /* empty */ +#endif + +/* + * GNU-like getopt_long() and 4.4BSD getsubopt()/optreset extensions + */ +#define no_argument 0 +#define required_argument 1 +#define optional_argument 2 + +struct option { + /* name of long option */ + const char *name; + /* + * one of no_argument, required_argument, and optional_argument: + * whether option takes an argument + */ + int has_arg; + /* if not NULL, set *flag to val when option found */ + int *flag; + /* if flag not NULL, value to set *flag to; else return value */ + int val; +}; + +__BEGIN_DECLS +int getopt_long(int, char * const *, const char *, + const struct option *, int *); +int getopt_long_only(int, char * const *, const char *, + const struct option *, int *); +#ifndef _GETOPT_DEFINED_ +#define _GETOPT_DEFINED_ +int getopt(int, char * const *, const char *); +int getsubopt(char **, char * const *, char **); + +extern char *optarg; /* getopt(3) external variables */ +extern int opterr; +extern int optind; +extern int optopt; +extern int optreset; +extern char *suboptarg; /* getsubopt(3) external variable */ +#endif +__END_DECLS + +#endif /* !_GETOPT_H_ */ +#endif // REPLACE_GETOPT diff --git a/lib/win32/emu.cpp b/lib/win32/emu.cpp index c78fe6b2..1f6392d5 100644 --- a/lib/win32/emu.cpp +++ b/lib/win32/emu.cpp @@ -1313,7 +1313,7 @@ int poll (struct pollfd *ufds, unsigned long nfds, int timeout) BOOL AddEventSource ( - LPTSTR pszSrcName, // event source name + const std::string& name, // event source name DWORD dwNum // number of categories ) { @@ -1335,7 +1335,7 @@ BOOL AddEventSource std::string regkey("SYSTEM\\CurrentControlSet\\Services\\EventLog\\" "Application\\"); - regkey += pszSrcName; + regkey += name; HKEY hk; DWORD dwDisp; @@ -1448,10 +1448,7 @@ void openlog(const char * daemonName, int, int) gSyslogH = INVALID_HANDLE_VALUE; } - char* name = strdup(nameStr.c_str()); - BOOL success = AddEventSource(name, 0); - free(name); - + BOOL success = AddEventSource(nameStr, 0); if (!success) { ::syslog(LOG_ERR, "Failed to add our own event source"); diff --git a/lib/win32/emu.h b/lib/win32/emu.h index b8539bb6..91793004 100644 --- a/lib/win32/emu.h +++ b/lib/win32/emu.h @@ -18,7 +18,9 @@ #define EMU_INCLUDE // Need feature detection macros below -#ifdef _MSC_VER +#if defined BOX_CMAKE +# include "../common/BoxConfig.cmake.h" +#elif defined _MSC_VER # include "../common/BoxConfig-MSVC.h" # define NEED_BOX_VERSION_H #else @@ -39,8 +41,14 @@ #ifndef __MINGW32__ typedef unsigned int mode_t; typedef unsigned int pid_t; + typedef unsigned int uid_t; + typedef unsigned int gid_t; #endif +// Disable Windows' non-standard implementation of min() and max(): +// http://stackoverflow.com/a/5004874/648162 +#define NOMINMAX + // Windows headers #include <winsock2.h> diff --git a/lib/win32/messages.h b/lib/win32/messages.h index 6959591b..22290226 100755 --- a/lib/win32/messages.h +++ b/lib/win32/messages.h @@ -1,57 +1,57 @@ - // Message source file, to be compiled to a resource file with
- // Microsoft Message Compiler (MC), to an object file with a Resource
- // Compiler, and linked into the application.
-
- // The main reason for this file is to work around Windows' stupid
- // messages in the Event Log, which say:
-
- // The description for Event ID ( 4 ) in Source ( Box Backup (bbackupd) )
- // cannot be found. The local computer may not have the necessary
- // registry information or message DLL files to display messages from a
- // remote computer. The following information is part of the event:
- // Message definitions follow
-//
-// Values are 32 bit values layed out as follows:
-//
-// 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
-// 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-// +---+-+-+-----------------------+-------------------------------+
-// |Sev|C|R| Facility | Code |
-// +---+-+-+-----------------------+-------------------------------+
-//
-// where
-//
-// Sev - is the severity code
-//
-// 00 - Success
-// 01 - Informational
-// 10 - Warning
-// 11 - Error
-//
-// C - is the Customer code flag
-//
-// R - is a reserved bit
-//
-// Facility - is the facility code
-//
-// Code - is the facility's status code
-//
-//
-// Define the facility codes
-//
-
-
-//
-// Define the severity codes
-//
-
-
-//
-// MessageId: MSG_ERR
-//
-// MessageText:
-//
-// %1
-//
-#define MSG_ERR ((DWORD)0x40000001L)
-
+ // Message source file, to be compiled to a resource file with + // Microsoft Message Compiler (MC), to an object file with a Resource + // Compiler, and linked into the application. + + // The main reason for this file is to work around Windows' stupid + // messages in the Event Log, which say: + + // The description for Event ID ( 4 ) in Source ( Box Backup (bbackupd) ) + // cannot be found. The local computer may not have the necessary + // registry information or message DLL files to display messages from a + // remote computer. The following information is part of the event: + // Message definitions follow +// +// Values are 32 bit values layed out as follows: +// +// 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 +// 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 +// +---+-+-+-----------------------+-------------------------------+ +// |Sev|C|R| Facility | Code | +// +---+-+-+-----------------------+-------------------------------+ +// +// where +// +// Sev - is the severity code +// +// 00 - Success +// 01 - Informational +// 10 - Warning +// 11 - Error +// +// C - is the Customer code flag +// +// R - is a reserved bit +// +// Facility - is the facility code +// +// Code - is the facility's status code +// +// +// Define the facility codes +// + + +// +// Define the severity codes +// + + +// +// MessageId: MSG_ERR +// +// MessageText: +// +// %1 +// +#define MSG_ERR ((DWORD)0x40000001L) + diff --git a/modules.txt b/modules.txt index 71ae16fd..4fd27a2d 100644 --- a/modules.txt +++ b/modules.txt @@ -7,15 +7,20 @@ # -l libaries must be in the order they should appear on the command line. # Note that order is important on platforms which do not have shared libraries. +# QDBM is currently built from a copy distributed in-tree, which we need to fix. +qdbm + # Generic support code and modules -lib/raidfile -lib/crypto +lib/win32 +lib/common lib/win32 +lib/raidfile lib/common +lib/crypto lib/common lib/server qdbm lib/crypto -lib/compress -lib/intercept +lib/compress lib/common +lib/intercept lib/common -test/common qdbm +test/common qdbm lib/common test/crypto qdbm lib/crypto test/compress qdbm lib/compress test/raidfile qdbm lib/raidfile lib/intercept @@ -38,11 +43,11 @@ bin/bbackupd lib/bbackupd bin/bbackupquery lib/bbackupquery bin/bbackupctl lib/backupclient qdbm lib/bbackupd -test/backupstore bin/bbstored bin/bbstoreaccounts lib/server lib/backupstore lib/backupclient lib/raidfile +test/backupstore bin/bbstored bin/bbstoreaccounts lib/backupclient lib/raidfile test/backupstorefix bin/bbstored bin/bbstoreaccounts lib/backupclient bin/bbackupquery bin/bbackupd bin/bbackupctl test/backupstorepatch bin/bbstored bin/bbstoreaccounts lib/backupclient test/backupdiff lib/backupclient -test/bbackupd bin/bbackupd bin/bbstored bin/bbstoreaccounts bin/bbackupquery bin/bbackupctl lib/bbackupquery lib/bbackupd lib/server lib/backupstore lib/backupclient lib/intercept lib/bbstored +test/bbackupd bin/bbackupd bin/bbstored bin/bbstoreaccounts bin/bbackupquery bin/bbackupctl lib/bbackupquery lib/bbackupd lib/bbstored lib/server lib/intercept bin/s3simulator lib/httpserver test/s3store lib/backupclient lib/httpserver bin/s3simulator bin/bbstoreaccounts diff --git a/parcels.txt b/parcels.txt index 474c576b..7f961b10 100644 --- a/parcels.txt +++ b/parcels.txt @@ -18,8 +18,6 @@ backup-client html bbackupd-config html bbackupd.conf - subdir qdbm libqdbm.a - EXCEPT:mingw32,mingw32msvc man bbackupd.8 man bbackupquery.8 diff --git a/runtest.pl.in b/runtest.pl.in index 2ab60963..a864336b 100755 --- a/runtest.pl.in +++ b/runtest.pl.in @@ -3,24 +3,44 @@ use strict; use warnings; +use Cwd; use File::Basename; use Getopt::Std; chdir(dirname($0)); -use lib dirname($0).'/infrastructure'; +my $base_dir = getcwd(); +use lib dirname($0)."/infrastructure"; use BoxPlatform; -my $prepare_only = 0; -my $verbose_build = 0; -our ($opt_n, $opt_v); -getopts('nv'); +my %opts; +getopts('acnv', \%opts); # Don't actually run the test, just prepare for it. -$prepare_only = $opt_n; -$verbose_build = $opt_v; +my $cmake_build = $opts{'c'}; +my $prepare_only = $opts{'n'}; +my $verbose_build = $opts{'v'}; +my $appveyor_mode = $opts{'a'}; + +my $test_name = shift @ARGV; +my $test_mode = shift @ARGV; +my $test_src_exe; +my $test_dst_exe; + +if($cmake_build) +{ + # To support different build environments (Windows/MSVC and Linux/Makefile) which + # place compiled executables in different locations, we need to accept the name of + # the compiled test executable as an additional command-line parameter. + die "test name is required in cmake mode" unless $test_name; + die "test mode is required in cmake mode" unless $test_mode; + die "only a single test name is supported in cmake mode" if $test_name =~ /,/; + $test_src_exe = shift @ARGV; + die "test project source executable path is required in cmake mode" unless $test_src_exe; + $test_dst_exe = shift @ARGV; + die "test project destination executable name is required in cmake mode" unless $test_dst_exe; +} -my ($test_name,$test_mode) = @ARGV; $test_mode = 'debug' if not defined $test_mode or $test_mode eq ''; $test_mode = lc($test_mode); @@ -52,7 +72,7 @@ if($test_name ne 'ALL') } else { - runtest($test_name); + runtest($test_name, $test_src_exe, $test_dst_exe); } } else @@ -107,47 +127,68 @@ __E exit $exit_code; +sub appveyor_test_status +{ + my ($test_name, $status, $duration, $message, $stdout) = @_; + + if(!$appveyor_mode) + { + return; + } + + # Assume that the test was already "Added" by CMakeLists.txt. + my $cmdline = "appveyor UpdateTest -Name $test_name -Framework Custom ". + "-FileName \"\" -Outcome $status"; + if(defined $duration) + { + $cmdline .= " -Duration ".($duration * 1000); + } + + if($message) + { + $cmdline .= " -ErrorMessage \"$message\""; + } + + if(system($cmdline)) + { + warn "AppVeyor test command failed: $cmdline"; + } + else + { + print "Notified: $cmdline\n"; + } +} + sub runtest { - my ($t) = @_; + my ($t, $test_src_exe, $test_dst_exe) = @_; # Attempt to make this test. my $flag = ($test_mode eq 'release')?(BoxPlatform::make_flag('RELEASE')):''; - my ($make_res, $test_project_exe); + my $make_res; + my $test_dst_dir = "$test_mode/test/$t"; + my $start_time = time(); - if($target_msvc) + if($cmake_build) { - $test_project_exe = "test_$t"; - # Assume that MSVC projects are built with CMake, so we can use - # MSBuild to run the tests. - my $test_src_dir = "test\\$t"; - my $test_dst_dir = "$test_mode\\test\\$t"; - my $quiet = $verbose_build ? "" : "/consoleloggerparameters:ErrorsOnly"; + appveyor_test_status($t, "Running", 0); + + # Test executables have a different name on Windows to work around + # restrictions on running different executables with the same name. + my $test_src_dir = "test/$t"; my @commands = ( - "msbuild /nologo $quiet ". - "infrastructure\\cmake\\build\\INSTALL.vcxproj", - "xcopy /s /i /y /q $test_src_dir $test_dst_dir", - "copy infrastructure\\cmake\\build\\$test_mode\\$test_project_exe.exe $test_dst_dir" + "cmake -E remove_directory $test_dst_dir", + "cmake -E copy_directory $test_src_dir $test_dst_dir", + "cmake -E copy $test_src_exe $test_dst_dir/$test_dst_exe", + # We could do a "make install" here, to ensure that everything + # is up to date, but it's really slow, verbose and wasteful: + # "cmake --build infrastructure/cmake/build --target install", ); - if(-d $test_dst_dir) - { - unshift @commands, "rd /s /q $test_dst_dir"; - } - - foreach my $command (@commands) - { - $make_res = system($command); - if ($make_res != 0) - { - push @results, "$t: make failed: $command"; - last; - } - } - - # Windows doesn't support testextra files either, so fake it. - if ($make_res == 0 and -r "$test_src_dir/testextra") + # Our CMake buildsystem doesn't do anything to support testextra files + # (Makfile syntax), so fake it. + if (-r "$test_src_dir/testextra") { open EXTRA, "$test_src_dir/testextra" or die "$test_src_dir/testextra: $!"; @@ -156,29 +197,17 @@ sub runtest chomp $line; if ($line =~ m/^mkdir (.*)/) { - mkdir("$test_dst_dir/$1") - or die "$test_dst_dir/$1: $!"; + push @commands, "cmake -E make_directory $test_dst_dir/$1"; } elsif ($line =~ m/^rm -rf (.*)/) { - if(-d "$test_dst_dir\\$1") - { - my $cmd = "rd /s/q $test_dst_dir\\$1"; - my $status = system($cmd); - $status == 0 or die "$cmd: failed with ". - "status $status"; - } + push @commands, "cmake -E remove_directory $test_dst_dir/$1"; } - elsif ($line =~ m/^cp (.*) (.*)/) + elsif ($line =~ m/^cp (.*)\*\.\* (.*)/) { my ($src, $dst) = ($1, $2); - $src =~ s|/|\\|g; - $dst =~ s|/|\\|g; - my $cmd = "xcopy /s /i /y /q ". - "$test_dst_dir\\$src $test_dst_dir\\$dst"; - my $status = system($cmd); - $status == 0 or die "$cmd: failed with ". - "status $status"; + push @commands, "cmake -E copy_directory ". + "$test_dst_dir/$src $test_dst_dir/$dst"; } else { @@ -187,16 +216,31 @@ sub runtest } } } + + foreach my $command (@commands) + { + $make_res = system($command); + if ($make_res != 0) + { + push @results, "$t: pre-test command failed: $command"; + appveyor_test_status($t, "NotRunnable", time() - $start_time, + "pre-test command failed: $command"); + last; + } + } } else { my $quiet = $verbose_build ? "VERBOSE=1" : ""; $make_res = system("cd test/$t && $make_command $quiet $flag"); + $test_dst_exe = "_test$platform_exe_ext"; } if($make_res != 0) { push @results,"$t: make failed"; + appveyor_test_status($t, "NotRunnable", time() - $start_time, + "pre-test commands failed"); $exit_code = 2; return; } @@ -206,17 +250,21 @@ sub runtest if($prepare_only) { + appveyor_test_status($t, "Skipped", time() - $start_time, + "we are only preparing this test"); return; } # run it - if($target_msvc) + if($cmake_build) { - # no tee.exe, so let's do it ourselves. + # no tee.exe on Windows, so let's do it ourselves. open LOG, ">$logfile" or die "$logfile: $!"; - chdir("$test_mode/test/$t"); - open TEE, "$test_project_exe.exe |" - or die "$test_project_exe.exe: $!"; + chdir("$base_dir/$test_mode/test/$t"); + + open TEE, "$test_dst_exe |" + or die "$test_dst_dir/$test_dst_exe: $!"; + while (my $line = <TEE>) { print $line; @@ -224,11 +272,12 @@ sub runtest } close LOG; close TEE; - chdir("../../.."); + chdir($base_dir); } else { - $test_res = system("cd $test_mode/test/$t ; ./t 2>&1 " . + chdir($base_dir); + $test_res = system("cd $test_mode/test/$t ; sh t 2>&1 " . "| tee ../../../$logfile"); } @@ -242,19 +291,38 @@ sub runtest } close RESULTS; - chomp $last; - $last =~ s/\r//; - push @results, "$t: $last"; - - if ($last ne "PASSED") - { + if(!defined $last) + { + push @results, "$t: test produced no output"; + appveyor_test_status($t, "Failed", time() - $start_time, + "test produced no output"); $exit_code = 1; } + else + { + chomp $last; + $last =~ s/\r//; + push @results, "$t: $last"; + + if ($last ne "PASSED") + { + $exit_code = 1; + appveyor_test_status($t, "Failed", time() - $start_time, + "test ended with: $last"); + } + else + { + appveyor_test_status($t, "Passed", time() - $start_time); + } + } } else { + my $cwd = getcwd(); push @results, - "$t: failed to open test log file: $logfile: $!"; + "$t: failed to open test log file: $logfile: $! (in $cwd)"; + appveyor_test_status($t, "Inconclusive", time() - $start_time, + "failed to open test log file: $logfile: $!"); } # delete test results diff --git a/test/backupstorefix/testbackupstorefix.cpp b/test/backupstorefix/testbackupstorefix.cpp index 8e0a2720..38492bd1 100644 --- a/test/backupstorefix/testbackupstorefix.cpp +++ b/test/backupstorefix/testbackupstorefix.cpp @@ -19,6 +19,7 @@ #include "Test.h" #include "BackupClientCryptoKeys.h" #include "BackupProtocol.h" +#include "BackupStoreAccounts.h" #include "BackupStoreCheck.h" #include "BackupStoreConstants.h" #include "BackupStoreDirectory.h" @@ -716,7 +717,15 @@ int test(int argc, const char *argv[]) // Temporarily stop the server, so it doesn't repair the refcount error. Except // on win32, where hard-killing the server can leave a lockfile in place, // breaking the rest of the test. -#ifndef WIN32 +#ifdef WIN32 + // Wait for the server to finish housekeeping first, by getting a lock on + // the account. + std::auto_ptr<BackupStoreAccountDatabase> apAccounts( + BackupStoreAccountDatabase::Read("testfiles/accounts.txt")); + BackupStoreAccounts acc(*apAccounts); + NamedLock lock; + acc.LockAccount(0x1234567, lock); +#else TEST_THAT(StopServer()); #endif @@ -768,47 +777,15 @@ int test(int argc, const char *argv[]) f.Commit(true /* write now! */); } -#ifndef BOX_RELEASE_BUILD - // Delete two of the three raidfiles and their parent - // directories. This used to crash bbstoreaccounts check. - // We can only do this, without destroying the entire store, - // in debug mode, where the store has a far deeper - // structure. - // This will destroy or damage objects 18-1b and 58-5b, - // some repairably. - TEST_THAT(rename("testfiles/0_0/backup/01234567/02/01/o00.rf", - "testfiles/0_0/backup/01234567/02/01/o00.rfw") == 0); // 0x18 - TEST_THAT(rename("testfiles/0_1/backup/01234567/02/01/o01.rf", - "testfiles/0_1/backup/01234567/02/01/o01.rfw") == 0); // 0x19 - //RUN("mv testfiles/0_2/backup/01234567/02/01/o02.rf " - // "testfiles/0_0/backup/01234567/02/01/o02.rfw"); // 0x1a - TEST_THAT(rename("testfiles/0_0/backup/01234567/02/01/o03.rf", - "testfiles/0_0/backup/01234567/02/01/o03.rfw") == 0); // 0x1b - TEST_THAT(rename("testfiles/0_0/backup/01234567/02/01/01/o00.rf", - "testfiles/0_0/backup/01234567/02/01/01/o00.rfw") == 0); // 0x58 - TEST_THAT(rename("testfiles/0_1/backup/01234567/02/01/01/o01.rf", - "testfiles/0_1/backup/01234567/02/01/01/o01.rfw") == 0); // 0x59 - //RUN("mv testfiles/0_2/backup/01234567/02/01/01/o02.rf " - // "testfiles/0_0/backup/01234567/02/01/01/o02.rfw"); // 0x5a - TEST_THAT(rename("testfiles/0_0/backup/01234567/02/01/01/o03.rf", - "testfiles/0_0/backup/01234567/02/01/01/o03.rfw") == 0); // 0x5b - // RUN("rm -r testfiles/0_1/backup/01234567/02/01"); - -# define RUN(x) TEST_THAT(system(x) == 0); -# ifdef WIN32 - RUN("rd /s/q testfiles\\0_2\\backup\\01234567\\02\\01"); -# else // !WIN32 - RUN("rm -r testfiles/0_2/backup/01234567/02/01"); -# endif // WIN32 -# undef RUN -#endif // !BOX_RELEASE_BUILD - // Fix it // ERROR: Object 0x44 is unattached. // ERROR: BlocksUsed changed from 284 to 282 // ERROR: BlocksInCurrentFiles changed from 228 to 226 // ERROR: NumCurrentFiles changed from 114 to 113 // WARNING: Reference count of object 0x44 changed from 1 to 0 +#ifdef WIN32 + lock.ReleaseLock(); +#endif TEST_EQUAL(5, check_account_for_errors()); { std::auto_ptr<BackupProtocolAccountUsage2> usage = @@ -841,25 +818,6 @@ int test(int argc, const char *argv[]) // file, so checking for AsRaid excludes this possibility. RaidFileController &rcontroller(RaidFileController::GetController()); RaidFileDiscSet rdiscSet(rcontroller.GetDiscSet(discSetNum)); - -#ifndef BOX_RELEASE_BUILD // Only if we destroyed these particular files, above. - TEST_EQUAL(RaidFileUtil::AsRaid, RaidFileUtil::RaidFileExists( - rdiscSet, "backup/01234567/02/01/o00")); - TEST_EQUAL(RaidFileUtil::AsRaid, RaidFileUtil::RaidFileExists( - rdiscSet, "backup/01234567/02/01/o01")); - TEST_EQUAL(RaidFileUtil::AsRaid, RaidFileUtil::RaidFileExists( - rdiscSet, "backup/01234567/02/01/o02")); - TEST_EQUAL(RaidFileUtil::AsRaid, RaidFileUtil::RaidFileExists( - rdiscSet, "backup/01234567/02/01/o03")); - TEST_EQUAL(RaidFileUtil::AsRaid, RaidFileUtil::RaidFileExists( - rdiscSet, "backup/01234567/02/01/01/o00")); - TEST_EQUAL(RaidFileUtil::AsRaid, RaidFileUtil::RaidFileExists( - rdiscSet, "backup/01234567/02/01/01/o01")); - TEST_EQUAL(RaidFileUtil::AsRaid, RaidFileUtil::RaidFileExists( - rdiscSet, "backup/01234567/02/01/01/o02")); - TEST_EQUAL(RaidFileUtil::AsRaid, RaidFileUtil::RaidFileExists( - rdiscSet, "backup/01234567/02/01/01/o03")); -#endif } // ------------------------------------------------------------------------------------------------ diff --git a/test/backupstorepatch/testbackupstorepatch.cpp b/test/backupstorepatch/testbackupstorepatch.cpp index e149a041..46f278ad 100644 --- a/test/backupstorepatch/testbackupstorepatch.cpp +++ b/test/backupstorepatch/testbackupstorepatch.cpp @@ -610,10 +610,13 @@ int test(int argc, const char *argv[]) writedir.Commit(true); } + // Get the revision number of the root directory, before housekeeping makes any changes. + int64_t first_revision = 0; + RaidFileRead::FileExists(0, "backup/01234567/o01", &first_revision); + #ifdef WIN32 - // Cannot signal bbstored to do housekeeping now, - // so just wait until we're sure it's done - wait_for_operation(12, "housekeeping to run"); + // Cannot signal bbstored to do housekeeping now, and we don't need to, as we will + // wait up to 32 seconds and detect automatically when it has finished. #else // Send the server a restart signal, so it does // housekeeping immediately, and wait for it to happen @@ -622,10 +625,8 @@ int test(int argc, const char *argv[]) ::kill(pid, SIGHUP); #endif - // Get the revision number of the info file - int64_t first_revision = 0; - RaidFileRead::FileExists(0, "backup/01234567/o01", &first_revision); - for(int l = 0; l < 32; ++l) + // Wait for changes to be written back to the root directory. + for(int secs_remaining = 32; secs_remaining >= 0; secs_remaining--) { // Sleep a while, and print a dot ::sleep(1); @@ -633,7 +634,7 @@ int test(int argc, const char *argv[]) ::fflush(stdout); // Early end? - if(l > 2) + if(!TestFileExists("testfiles/0_0/backup/01234567/write.lock")) { int64_t revid = 0; RaidFileRead::FileExists(0, "backup/01234567/o01", &revid); @@ -642,6 +643,8 @@ int test(int argc, const char *argv[]) break; } } + + TEST_LINE(secs_remaining != 0, "No changes detected to root directory after 32 seconds"); } ::printf("\n"); diff --git a/test/basicserver/Makefile.extra b/test/basicserver/Makefile.extra index e6a4675e..4b21d37d 100644 --- a/test/basicserver/Makefile.extra +++ b/test/basicserver/Makefile.extra @@ -1,12 +1,12 @@ MAKEPROTOCOL = ../../lib/server/makeprotocol.pl -GEN_CMD = $(MAKEPROTOCOL) testprotocol.txt +GEN_CMD = $(MAKEPROTOCOL) TestProtocol.txt # AUTOGEN SEEDING -autogen_TestProtocol.cpp: $(MAKEPROTOCOL) testprotocol.txt +autogen_TestProtocol.cpp: $(MAKEPROTOCOL) TestProtocol.txt $(_PERL) $(GEN_CMD) -autogen_TestProtocolServer.h: $(MAKEPROTOCOL) testprotocol.txt +autogen_TestProtocolServer.h: $(MAKEPROTOCOL) TestProtocol.txt $(_PERL) $(GEN_CMD) diff --git a/test/basicserver/testprotocol.txt b/test/basicserver/TestProtocol.txt index 5bca9f49..5bca9f49 100644 --- a/test/basicserver/testprotocol.txt +++ b/test/basicserver/TestProtocol.txt diff --git a/test/basicserver/testbasicserver.cpp b/test/basicserver/testbasicserver.cpp index 6a1e15ad..6f2def54 100644 --- a/test/basicserver/testbasicserver.cpp +++ b/test/basicserver/testbasicserver.cpp @@ -35,7 +35,10 @@ // in ms #define COMMS_READ_TIMEOUT 4 #define COMMS_SERVER_WAIT_BEFORE_REPLYING 40 -#define SHORT_TIMEOUT 5000 +// Use a longer timeout to give Srv2TestConversations time to write 20 MB to each of +// three child processes before starting to read it back again, without the children +// timing out and aborting. +#define SHORT_TIMEOUT 30000 class basicdaemon : public Daemon { @@ -103,6 +106,12 @@ void testservers_connection(SocketStream &rStream) } if(line == "LARGEDATA") { + // This part of the test is timing-sensitive, because we write + // 20 MB to the test and then have to wait while it reads 20 MB + // from the other two children before writing anything back to us. + // We could timeout waiting for it to talk to us again. So we + // increased the SHORT_TIMEOUT from 5 seconds to 30 to allow + // more time. { // Send lots of data char data[LARGE_DATA_BLOCK_SIZE]; @@ -339,6 +348,11 @@ void Srv2TestConversations(const std::vector<IOStream *> &conns) { conns[c]->Write("LARGEDATA\n", 10, SHORT_TIMEOUT); } + // This part of the test is timing-sensitive, because we read 20 MB from each of + // three daemon processes, then write 20 MB to each of them, then read back + // another 20 MB from each of them. Each child could timeout waiting for us to + // read from it, or write to it, while we're servicing another child. So we + // increased the SHORT_TIMEOUT from 5 seconds to 30 to allow enough time. for(unsigned int c = 0; c < conns.size(); ++c) { // Receive lots of data diff --git a/test/bbackupd/testbbackupd.cpp b/test/bbackupd/testbbackupd.cpp index dd50b862..cc602f22 100644 --- a/test/bbackupd/testbbackupd.cpp +++ b/test/bbackupd/testbbackupd.cpp @@ -361,8 +361,8 @@ bool configure_bbackupd(BackupDaemon& bbackupd, const std::string& config_file) // Stop bbackupd initialisation from changing the console logging level // and the program name tag. Logger& console(Logging::GetConsole()); - Logger::LevelGuard guard(console, console.GetLevel()); - Logging::Tagger(); + Logger::LevelGuard undo_log_level_change(console, console.GetLevel()); + Logging::Tagger undo_program_name_change; std::vector<std::string> args; size_t last_arg_start = 0; @@ -2277,9 +2277,8 @@ bool test_read_only_dirs_can_be_restored() { { #ifdef WIN32 - // Cygwin chmod changes Windows file attributes - TEST_THAT(::system("chmod 0555 testfiles/" - "TestDir1/x1") == 0); + TEST_THAT(::system("attrib +r testfiles\\TestDir1\\x1") + == 0); #else TEST_THAT(chmod("testfiles/TestDir1/x1", 0555) == 0); @@ -2303,12 +2302,12 @@ bool test_read_only_dirs_can_be_restored() // put the permissions back to sensible values #ifdef WIN32 - TEST_THAT(::system("chmod 0755 testfiles/" - "TestDir1/x1") == 0); - TEST_THAT(::system("chmod 0755 testfiles/" - "restore1/x1") == 0); - TEST_THAT(::system("chmod 0755 testfiles/" - "restore-test/Test1/x1") == 0); + TEST_THAT(::system("attrib -r testfiles\\TestDir1\\x1") + == 0); + TEST_THAT(::system("attrib -r testfiles\\restore1\\x1") + == 0); + TEST_THAT(::system("attrib -r testfiles\\restore-test\\" + "Test1\\x1") == 0); #else TEST_THAT(chmod("testfiles/TestDir1/x1", 0755) == 0); @@ -2723,9 +2722,6 @@ bool test_store_error_reporting() // TODO FIXME dedent { - // Check that store errors are reported neatly - TEST_THAT(system("rm -f testfiles/notifyran.backup-error.*") == 0); - // Break the store. We need a write lock on the account // while we do this, otherwise housekeeping might be running // and might rewrite the info files when it finishes, @@ -3146,11 +3142,11 @@ bool test_upload_very_old_files() { // in the archive, it's read only #ifdef WIN32 - TEST_THAT(::system("chmod 0777 testfiles" - "/TestDir1/sub23/rand.h") == 0); + TEST_THAT(::system("attrib -r " + "testfiles\\TestDir\\sub23\\rand.h") == 0); #else - TEST_THAT(chmod("testfiles/TestDir1/sub23" - "/rand.h", 0777) == 0); + TEST_THAT(chmod("testfiles/TestDir1/sub23/rand.h", + 0777) == 0); #endif FILE *f = fopen("testfiles/TestDir1/sub23/rand.h", @@ -3393,7 +3389,7 @@ bool test_delete_dir_change_attribute() #endif // Change attributes on an existing file. #ifdef WIN32 - TEST_EQUAL(0, system("chmod 0423 testfiles/TestDir1/df9834.dsf")); + TEST_EQUAL(0, system("attrib +r testfiles\\TestDir1\\df9834.dsf")); #else TEST_THAT(::chmod("testfiles/TestDir1/df9834.dsf", 0423) == 0); #endif @@ -3578,8 +3574,14 @@ bool test_sync_new_files() // OpenBSD's tar interprets the "-m" option quite differently: // it sets the time to epoch zero (1 Jan 1970) instead of the // current time, which doesn't help us. So reset the timestamp - // on a file with the touch command, so it won't be backed up. - TEST_RETURN(::system("touch testfiles/TestDir1/chsh"), 0); + // on a file by touching it, so it won't be backed up. + { +#ifndef WIN32 + TEST_THAT(chmod("testfiles/TestDir1/chsh", 0755) == 0); +#endif + FileStream fs("testfiles/TestDir1/chsh", O_WRONLY); + fs.Write("a", 1); + } // At least one file is too new to be backed up on the first run. bbackupd.RunSyncNow(); @@ -3673,6 +3675,7 @@ bool test_changing_client_store_marker_pauses_daemon() box_time_t sync_start_time = GetCurrentBoxTime(); sync_and_wait(); box_time_t sync_time = GetCurrentBoxTime() - sync_start_time; + BOX_INFO("Sync takes " << BOX_FORMAT_MICROSECONDS(sync_time)); // Time how long a compare takes. On NetBSD it's 3 seconds, and that // interferes with test timing unless we account for it. @@ -3680,7 +3683,7 @@ bool test_changing_client_store_marker_pauses_daemon() // There should be no differences right now (yet). TEST_COMPARE(Compare_Same); box_time_t compare_time = GetCurrentBoxTime() - compare_start_time; - BOX_TRACE("Compare takes " << BOX_FORMAT_MICROSECONDS(compare_time)); + BOX_INFO("Compare takes " << BOX_FORMAT_MICROSECONDS(compare_time)); // Wait for the end of another sync, to give us ~3 seconds to change // the client store marker. @@ -3746,35 +3749,35 @@ bool test_changing_client_store_marker_pauses_daemon() // Test that there *are* differences still, i.e. that bbackupd // didn't successfully run a backup during that time. - BOX_TRACE("Compare starting, expecting differences"); + BOX_INFO("Compare starting, expecting differences"); TEST_COMPARE(Compare_Different); BOX_TRACE("Compare finished, expected differences"); // Wait out the expected delay in bbackupd. This is quite // time-sensitive, so we use sub-second precision. - box_time_t wait = + box_time_t wait = SecondsToBoxTime(BACKUP_ERROR_DELAY_SHORTENED - 1) - compare_time * 2; - BOX_TRACE("Waiting for " << BOX_FORMAT_MICROSECONDS(wait) << - " (plus another compare taking " << - BOX_FORMAT_MICROSECONDS(compare_time) << ") until " - "just before bbackupd recovers"); + BOX_INFO("Waiting for " << BOX_FORMAT_MICROSECONDS(wait) << " " + "until just before bbackupd recovers"); ShortSleep(wait, true); // bbackupd should not have recovered yet, so there should // still be differences. - BOX_TRACE("Compare starting, expecting differences"); + BOX_INFO("Compare starting, expecting differences"); TEST_COMPARE(Compare_Different); BOX_TRACE("Compare finished, expected differences"); - // Now wait for it to recover and finish a sync, and check - // that the differences are gone (successful backup). - wait = sync_time + SecondsToBoxTime(2); - BOX_TRACE("Waiting for " << BOX_FORMAT_MICROSECONDS(wait) << + // Now wait for it to recover and finish a sync, and check that + // the differences are gone (successful backup). Wait until ~2 + // seconds after we expect the sync to have finished, to reduce + // the risk of random failure on AppVeyor when heavily loaded. + wait = sync_time + SecondsToBoxTime(6); + BOX_INFO("Waiting for " << BOX_FORMAT_MICROSECONDS(wait) << " until just after bbackupd recovers and finishes a sync"); ShortSleep(wait, true); - BOX_TRACE("Compare starting, expecting no differences"); + BOX_INFO("Compare starting, expecting no differences"); TEST_COMPARE(Compare_Same); BOX_TRACE("Compare finished, expected no differences"); } diff --git a/test/common/testcommon.cpp b/test/common/testcommon.cpp index fbdf8d9c..cba40fe7 100644 --- a/test/common/testcommon.cpp +++ b/test/common/testcommon.cpp @@ -312,16 +312,19 @@ int test(int argc, const char *argv[]) // Check that using timer methods without initialisation // throws an assertion failure. Can only do this in debug mode #ifndef BOX_RELEASE_BUILD - TEST_CHECK_THROWS(Timers::Add(*(Timer*)NULL), - CommonException, AssertFailed); - TEST_CHECK_THROWS(Timers::Remove(*(Timer*)NULL), - CommonException, AssertFailed); - #endif - - // TEST_CHECK_THROWS(Timers::Signal(), CommonException, AssertFailed); - #ifndef BOX_RELEASE_BUILD + { TEST_CHECK_THROWS(Timers::Cleanup(), CommonException, AssertFailed); + + Timer tim(0, "tim"); + TEST_CHECK_THROWS(Timers::Add(tim), CommonException, AssertFailed); + Timers::Remove(tim); + + TEST_CHECK_THROWS(Timer t1(900, "t1"), CommonException, + AssertFailed); + + // TEST_CHECK_THROWS(Timers::Signal(), CommonException, AssertFailed); + } #endif // Check that we can initialise the timers @@ -344,47 +347,60 @@ int test(int argc, const char *argv[]) Timers::Init(); - Timer t0(0, "t0"); // should never expire - Timer t1(1000, "t1"); - Timer t2(2000, "t2"); - Timer t3(3000, "t3"); - - TEST_THAT(!t0.HasExpired()); - TEST_THAT(!t1.HasExpired()); - TEST_THAT(!t2.HasExpired()); - TEST_THAT(!t3.HasExpired()); - - safe_sleep(1); - TEST_THAT(!t0.HasExpired()); - TEST_THAT(t1.HasExpired()); - TEST_THAT(!t2.HasExpired()); - TEST_THAT(!t3.HasExpired()); - - safe_sleep(1); - TEST_THAT(!t0.HasExpired()); - TEST_THAT(t1.HasExpired()); - TEST_THAT(t2.HasExpired()); - TEST_THAT(!t3.HasExpired()); - - // Try both ways of resetting an existing timer. - t1 = Timer(1000, "t1a"); - t2.Reset(2000); - TEST_THAT(!t0.HasExpired()); - TEST_THAT(!t1.HasExpired()); - TEST_THAT(!t2.HasExpired()); - TEST_THAT(!t3.HasExpired()); - - safe_sleep(1); - TEST_THAT(!t0.HasExpired()); - TEST_THAT(t1.HasExpired()); - TEST_THAT(!t2.HasExpired()); - TEST_THAT(t3.HasExpired()); - - safe_sleep(1); - TEST_THAT(!t0.HasExpired()); - TEST_THAT(t1.HasExpired()); - TEST_THAT(t2.HasExpired()); - TEST_THAT(t3.HasExpired()); + // Ideally timers would be perfectly accurate and we could sleep for 1.0 seconds, but + // on OSX in particular they could fire 50-100 ms late (I've seen 4 ms in practice) + // and we don't want the tests to fail because of this, because we don't really need + // that kind of precision in practice. So we reduce the timer intervals by 100ms to + // be safe. + + { + Logger::LevelGuard temporary_verbosity(Logging::GetConsole(), Log::TRACE); + Console::SettingsGuard save_old_settings; + Console::SetShowTime(true); + Console::SetShowTimeMicros(true); + + Timer t0(0, "t0"); // should never expire + Timer t1(900, "t1"); + Timer t2(1900, "t2"); + Timer t3(2900, "t3"); + + TEST_THAT(!t0.HasExpired()); + TEST_THAT(!t1.HasExpired()); + TEST_THAT(!t2.HasExpired()); + TEST_THAT(!t3.HasExpired()); + safe_sleep(1); + + TEST_THAT(!t0.HasExpired()); + TEST_THAT(t1.HasExpired()); + TEST_THAT(!t2.HasExpired()); + TEST_THAT(!t3.HasExpired()); + + safe_sleep(1); + TEST_THAT(!t0.HasExpired()); + TEST_THAT(t1.HasExpired()); + TEST_THAT(t2.HasExpired()); + TEST_THAT(!t3.HasExpired()); + + // Try both ways of resetting an existing timer. + t1 = Timer(900, "t1a"); + t2.Reset(1900); + TEST_THAT(!t0.HasExpired()); + TEST_THAT(!t1.HasExpired()); + TEST_THAT(!t2.HasExpired()); + TEST_THAT(!t3.HasExpired()); + + safe_sleep(1); + TEST_THAT(!t0.HasExpired()); + TEST_THAT(t1.HasExpired()); + TEST_THAT(!t2.HasExpired()); + TEST_THAT(t3.HasExpired()); + + safe_sleep(1); + TEST_THAT(!t0.HasExpired()); + TEST_THAT(t1.HasExpired()); + TEST_THAT(t2.HasExpired()); + TEST_THAT(t3.HasExpired()); + } // Leave timers initialised for rest of test. // Test main() will cleanup after test finishes. diff --git a/test/crypto/testcrypto.cpp b/test/crypto/testcrypto.cpp index 4e623cc2..32d2efb8 100644 --- a/test/crypto/testcrypto.cpp +++ b/test/crypto/testcrypto.cpp @@ -266,7 +266,7 @@ int test(int argc, const char *argv[]) // Check rolling checksums uint8_t *checkdata_blk = (uint8_t *)malloc(CHECKSUM_DATA_SIZE); uint8_t *checkdata = checkdata_blk; - RAND_pseudo_bytes(checkdata, CHECKSUM_DATA_SIZE); + RAND_bytes(checkdata, CHECKSUM_DATA_SIZE); for(int size = CHECKSUM_BLOCK_SIZE_BASE; size <= CHECKSUM_BLOCK_SIZE_LAST; ++size) { // Test skip-roll code diff --git a/test/httpserver/testfiles/httpserver.conf b/test/httpserver/testfiles/httpserver.conf index 1a1c4644..d8c72a3f 100644 --- a/test/httpserver/testfiles/httpserver.conf +++ b/test/httpserver/testfiles/httpserver.conf @@ -1,5 +1,6 @@ - -AddressPrefix = http://localhost:1080 +# Use 127.0.0.1 instead of localhost to force use of IPv4, as that is what the server +# binds to. Windows tends to use IPv6 instead if possible, breaking the test. +AddressPrefix = http://127.0.0.1:1080 Server { diff --git a/test/httpserver/testfiles/testrequests.pl b/test/httpserver/testfiles/testrequests.pl index 4dd3549f..fd4274b4 100755 --- a/test/httpserver/testfiles/testrequests.pl +++ b/test/httpserver/testfiles/testrequests.pl @@ -49,7 +49,8 @@ if($response3->code() != 200) print "Redirected GET request...\n"; my $response4 = $ua->get("$url_base/redirect?key=value"); -exit 4 unless $response4->is_success(); +die "GET ".$response4->request()->url()." failed: ".$response4->content() + unless $response4->is_success(); my $content4 = $response4->content(); @@ -112,13 +113,11 @@ sub check_url my ($c,$url) = @_; unless($c =~ m~URI:</b> (.+?)</p>~) { - print "URI not found\n"; - exit(1); + die "URI not found in response: '$c'\n"; } if($url ne $1) { - print "Wrong URI in content\n"; - exit(1); + die "Wrong URI in content: expected '$url' but found '$1'\n"; } } diff --git a/test/raidfile/testraidfile.cpp b/test/raidfile/testraidfile.cpp index c8150387..d771f23d 100644 --- a/test/raidfile/testraidfile.cpp +++ b/test/raidfile/testraidfile.cpp @@ -25,6 +25,7 @@ #include "RaidFileException.h" #include "RaidFileRead.h" #include "Guards.h" +#include "intercept.h" #include "MemLeakFindOn.h" @@ -37,14 +38,6 @@ #define TRF_CAN_INTERCEPT #endif - -#ifdef TRF_CAN_INTERCEPT -// function in intercept.cpp for setting up errors -void intercept_setup_error(const char *filename, unsigned int errorafter, int errortoreturn, int syscalltoerror); -bool intercept_triggered(); -void intercept_clear_setup(); -#endif - // Nice random data for testing written files class R250 { public: |