From 1abb97d5bb8d172c6a11ab0f6cdfbc183f8529a8 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 30 Aug 2016 22:20:48 +0100 Subject: Replace Travis build instructions with a script. Easier to run locally to help reproduce issues with Travis builds. --- infrastructure/travis-build.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 infrastructure/travis-build.sh (limited to 'infrastructure') diff --git a/infrastructure/travis-build.sh b/infrastructure/travis-build.sh new file mode 100755 index 00000000..f4cd4ef4 --- /dev/null +++ b/infrastructure/travis-build.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +set -e +set -x + +ccache -s + +cd `dirname $0`/.. +./bootstrap +./configure CC="ccache $CC" CXX="ccache $CXX" "$@" +grep CXX config.status +make V=1 +./runtest.pl ALL $TEST_TARGET + +ccache -s -- cgit v1.2.3 From 0ebfa6464b9987b5bd2a084872f7511625647391 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 30 Aug 2016 22:44:36 +0100 Subject: Merge makebuildenv.pl and makeparcels.pl, write monolithic Makefiles. This is necessary to fix compilation on machines with large numbers of cores (e.g. Travis build workers) because the build system automatically attempts maximum parallelism, and the old one is broken and tries to build multiple libraries simultaneously. The new buildsystem almost entirely avoids recursive Make: only trivial Makefiles in target directories (which invoke the top-level Makefile to build the appropriate output file) and the old docs makefile are not part of the new master Makefile. Due to higher parallelism and better dependency checking, Make should be much faster now. Not all old targets are supported though. I've removed implicit dependencies hard-coded in the build system, and expressed all dependencies in modules.txt, since the implicit dependencies were confusing, obscure and unnecessary, and it was hard to express their own dependencies on each other. Test both the default target and explicitly "parcels" for release builds on Travis. --- infrastructure/cmake/CMakeLists.txt | 14 +- infrastructure/makebuildenv.pl.in | 1032 +++++++++++++++++++++++------------ infrastructure/makeparcels.pl.in | 417 -------------- infrastructure/travis-build.sh | 6 + 4 files changed, 704 insertions(+), 765 deletions(-) delete mode 100755 infrastructure/makeparcels.pl.in (limited to 'infrastructure') diff --git a/infrastructure/cmake/CMakeLists.txt b/infrastructure/cmake/CMakeLists.txt index a9bd549f..1d28b313 100644 --- a/infrastructure/cmake/CMakeLists.txt +++ b/infrastructure/cmake/CMakeLists.txt @@ -31,7 +31,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 @@ -148,12 +147,7 @@ foreach(documentation_file ${documentation_files}) endforeach() 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) @@ -169,12 +163,6 @@ foreach(module_dep ${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))$") - else() - set(dependencies "${dependencies} lib_common") - endif() string(REGEX REPLACE "^ " "" dependencies "${dependencies}") string(REGEX REPLACE " $" "" dependencies "${dependencies}") diff --git a/infrastructure/makebuildenv.pl.in b/infrastructure/makebuildenv.pl.in index 5f1b0618..60c6d854 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,156 @@ 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 $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 ? "." : ""; + +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 includes for a file not in the +# system path) by adding it to the include path with -I. +DEFAULT_CFLAGS = \@CPPFLAGS@ $default_cflags \@CXXFLAGS_STRICT@ \\ + $extra_platform_defines $platform_compile_line_extra \\ + -DBOX_VERSION="\\"$product_version\\"" -Iqdbm +DEFAULT_CXXFLAGS = \@CPPFLAGS@ $default_cxxflags \@CXXFLAGS_STRICT@ \\ + $extra_platform_defines $platform_compile_line_extra \\ + -DBOX_VERSION="\\"$product_version\\"" +LDFLAGS += \@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 %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}; + + print $mod,": $type\n"; + # add additional files for tests if($type eq 'test') { @@ -478,9 +613,9 @@ __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 ". + writetestfile("$mod/t-gdb", "GLIBCXX_FORCE_NEW=1 ". 'gdb ./_test' . $platform_exe_ext . ' "$@"', $mod); } @@ -516,124 +651,62 @@ __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@ - -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 - - 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) - +${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 + +.PHONY: default +default: + \$(MAKE) -C ../.. \$(TARGET) __E - } + close MINI_MODULE_MAKEFILE; - # if there is a Makefile.pre, include it now - if(-e "$mod/Makefile.pre") - { - print MAKE ".include \n\n"; - } - - # read directory - opendir DIR,$mod; + opendir DIR, $mod; my @items = readdir DIR; closedir DIR; @@ -646,10 +719,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 +751,583 @@ __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/* +__E + push @all_clean_targets, "clean_${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() + { + 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() + { + 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 () + { + 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 () + { + last if m'\AEND-EXCEPT'; + } } - - $deps_makeinfo .= <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 <\n\n"; - } - if(-e "$mod/Makefile.extra.$build_os") + for(@{$parcel_contents{$parcel}}) { - print MAKE ".include \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 MAKE "\tcp parcels/scripts/install-$parcel $dir\n"; + } - while() - { - 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 <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 ; $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() - { - 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() - { - last if m/\AEND-OMIT/; - } - } - next; - } - - if (m'\AONLY:(.+)') - { - if (not os_matches($1)) - { - while () - { - last if m'\AEND-ONLY'; - } - } - next; - } - next if (m'\AEND-ONLY'); - - if (m'\AEXCEPT:(.+)') - { - if (os_matches($1)) - { - while () - { - 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 < $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 <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/travis-build.sh b/infrastructure/travis-build.sh index f4cd4ef4..aa9f62c2 100755 --- a/infrastructure/travis-build.sh +++ b/infrastructure/travis-build.sh @@ -11,5 +11,11 @@ cd `dirname $0`/.. grep CXX config.status make V=1 ./runtest.pl ALL $TEST_TARGET +# When making a release build, also check that we can build the default +# target and "parcels" (which is the same thing): +if [ "$TEST_TARGET" = "release" ]; then + make + make parcels +fi ccache -s -- cgit v1.2.3 From b60edf758b1797a901dba9c151e5cb664c76b0a6 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 1 Sep 2016 20:22:12 +0100 Subject: Standardise dependent library location for CMake. Add a CMake module to find readline libraries for us. --- infrastructure/cmake/CMakeLists.txt | 86 +++++++++++++++++++++++++-------- infrastructure/cmake/FindReadline.cmake | 84 ++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 20 deletions(-) create mode 100644 infrastructure/cmake/FindReadline.cmake (limited to 'infrastructure') diff --git a/infrastructure/cmake/CMakeLists.txt b/infrastructure/cmake/CMakeLists.txt index 1d28b313..41172296 100644 --- a/infrastructure/cmake/CMakeLists.txt +++ b/infrastructure/cmake/CMakeLists.txt @@ -242,10 +242,9 @@ foreach(module_dep ${module_deps}) endif() endforeach() -#include(ExternalProject) -#ExternalProject_Add(pcre -# PREFIX "../pcre" -# BUILD_COMMAND "${CMAKE_EXECUTABLE +# 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 $<$:-DBOX_RELEASE_BUILD>) # Tell QDBM not to build itself as a DLL, because we want to link statically to it. target_compile_definitions(qdbm PUBLIC -DQDBM_STATIC) @@ -260,27 +259,74 @@ endif(MSVC) target_link_libraries(lib_common PUBLIC ws2_32 gdi32) # Link to ZLib +# http://stackoverflow.com/a/6174604/648162 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}) +# 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() + + 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}) +find_package(OpenSSL REQUIRED) +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() # Define the location of the Perl executable, needed by testbackupstorefix cmake_to_native_path("${PERL_EXECUTABLE}" perl_executable_native) 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 +) -- cgit v1.2.3 From d8e443a8a01033589afdbca6698ea88a6a9e84f5 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 1 Sep 2016 20:46:05 +0100 Subject: Add MSVC user settings files to version control. --- infrastructure/cmake/msvc/bin_bbackupd.vcxproj.user | 8 ++++++++ infrastructure/cmake/msvc/bin_bbstored.vcxproj.user | 8 ++++++++ infrastructure/cmake/msvc/test_backupstore.vcxproj.user | 9 +++++++++ infrastructure/cmake/msvc/test_backupstorefix.vcxproj.user | 7 +++++++ infrastructure/cmake/msvc/test_bbackupd.vcxproj.user | 8 ++++++++ infrastructure/cmake/msvc/test_common.vcxproj.user | 7 +++++++ infrastructure/cmake/msvc/test_httpserver.vcxproj.user | 7 +++++++ infrastructure/cmake/msvc/test_raidfile.vcxproj.user | 7 +++++++ 8 files changed, 61 insertions(+) create mode 100755 infrastructure/cmake/msvc/bin_bbackupd.vcxproj.user create mode 100755 infrastructure/cmake/msvc/bin_bbstored.vcxproj.user create mode 100755 infrastructure/cmake/msvc/test_backupstore.vcxproj.user create mode 100755 infrastructure/cmake/msvc/test_backupstorefix.vcxproj.user create mode 100755 infrastructure/cmake/msvc/test_bbackupd.vcxproj.user create mode 100755 infrastructure/cmake/msvc/test_common.vcxproj.user create mode 100755 infrastructure/cmake/msvc/test_httpserver.vcxproj.user create mode 100755 infrastructure/cmake/msvc/test_raidfile.vcxproj.user (limited to 'infrastructure') diff --git a/infrastructure/cmake/msvc/bin_bbackupd.vcxproj.user b/infrastructure/cmake/msvc/bin_bbackupd.vcxproj.user new file mode 100755 index 00000000..51928554 --- /dev/null +++ b/infrastructure/cmake/msvc/bin_bbackupd.vcxproj.user @@ -0,0 +1,8 @@ + + + + testfiles\bbackupd.conf + $(ProjectDir)\..\..\..\debug\test\bbackupd + WindowsLocalDebugger + + \ 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..e48b8383 --- /dev/null +++ b/infrastructure/cmake/msvc/bin_bbstored.vcxproj.user @@ -0,0 +1,8 @@ + + + + testfiles/bbstored.conf + $(ProjectDir)\..\..\..\debug\test\backupstorefix + WindowsLocalDebugger + + \ 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..79ef7571 --- /dev/null +++ b/infrastructure/cmake/msvc/test_backupstore.vcxproj.user @@ -0,0 +1,9 @@ + + + + $(ProjectDir)\..\..\..\debug\test\backupstore + WindowsLocalDebugger + + + + \ 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..c0895191 --- /dev/null +++ b/infrastructure/cmake/msvc/test_backupstorefix.vcxproj.user @@ -0,0 +1,7 @@ + + + + $(ProjectDir)\..\..\..\debug\test\backupstorefix + WindowsLocalDebugger + + \ 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..9ca2b5e9 --- /dev/null +++ b/infrastructure/cmake/msvc/test_bbackupd.vcxproj.user @@ -0,0 +1,8 @@ + + + + -e test_basics + $(ProjectDir)\..\..\..\debug\test\bbackupd + WindowsLocalDebugger + + \ 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..7a375f10 --- /dev/null +++ b/infrastructure/cmake/msvc/test_common.vcxproj.user @@ -0,0 +1,7 @@ + + + + $(ProjectDir)\..\..\..\debug\test\common + WindowsLocalDebugger + + \ 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..b2da015c --- /dev/null +++ b/infrastructure/cmake/msvc/test_httpserver.vcxproj.user @@ -0,0 +1,7 @@ + + + + $(ProjectDir)\..\..\..\debug\test\httpserver + WindowsLocalDebugger + + \ 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..d2c2fc34 --- /dev/null +++ b/infrastructure/cmake/msvc/test_raidfile.vcxproj.user @@ -0,0 +1,7 @@ + + + + $(ProjectDir)\..\..\..\debug\test\raidfile + WindowsLocalDebugger + + \ No newline at end of file -- cgit v1.2.3 From 688eda8b55b57b711020148c5b048de7c06d1744 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 1 Sep 2016 20:46:19 +0100 Subject: Fix case of filenames of "text" files used to generate protocols and docs. --- infrastructure/cmake/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'infrastructure') diff --git a/infrastructure/cmake/CMakeLists.txt b/infrastructure/cmake/CMakeLists.txt index 41172296..2038b1c9 100644 --- a/infrastructure/cmake/CMakeLists.txt +++ b/infrastructure/cmake/CMakeLists.txt @@ -106,8 +106,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}) @@ -127,7 +127,7 @@ foreach(protocol_file ${protocol_files}) endforeach() set(documentation_files - lib/bbackupquery/documentation.txt + lib/bbackupquery/Documentation.txt ) foreach(documentation_file ${documentation_files}) -- cgit v1.2.3 From 84585543025b817921721ca6d173730b8393b2ac Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 2 Sep 2016 21:40:05 +0100 Subject: Update test runner to support CMake better. Add support for: * Out-of-tree builds (by passing executable name from CMake to runtest.pl) * AppVeyor test status * Cross-platform cmake (using cmake -E instead of platform-specific commands) Get CMake to install binaries needed by tests, in correct locations, with correct names. --- infrastructure/BoxPlatform.pm.in | 5 ++ infrastructure/cmake/CMakeLists.txt | 98 +++++++++++++++++++++++++++++++------ 2 files changed, 87 insertions(+), 16 deletions(-) (limited to 'infrastructure') diff --git a/infrastructure/BoxPlatform.pm.in b/infrastructure/BoxPlatform.pm.in index 8f9daa81..bdcca279 100644 --- a/infrastructure/BoxPlatform.pm.in +++ b/infrastructure/BoxPlatform.pm.in @@ -127,6 +127,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 2038b1c9..57de5039 100644 --- a/infrastructure/cmake/CMakeLists.txt +++ b/infrastructure/cmake/CMakeLists.txt @@ -55,6 +55,23 @@ 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) endforeach() @@ -173,6 +190,18 @@ foreach(module_dep ${module_deps}) message(STATUS "add executable '${module_name}': '${module_files}'") endif() add_executable(${module_name} ${module_files}) + + # Unfortunately we have to use install(PROGRAMS) instead of + # install(TARGETS) because TARGETS doesn't allow us to change + # the executable name. + install(PROGRAMS "$" + CONFIGURATIONS Debug + DESTINATION "${base_dir}/debug/${module_dir}" + RENAME "${bin_name}${CMAKE_EXECUTABLE_SUFFIX}") + install(PROGRAMS "$" + CONFIGURATIONS Release + DESTINATION "${base_dir}/release/${module_dir}" + RENAME "${bin_name}${CMAKE_EXECUTABLE_SUFFIX}") elseif(module_name MATCHES "^test_") string(REGEX MATCH "^test_(.*)" valid_test ${module_name}) set(test_name ${CMAKE_MATCH_1}) @@ -183,12 +212,62 @@ foreach(module_dep ${module_deps}) endif() string(REPLACE "TEST_NAME" ${test_name} test_main "${test_template}") - file(WRITE "${module_path}/_main.cpp" "${test_main}") + file(WRITE "${module_path}/_main.cpp.new" "${test_main}") + replace_file_if_different( + "${module_path}/_main.cpp" + "${module_path}/_main.cpp.new") add_executable(${module_name} ${module_files} "${module_path}/_main.cpp") + + if(WIN32) + install(PROGRAMS "$" + CONFIGURATIONS Debug + DESTINATION "${base_dir}/debug/${module_dir}") + install(PROGRAMS "$" + CONFIGURATIONS Release + DESTINATION "${base_dir}/release/${module_dir}") + set(test_executable "$") + else() + # Unfortunately we have to use install(PROGRAMS) instead of + # install(TARGETS) because TARGETS doesn't allow us to change + # the executable name. + install(PROGRAMS "$" + CONFIGURATIONS Debug + DESTINATION "${base_dir}/debug/${module_dir}" + RENAME "_test") + install(PROGRAMS "$" + CONFIGURATIONS Release + DESTINATION "${base_dir}/release/${module_dir}" + RENAME "_test") + set(test_executable "./_test") + endif() + + if(${APPVEYOR_MODE}) + set(appveyor_runtest_pl_switch -a) + else() + set(appveyor_runtest_pl_switch) + endif() + + target_compile_definitions(${module_name} PRIVATE + -DTEST_EXECUTABLE="${test_executable}") add_test(NAME ${test_name} - COMMAND ${PERL_EXECUTABLE} ${base_dir}/runtest.pl.in ${test_name} - $ WORKING_DIRECTORY ${base_dir}) + COMMAND ${PERL_EXECUTABLE} ${base_dir}/runtest.pl + ${appveyor_runtest_pl_switch} -c ${test_name} + $ "$" "${test_executable}" + 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} + $ "$" "${test_executable}" + WORKING_DIRECTORY ${base_dir}) elseif(module_name MATCHES "^(lib_.*|qdbm)$") if(DEBUG) message(STATUS "add library '${module_name}': '${module_files}'") @@ -198,19 +277,6 @@ foreach(module_dep ${module_deps}) 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 "$" - CONFIGURATIONS Debug - DESTINATION "${base_dir}/debug/${module_dir}" - RENAME "${bin_name}${CMAKE_EXECUTABLE_SUFFIX}") - install(FILES "$" - 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) -- cgit v1.2.3 From 756222dd41fdee629e5dc928f2ddbe3ed524f6ed Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 2 Sep 2016 23:42:42 +0100 Subject: Use ccache if available in CMake builds. --- infrastructure/cmake/CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'infrastructure') diff --git a/infrastructure/cmake/CMakeLists.txt b/infrastructure/cmake/CMakeLists.txt index 57de5039..a63f838a 100644 --- a/infrastructure/cmake/CMakeLists.txt +++ b/infrastructure/cmake/CMakeLists.txt @@ -1,4 +1,11 @@ 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() -- cgit v1.2.3 From 8c092e87b40cccc046aa4b0a215a4798548224b0 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 2 Sep 2016 23:45:13 +0100 Subject: Use builtin TO_NATIVE_PATH in CMake instead of rolling our own. --- infrastructure/cmake/CMakeLists.txt | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'infrastructure') diff --git a/infrastructure/cmake/CMakeLists.txt b/infrastructure/cmake/CMakeLists.txt index a63f838a..21d35e43 100644 --- a/infrastructure/cmake/CMakeLists.txt +++ b/infrastructure/cmake/CMakeLists.txt @@ -11,14 +11,6 @@ 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 @@ -402,6 +394,6 @@ if(READLINE_FOUND) endif() # 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}") -- cgit v1.2.3 From 0560d351665313fcdd503af213118eec46930cbe Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 2 Sep 2016 23:46:38 +0100 Subject: Skip building the parts of QDBM that we don't need with CMake. Avoids spurious compiler warnings about redefinitions of symbols in files that we don't need to link with anyway. --- infrastructure/cmake/CMakeLists.txt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'infrastructure') diff --git a/infrastructure/cmake/CMakeLists.txt b/infrastructure/cmake/CMakeLists.txt index 21d35e43..01405c6e 100644 --- a/infrastructure/cmake/CMakeLists.txt +++ b/infrastructure/cmake/CMakeLists.txt @@ -175,8 +175,17 @@ foreach(module_dep ${module_deps}) 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) + + # 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() + 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}") -- cgit v1.2.3 From c0125ee22e09a31ae291e42faa817835bd903dbc Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 3 Sep 2016 00:07:23 +0100 Subject: Update platform feature detection to work with CMake. Rewrite some macros in forms that can be parsed by our parser written in CMake language (fake m4 with regexps). Fix incorrect conditional includes and incorrect #if/#ifdef assumptions. --- infrastructure/m4/boxbackup_tests.m4 | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) (limited to 'infrastructure') diff --git a/infrastructure/m4/boxbackup_tests.m4 b/infrastructure/m4/boxbackup_tests.m4 index 09d73e04..0c1e2107 100644 --- a/infrastructure/m4/boxbackup_tests.m4 +++ b/infrastructure/m4/boxbackup_tests.m4 @@ -101,7 +101,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 +126,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 +185,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 ]]) +AC_CHECK_MEMBERS([struct stat.st_atim],,, [[#include ]]) +AC_CHECK_MEMBERS([struct stat.st_atimespec],,, [[#include ]]) +AC_CHECK_MEMBERS([struct stat.st_atim.tv_nsec],,, [[#include ]]) +AC_CHECK_MEMBERS([struct stat.st_atimensec],,, [[#include ]]) AC_CHECK_MEMBERS([struct sockaddr_in.sin_len],,, [[ #include #include @@ -206,7 +198,7 @@ AC_CHECK_MEMBERS([DIR.d_fd],,, [[#include ]]) AC_CHECK_MEMBERS([DIR.dd_fd],,, [[#include ]]) AC_CHECK_MEMBERS([struct tcp_info.tcpi_rtt],,, [[#include ]]) -AC_CHECK_DECLS([O_BINARY]) +AC_CHECK_DECLS([O_BINARY],,, [[#include ]]) AC_CHECK_DECLS([ENOTSUP],,, [[#include ]]) AC_CHECK_DECLS([INFTIM],,, [[#include ]]) @@ -285,7 +277,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 -- cgit v1.2.3 From 11a8c444875d8b7912fa07bdc3854e3adb27aa4e Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 3 Sep 2016 00:14:08 +0100 Subject: Break dependency on Cygwin commands in Windows tests. Define WIN32 properly when building with CMake, and in this case, use native commands such as attrib.exe instead of Cygwin chmod, so that users don't have to install Cygwin or msys-git. --- infrastructure/cmake/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'infrastructure') diff --git a/infrastructure/cmake/CMakeLists.txt b/infrastructure/cmake/CMakeLists.txt index 01405c6e..0838045a 100644 --- a/infrastructure/cmake/CMakeLists.txt +++ b/infrastructure/cmake/CMakeLists.txt @@ -89,6 +89,10 @@ if(NOT status EQUAL 0) "status ${status}: ${command_output}") endif() +if(WIN32) + add_definitions(-DWIN32) +endif() + # Parsing Makefile.extra files in CMake script is a pain, so the relevant rules for # code-generating Perl scripts are hard-coded here. -- cgit v1.2.3 From 98a6ad72ee819774a398440055abd87bc44e9ba0 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 3 Sep 2016 00:25:52 +0100 Subject: Fix Unix compilation using CMake. Add platform detection that's compatible with the old buildsystem and its m4 autoconfigury. Make Travis build and test using CMake as a separate target. Remove unused function BoxGetTemporaryDirectoryName() to fixes compile using CMake on Unix. --- infrastructure/cmake/CMakeLists.txt | 289 ++++++++++++++++++++++++++++++++++-- infrastructure/cmake/getversion.pl | 13 ++ infrastructure/travis-build.sh | 30 ++-- 3 files changed, 305 insertions(+), 27 deletions(-) create mode 100755 infrastructure/cmake/getversion.pl (limited to 'infrastructure') diff --git a/infrastructure/cmake/CMakeLists.txt b/infrastructure/cmake/CMakeLists.txt index 0838045a..fa364690 100644 --- a/infrastructure/cmake/CMakeLists.txt +++ b/infrastructure/cmake/CMakeLists.txt @@ -75,24 +75,31 @@ foreach(file_to_configure ${files_to_configure}) configure_file("${base_dir}/${file_to_configure}.in" "${base_dir}/${file_to_configure}" @ONLY) endforeach() -file(READ "${base_dir}/infrastructure/buildenv-testmain-template.cpp" test_template) - - +# 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/msvc/getversion.pl + COMMAND ${PERL_EXECUTABLE} ${base_dir}/infrastructure/cmake/getversion.pl + WORKING_DIRECTORY ${base_dir}/infrastructure RESULT_VARIABLE status - OUTPUT_VARIABLE command_output + OUTPUT_VARIABLE new_version_define ERROR_VARIABLE command_output) if(NOT status EQUAL 0) message(FATAL_ERROR "Failed to execute: " - "${PERL_EXECUTABLE} ${base_dir}/infrastructure/msvc/getversion.pl: " + "${PERL_EXECUTABLE} ${base_dir}/infrastructure/cmake/getversion.pl: " "status ${status}: ${command_output}") endif() +file(WRITE "${base_dir}/lib/common/BoxVersion.h.new" "${new_version_define}") +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) if(WIN32) add_definitions(-DWIN32) endif() +file(READ "${base_dir}/infrastructure/buildenv-testmain-template.cpp" test_template) + # Parsing Makefile.extra files in CMake script is a pain, so the relevant rules for # code-generating Perl scripts are hard-coded here. @@ -322,19 +329,24 @@ endforeach() # 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 $<$:-DBOX_RELEASE_BUILD>) +target_compile_definitions(lib_common PUBLIC $<$:BOX_RELEASE_BUILD>) -# Tell QDBM not to build itself as a DLL, because we want to link statically to it. -target_compile_definitions(qdbm PUBLIC -DQDBM_STATIC) +# Detect platform features and write BoxConfig.h.in. Reuse code from +# infrastructure/m4/boxbackup_tests.m4 where possible -# 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) +include(CheckIncludeFiles) +include(CheckFunctionExists) +include(CheckSymbolExists) +include(CheckLibraryExists) +include(CheckCXXSourceCompiles) -target_link_libraries(lib_common PUBLIC ws2_32 gdi32) +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() # Link to ZLib # http://stackoverflow.com/a/6174604/648162 @@ -406,6 +418,251 @@ if(READLINE_FOUND) 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 + #endif + #include + 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 + #endif + #include + 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 + #endif + + #ifdef HAVE_SYS_PARAM_H + # include + #endif + + #ifdef HAVE_SYS_UCRED_H + # include + #endif + + #ifdef HAVE_SYS_SOCKET_H + # include + #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(/wd4996 /wd4291) + set_property(TARGET qdbm PROPERTY CMAKE_STATIC_LINKER_FLAGS /IGNORE:LNK4006) +endif(MSVC) + # Define the location of the Perl executable, needed by testbackupstorefix file(TO_NATIVE_PATH "${PERL_EXECUTABLE}" perl_executable_native) string(REPLACE "\\" "\\\\" perl_path_escaped ${perl_executable_native}) diff --git a/infrastructure/cmake/getversion.pl b/infrastructure/cmake/getversion.pl new file mode 100755 index 00000000..67e1f8a5 --- /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 "#define BOX_VERSION \"$BoxPlatform::product_version\"\n"; + +exit 0; diff --git a/infrastructure/travis-build.sh b/infrastructure/travis-build.sh index aa9f62c2..72a187b3 100755 --- a/infrastructure/travis-build.sh +++ b/infrastructure/travis-build.sh @@ -5,17 +5,25 @@ set -x ccache -s -cd `dirname $0`/.. -./bootstrap -./configure CC="ccache $CC" CXX="ccache $CXX" "$@" -grep CXX config.status -make V=1 -./runtest.pl ALL $TEST_TARGET -# When making a release build, also check that we can build the default -# target and "parcels" (which is the same thing): -if [ "$TEST_TARGET" = "release" ]; then - make - make parcels +if [ "$BUILD" = 'cmake' ]; then + cd `dirname $0` + mkdir -p cmake/build + cd cmake/build + cmake --version + cmake -DCMAKE_BUILD_TYPE:STRING=$TEST_TARGET .. + make install + [ "$TEST" = "n" ] || ctest -C $TEST_TARGET -V +else + cd `dirname $0`/.. + ./bootstrap + ./configure CC="ccache $CC" CXX="ccache $CXX" "$@" + grep CXX config.status + make V=1 + ./runtest.pl ALL $TEST_TARGET + if [ "$TEST_TARGET" = "release" ]; then + make + make parcels + fi fi ccache -s -- cgit v1.2.3 From 26495a510a2533619ce68d6e3b48026c5b76d1d1 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 7 Sep 2016 22:23:43 +0100 Subject: Add clean and realclean targets to each module's mini Makefile. Remove unnecessary extra printing while configuring modules. --- infrastructure/makebuildenv.pl.in | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'infrastructure') diff --git a/infrastructure/makebuildenv.pl.in b/infrastructure/makebuildenv.pl.in index 60c6d854..e4f3b0f3 100755 --- a/infrastructure/makebuildenv.pl.in +++ b/infrastructure/makebuildenv.pl.in @@ -473,6 +473,7 @@ 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; @@ -521,8 +522,6 @@ for my $mod (@implicit_deps, @modules) my $end_target_file = $mod_end_targets{$mod}; my $target_is_library = $library_targets{$mod}; - print $mod,": $type\n"; - # add additional files for tests if($type eq 'test') { @@ -703,6 +702,14 @@ ${makefile_ifdef_prefix}endif .PHONY: default default: \$(MAKE) -C ../.. \$(TARGET) + +.PHONY: clean +clean: + \$(MAKE) -C ../.. clean_${type}_${name} + +.PHONY: realclean +realclean: + \$(MAKE) -C ../.. realclean_${type}_${name} __E close MINI_MODULE_MAKEFILE; @@ -920,8 +927,13 @@ __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 = ""; @@ -1295,8 +1307,7 @@ install: clean: @all_clean_targets cd docs; \$(MAKE) clean -realclean: clean - find . -name 'autogen_*' -type f -exec rm -f {} \\; +realclean: clean @all_realclean_targets find release debug -type f -exec rm -f {} \\; # and finally a target for rebuilding the build system: -- cgit v1.2.3 From 4c34bf6cd51e3ebe5a6ac21cbdae6b90d9def78e Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 7 Sep 2016 22:34:37 +0100 Subject: Replace most of Appveyor Windows build script with a CMakefile. Should make it easier for Windows developers to get started by automating almost everything. --- infrastructure/cmake/windows/CMakeLists.txt | 89 +++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 infrastructure/cmake/windows/CMakeLists.txt (limited to 'infrastructure') diff --git a/infrastructure/cmake/windows/CMakeLists.txt b/infrastructure/cmake/windows/CMakeLists.txt new file mode 100644 index 00000000..42152714 --- /dev/null +++ b/infrastructure/cmake/windows/CMakeLists.txt @@ -0,0 +1,89 @@ +cmake_minimum_required(VERSION 2.6) + +project(BoxBackup_Windows) + +set(boxbackup_dir ${CMAKE_SOURCE_DIR}/../../..) +set_property(DIRECTORY PROPERTY EP_PREFIX .) +set(install_dir ${CMAKE_BINARY_DIR}/install) + +# Automate the process of downloading, building and "installing" dependencies on Windows, +# as used by AppVeyor. +set(ZLIB_VERSION 1.2.8 CACHE STRING "Version of zlib to download, build, and compile Box Backup against") +set(ZLIB_HASH MD5=126f8676442ffbd97884eb4d6f32afb4 + CACHE STRING "Hash of the zlib download file, to be verified after download") +set(OPENSSL_VERSION 1.0.2h CACHE STRING "Version of OpenSSL to download, build, and compile Box Backup against") +set(OPENSSL_HASH SHA256=1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 + CACHE STRING "Hash of the OpenSSL download file, to be verified after download") +set(PCRE_VERSION 8.38 CACHE STRING "Version of PCRE to download, build, and compile Box Backup against") +set(OPENSSL_HASH SHA256=dbef7cf80258c29396d435804cd5dba34006a77548850bca8bad6db6a6eac110 + CACHE STRING "Hash of the PCRE download file, to be verified after download") + +include(ExternalProject) + +string(REPLACE "." "" zlib_version_nodots ${ZLIB_VERSION}) +ExternalProject_Add(zlib + URL "http://zlib.net/zlib${zlib_version_nodots}.zip" + URL_HASH ${ZLIB_HASH} + DOWNLOAD_NO_PROGRESS 1 + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${install_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. + INSTALL_COMMAND ${CMAKE_COMMAND} --build --target install --config Debug + COMMAND ${CMAKE_COMMAND} --build --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 --prefix=${install_dir} + COMMAND cmd /c ms\\do_ms.bat + # 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 /f ms\\nt.mak + INSTALL_COMMAND nmake /s /f ms\\nt.mak 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 + URL "http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PCRE_VERSION}.zip" + URL_HASH ${PCRE_HASH} + DOWNLOAD_NO_PROGRESS 1 + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${install_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. + INSTALL_COMMAND ${CMAKE_COMMAND} --build --target install --config Debug + COMMAND ${CMAKE_COMMAND} --build --target install --config Release +) + +ExternalProject_Add(boxbackup + DEPENDS zlib openssl pcre + SOURCE_DIR ${boxbackup_dir}/infrastructure/cmake + CMAKE_ARGS -DZLIB_ROOT=${install_dir} -DOPENSSL_ROOT_DIR=${install_dir} -DPCRE_ROOT=${install_dir} -DAPPVEYOR_MODE=1 + STEP_TARGETS configure build install +) -- cgit v1.2.3 From 7de9857420507b192f3628c567c61f4e9b849bed Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 10 Sep 2016 10:13:37 +0100 Subject: Optimisation: for CMake builds, replace generated files only if changed. Speeds up local development by avoiding unnecessary rebuilds when files have not changed. --- infrastructure/cmake/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'infrastructure') diff --git a/infrastructure/cmake/CMakeLists.txt b/infrastructure/cmake/CMakeLists.txt index fa364690..db919939 100644 --- a/infrastructure/cmake/CMakeLists.txt +++ b/infrastructure/cmake/CMakeLists.txt @@ -72,7 +72,10 @@ function(move_file_if_exists source_file dest_file) 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() # Work out the current Box version (requires Perl) and update lib/common/BoxVersion.h, -- cgit v1.2.3 From 353aeedcae698a7b7108846d99da72666a45d043 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 10 Sep 2016 10:15:32 +0100 Subject: Set test timeouts for CMake tests. Should avoid infinite test hangs, especially on Appveyor, where a bad compile (mixed runtimes) or an abort can popup an error message at runtime which hangs the test forever. --- infrastructure/cmake/CMakeLists.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'infrastructure') diff --git a/infrastructure/cmake/CMakeLists.txt b/infrastructure/cmake/CMakeLists.txt index db919939..d4884875 100644 --- a/infrastructure/cmake/CMakeLists.txt +++ b/infrastructure/cmake/CMakeLists.txt @@ -670,3 +670,19 @@ endif(MSVC) 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 4) +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 560) +set_tests_properties(backupstorefix PROPERTIES TIMEOUT 300) +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) -- cgit v1.2.3 From 2f1ddd1ee99f63ce05e3b3573e9a4dbdbbb02436 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 10 Sep 2016 20:54:50 +0100 Subject: Remove old hard-coded MSVC and MinGW configs. Should be replaced by CMake now. --- infrastructure/mingw/compile-boxbackup-cygwin.sh | 57 -- infrastructure/mingw/configure.sh | 45 -- infrastructure/mingw/environment.sh | 11 - infrastructure/mingw/runtest.sh | 7 - infrastructure/msvc/2003/bbackupctl.vcproj | 159 ---- infrastructure/msvc/2003/bbackupd.vcproj | 219 ------ infrastructure/msvc/2003/boxbackup.sln | 57 -- infrastructure/msvc/2003/boxquery.vcproj | 174 ----- infrastructure/msvc/2003/common.vcproj | 672 ----------------- infrastructure/msvc/2003/win32test.vcproj | 148 ---- infrastructure/msvc/2005/bbackupctl.vcproj | 222 ------ infrastructure/msvc/2005/bbackupd.vcproj | 299 -------- infrastructure/msvc/2005/boxbackup.sln | 55 -- infrastructure/msvc/2005/boxbackup.suo | Bin 58880 -> 0 bytes infrastructure/msvc/2005/boxquery.vcproj | 246 ------- infrastructure/msvc/2005/common.vcproj | 896 ----------------------- infrastructure/msvc/2005/win32test.vcproj | 218 ------ infrastructure/msvc/2010/bbackupctl.vcxproj | 109 --- infrastructure/msvc/2010/bbackupd.vcxproj | 139 ---- infrastructure/msvc/2010/bbstoreaccounts.vcxproj | 84 --- infrastructure/msvc/2010/bbstored.vcxproj | 93 --- infrastructure/msvc/2010/boxbackup.sln | 89 --- infrastructure/msvc/2010/boxquery.vcxproj | 123 ---- infrastructure/msvc/2010/common.vcxproj | 249 ------- infrastructure/msvc/2010/libbackupclient.vcxproj | 94 --- infrastructure/msvc/2010/libbackupstore.vcxproj | 151 ---- infrastructure/msvc/2010/qdbm.vcxproj | 81 -- infrastructure/msvc/2010/win32test.vcxproj | 108 --- infrastructure/msvc/2013/bbackupctl.vcxproj | 117 --- infrastructure/msvc/2013/bbackupd.vcxproj | 147 ---- infrastructure/msvc/2013/bbstoreaccounts.vcxproj | 98 --- infrastructure/msvc/2013/bbstored.vcxproj | 109 --- infrastructure/msvc/2013/boxbackup.sln | 89 --- infrastructure/msvc/2013/boxquery.vcxproj | 130 ---- infrastructure/msvc/2013/common.vcxproj | 258 ------- infrastructure/msvc/2013/libbackupclient.vcxproj | 108 --- infrastructure/msvc/2013/libbackupstore.vcxproj | 184 ----- infrastructure/msvc/2013/qdbm.vcxproj | 90 --- infrastructure/msvc/2013/win32test.vcxproj | 115 --- infrastructure/msvc/fake-config.sub.pl | 18 - infrastructure/msvc/getversion.pl | 33 - infrastructure/msvc/win32.bat | 44 -- 42 files changed, 6345 deletions(-) delete mode 100755 infrastructure/mingw/compile-boxbackup-cygwin.sh delete mode 100755 infrastructure/mingw/configure.sh delete mode 100644 infrastructure/mingw/environment.sh delete mode 100755 infrastructure/mingw/runtest.sh delete mode 100644 infrastructure/msvc/2003/bbackupctl.vcproj delete mode 100644 infrastructure/msvc/2003/bbackupd.vcproj delete mode 100644 infrastructure/msvc/2003/boxbackup.sln delete mode 100644 infrastructure/msvc/2003/boxquery.vcproj delete mode 100644 infrastructure/msvc/2003/common.vcproj delete mode 100644 infrastructure/msvc/2003/win32test.vcproj delete mode 100644 infrastructure/msvc/2005/bbackupctl.vcproj delete mode 100644 infrastructure/msvc/2005/bbackupd.vcproj delete mode 100644 infrastructure/msvc/2005/boxbackup.sln delete mode 100644 infrastructure/msvc/2005/boxbackup.suo delete mode 100644 infrastructure/msvc/2005/boxquery.vcproj delete mode 100644 infrastructure/msvc/2005/common.vcproj delete mode 100644 infrastructure/msvc/2005/win32test.vcproj delete mode 100644 infrastructure/msvc/2010/bbackupctl.vcxproj delete mode 100644 infrastructure/msvc/2010/bbackupd.vcxproj delete mode 100644 infrastructure/msvc/2010/bbstoreaccounts.vcxproj delete mode 100644 infrastructure/msvc/2010/bbstored.vcxproj delete mode 100644 infrastructure/msvc/2010/boxbackup.sln delete mode 100644 infrastructure/msvc/2010/boxquery.vcxproj delete mode 100644 infrastructure/msvc/2010/common.vcxproj delete mode 100644 infrastructure/msvc/2010/libbackupclient.vcxproj delete mode 100644 infrastructure/msvc/2010/libbackupstore.vcxproj delete mode 100644 infrastructure/msvc/2010/qdbm.vcxproj delete mode 100644 infrastructure/msvc/2010/win32test.vcxproj delete mode 100644 infrastructure/msvc/2013/bbackupctl.vcxproj delete mode 100644 infrastructure/msvc/2013/bbackupd.vcxproj delete mode 100644 infrastructure/msvc/2013/bbstoreaccounts.vcxproj delete mode 100644 infrastructure/msvc/2013/bbstored.vcxproj delete mode 100644 infrastructure/msvc/2013/boxbackup.sln delete mode 100644 infrastructure/msvc/2013/boxquery.vcxproj delete mode 100644 infrastructure/msvc/2013/common.vcxproj delete mode 100644 infrastructure/msvc/2013/libbackupclient.vcxproj delete mode 100644 infrastructure/msvc/2013/libbackupstore.vcxproj delete mode 100644 infrastructure/msvc/2013/qdbm.vcxproj delete mode 100644 infrastructure/msvc/2013/win32test.vcxproj delete mode 100644 infrastructure/msvc/fake-config.sub.pl delete mode 100755 infrastructure/msvc/getversion.pl delete mode 100644 infrastructure/msvc/win32.bat (limited to 'infrastructure') 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 '' \ -| 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/.*&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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100644 index 534f337c..00000000 Binary files a/infrastructure/msvc/2005/boxbackup.suo and /dev/null differ 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {9FD51412-E945-4457-A17A-CA3C505CF431} - bbackupctl - Win32Proj - - - - Application - MultiByte - true - - - Application - MultiByte - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(ProjectDir)..\..\..\$(Configuration)\ - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - ..\..\..\Release\ - ..\..\..\Release\ - false - - - - Disabled - $(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) - WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - - - true - $(OutDir)bbackupctl.pdb - Console - MachineX86 - - - - - true - $(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) - WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;%(PreprocessorDefinitions) - MultiThreaded - false - - - Level3 - ProgramDatabase - - - 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) - $(OutDir)bbackupctl.exe - %(IgnoreSpecificDefaultLibraries) - true - Console - true - true - MachineX86 - - - - - - - - - - - {a089cee6-ebf0-4232-a0c0-74850a8127a6} - false - - - {32604097-c934-4711-b1ad-206336640e70} - - - - - - \ 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 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {22D325FB-9131-4BD6-B390-968F0491D687} - bbackupd - Win32Proj - - - - Application - MultiByte - true - - - Application - MultiByte - false - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(ProjectDir)..\..\..\$(Configuration)\ - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - true - ..\..\..\Release\ - ..\..\..\Release\ - false - - - - Disabled - $(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) - ENABLE_VSS;WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - - - VssApi.lib;$(OutDir)\libbackupclient.lib;$(OutDir)\libbackupstore.lib;%(AdditionalDependencies) - true - $(OutDir)bbackupd.pdb - Console - MachineX86 - - - - - true - $(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) - WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;%(PreprocessorDefinitions) - MultiThreaded - false - - - Level3 - ProgramDatabase - - - 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) - $(OutDir)bbackupd.exe - %(IgnoreSpecificDefaultLibraries) - true - Console - true - true - MachineX86 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {a089cee6-ebf0-4232-a0c0-74850a8127a6} - false - true - false - true - false - - - {72af22a7-b339-4fdf-b6ae-ca6522d4bb8d} - true - false - false - true - false - - - - - - \ 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 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {C8A1509C-F91B-4140-BD51-B87FF24FB95F} - bbstoreaccounts - - - - Application - true - MultiByte - - - Application - false - true - MultiByte - - - - - - - - - - - - - $(ProjectDir)..\..\..\$(Configuration)\ - - - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - - - - Level3 - Disabled - $(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) - WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions) - MultiThreadedDebug - - - true - - - - - Level3 - MaxSpeed - true - true - - - true - true - true - - - - - - - - {a089cee6-ebf0-4232-a0c0-74850a8127a6} - - - {97d89aef-2be4-4e34-8703-03ba67bf4494} - - - - - - \ 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 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {D8404314-73DD-4270-8205-BE677F8FDAC7} - bbstored - - - - Application - true - MultiByte - - - Application - false - true - MultiByte - - - - - - - - - - - - - $(ProjectDir)..\..\..\$(Configuration)\ - - - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - - - - Level3 - Disabled - WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions) - MultiThreadedDebug - $(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) - - - true - - - - - Level3 - MaxSpeed - true - true - - - true - true - true - - - - - {a089cee6-ebf0-4232-a0c0-74850a8127a6} - - - {97d89aef-2be4-4e34-8703-03ba67bf4494} - - - - - - - - - - - - - - - - - - \ 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 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E} - boxquery - Win32Proj - bbackupquery - - - - Application - MultiByte - true - - - Application - MultiByte - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(ProjectDir)..\..\..\$(Configuration)\ - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - ..\..\..\Release\ - ..\..\..\Release\ - false - - - - Disabled - $(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) - WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - - - true - $(OutDir)boxquery.pdb - Console - MachineX86 - - - - - true - $(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) - WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;PCRE_STATIC;%(PreprocessorDefinitions) - MultiThreaded - false - - - Level3 - ProgramDatabase - - - 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) - $(OutDir)bbackupquery.exe - %(IgnoreSpecificDefaultLibraries) - false - Console - true - true - MachineX86 - - - - - - - - - - - - - - - - - - - - - {a089cee6-ebf0-4232-a0c0-74850a8127a6} - false - - - {32604097-c934-4711-b1ad-206336640e70} - - - {97d89aef-2be4-4e34-8703-03ba67bf4494} - - - - - - \ 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 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {A089CEE6-EBF0-4232-A0C0-74850A8127A6} - common - Win32Proj - - - - StaticLibrary - MultiByte - true - - - StaticLibrary - MultiByte - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(ProjectDir)..\..\..\$(Configuration)\ - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - ..\..\..\Release\ - ..\..\..\Release\ - $(IncludePath) - - - - - Disabled - $(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 - WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - false - EditAndContinue - - - - - - - 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) - - - perl $(ProjectDir)..\getversion.pl - - - Determining Version Number - - - - - true - $(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) - WIN32;BOX_RELEASE_BUILD;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;%(PreprocessorDefinitions) - MultiThreaded - false - - - Level3 - ProgramDatabase - - - $(OutDir)common.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {72af22a7-b339-4fdf-b6ae-ca6522d4bb8d} - - - - - - \ 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 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - - - - - - - - - - - - - - - {97d89aef-2be4-4e34-8703-03ba67bf4494} - - - - {32604097-C934-4711-B1AD-206336640E70} - libbackupstore - - - - StaticLibrary - true - MultiByte - - - Application - false - true - MultiByte - - - - - - - - - - - - - $(ProjectDir)..\..\..\$(Configuration)\ - - - .lib - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - - - - Level3 - Disabled - $(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) - MultiThreadedDebug - WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions) - - - true - 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) - - - - - - Level3 - MaxSpeed - true - true - - - true - true - true - - - - - - \ 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 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {97D89AEF-2BE4-4E34-8703-03BA67BF4494} - libbackupstore - - - - StaticLibrary - true - MultiByte - - - Application - false - true - MultiByte - - - - - - - - - - - - - $(ProjectDir)..\..\..\$(Configuration)\ - - - .lib - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - - - - Level3 - Disabled - $(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) - MultiThreadedDebug - WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions) - - - true - 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) - - - - - - Level3 - MaxSpeed - true - true - - - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {a089cee6-ebf0-4232-a0c0-74850a8127a6} - - - - - - \ 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 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D} - qdbm - - - - StaticLibrary - true - MultiByte - - - Application - false - true - MultiByte - - - - - - - - - - - - - .lib - $(ProjectDir)..\..\..\$(Configuration)\ - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - - - - Level3 - Disabled - false - MultiThreadedDebug - QDBM_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - - - true - - - - - - Level3 - MaxSpeed - true - true - - - true - true - true - - - - - - - - - - - - - - \ 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 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {28C29E72-76A2-4D0C-B35B-12D446733D2E} - win32test - Win32Proj - - - - Application - MultiByte - true - - - Application - MultiByte - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(ProjectDir)..\..\..\$(Configuration)\ - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - ..\..\..\Release\ - ..\..\..\Release\ - false - - - - Disabled - $(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) - WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - - - true - $(OutDir)win32test.pdb - Console - MachineX86 - NotSet - - - - - true - $(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) - WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;%(PreprocessorDefinitions) - MultiThreaded - false - - - Level3 - ProgramDatabase - - - 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) - $(OutDir)win32test.exe - %(IgnoreSpecificDefaultLibraries) - true - Console - true - true - MachineX86 - - - - - - - - - - - - {a089cee6-ebf0-4232-a0c0-74850a8127a6} - false - - - - - - \ 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 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {9FD51412-E945-4457-A17A-CA3C505CF431} - bbackupctl - Win32Proj - - - - Application - MultiByte - true - v120 - - - Application - MultiByte - v120 - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(ProjectDir)..\..\..\$(Configuration)\ - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - $(ProjectDir)..\..\..\$(Configuration)\ - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - false - - - - Disabled - $(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) - WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - 4521 - - - true - $(OutDir)$(TargetName).pdb - Console - MachineX86 - false - $(OutDir)\libbackupclient.lib;$(OutDir)\libbackupstore.lib;VssApi.lib;Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib;%(AdditionalDependencies) - - - - - true - $(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) - WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - 4521 - - - $(OutDir)\libbackupclient.lib;$(OutDir)\libbackupstore.lib;VssApi.lib;Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib;%(AdditionalDependencies) - $(OutDir)bbackupctl.exe - - - true - Console - true - true - MachineX86 - false - - - - - - - - - - - {a089cee6-ebf0-4232-a0c0-74850a8127a6} - false - - - {32604097-c934-4711-b1ad-206336640e70} - - - - - - \ 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 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {22D325FB-9131-4BD6-B390-968F0491D687} - bbackupd - Win32Proj - - - - Application - MultiByte - true - v120 - - - Application - MultiByte - false - v120 - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(ProjectDir)..\..\..\$(Configuration)\ - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - true - $(ProjectDir)..\..\..\$(Configuration)\ - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - false - - - - Disabled - $(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) - ENABLE_VSS;WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - 4521 - - - $(OutDir)\libbackupclient.lib;$(OutDir)\libbackupstore.lib;VssApi.lib;Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib;%(AdditionalDependencies) - true - $(OutDir)$(TargetName).pdb - Console - MachineX86 - false - - - - - true - $(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) - WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - 4521 - - - $(OutDir)\libbackupclient.lib;$(OutDir)\libbackupstore.lib;VssApi.lib;Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib;%(AdditionalDependencies) - $(OutDir)bbackupd.exe - - - true - Console - - - - - MachineX86 - false - - - - - - - - - - - - - - - - - - {a089cee6-ebf0-4232-a0c0-74850a8127a6} - false - true - false - true - false - - - {72af22a7-b339-4fdf-b6ae-ca6522d4bb8d} - true - false - false - true - false - - - - - - - - - - - - - - - - \ 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 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {C8A1509C-F91B-4140-BD51-B87FF24FB95F} - bbstoreaccounts - - - - Application - true - MultiByte - v120 - - - Application - false - true - MultiByte - v120 - - - - - - - - - - - - - $(ProjectDir)..\..\..\$(Configuration)\ - - - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - - - $(ProjectDir)..\..\..\$(Configuration)\ - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - - - - Level3 - Disabled - $(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) - WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions) - MultiThreadedDebug - 4521 - - - true - $(OutDir)\libbackupstore.lib;Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib - - - - - Level3 - MaxSpeed - true - true - $(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) - WIN32;NDEBUG;BOX_RELEASE_BUILD;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions) - MultiThreaded - 4521 - - - true - true - true - $(OutDir)\libbackupstore.lib;Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib - false - - - - - - - - {a089cee6-ebf0-4232-a0c0-74850a8127a6} - - - {97d89aef-2be4-4e34-8703-03ba67bf4494} - - - - - - \ 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 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {D8404314-73DD-4270-8205-BE677F8FDAC7} - bbstored - - - - Application - true - MultiByte - v120 - - - Application - false - true - MultiByte - v120 - - - - - - - - - - - - - $(ProjectDir)..\..\..\$(Configuration)\ - - - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - - - $(ProjectDir)..\..\..\$(Configuration)\ - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - - - - Level3 - Disabled - WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions) - MultiThreadedDebug - $(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) - 4521;4996 - - - true - $(OutDir)\libbackupstore.lib;Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib - - - - - Level3 - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;BOX_RELEASE_BUILD;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions) - $(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) - MultiThreaded - 4521;4996 - - - true - true - true - $(OutDir)\libbackupstore.lib;$(OutDir)\qdbm.lib;Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib - false - - - - - {a089cee6-ebf0-4232-a0c0-74850a8127a6} - - - {97d89aef-2be4-4e34-8703-03ba67bf4494} - - - - - - - - - - - - - - - - - - - - \ 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 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E} - boxquery - Win32Proj - bbackupquery - - - - Application - MultiByte - true - v120 - - - Application - MultiByte - v120 - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(ProjectDir)..\..\..\$(Configuration)\ - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - $(ProjectDir)..\..\..\$(Configuration)\ - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - false - - - - Disabled - $(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) - WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - - - true - $(OutDir)$(TargetName).pdb - Console - MachineX86 - false - Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib;%(AdditionalDependencies) - - - - - true - $(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) - WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;PCRE_STATIC;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - 4521 - - - Ws2_32.lib;Advapi32.lib;User32.lib;Gdi32.lib;%(AdditionalDependencies) - $(OutDir)bbackupquery.exe - - - true - Console - true - true - MachineX86 - false - - - - - - - - - - - - - - - - - - - - - {a089cee6-ebf0-4232-a0c0-74850a8127a6} - false - - - {32604097-c934-4711-b1ad-206336640e70} - - - {97d89aef-2be4-4e34-8703-03ba67bf4494} - - - - - - \ 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 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {A089CEE6-EBF0-4232-A0C0-74850A8127A6} - common - Win32Proj - - - - StaticLibrary - MultiByte - true - v120 - - - StaticLibrary - MultiByte - v120 - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(ProjectDir)..\..\..\$(Configuration)\ - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - $(ProjectDir)..\..\..\$(Configuration)\ - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - $(IncludePath) - - - - - Disabled - $(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 - WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - false - EditAndContinue - 4521 - - - - - - - $(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) - - - perl $(ProjectDir)..\getversion.pl - - - Determining Version Number - - - - - true - $(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) - WIN32;BOX_RELEASE_BUILD;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - 4521 - - - $(OutDir)$(TargetName)$(TargetExt) - $(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) - - - perl $(ProjectDir)..\getversion.pl - Determining Version Number - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {72af22a7-b339-4fdf-b6ae-ca6522d4bb8d} - - - - - - \ 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 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - - - - - - - - - - - - - - - - - - {97d89aef-2be4-4e34-8703-03ba67bf4494} - - - - {32604097-C934-4711-B1AD-206336640E70} - libbackupstore - - - - StaticLibrary - true - MultiByte - v120 - - - StaticLibrary - false - true - MultiByte - v120 - - - - - - - - - - - - - $(ProjectDir)..\..\..\$(Configuration)\ - - - .lib - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - - - $(ProjectDir)..\..\..\$(Configuration)\ - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - - - - Level3 - Disabled - $(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) - MultiThreadedDebug - WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions) - 4521 - - - true - 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) - - - - - - Level3 - MaxSpeed - true - true - $(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) - WIN32;NDEBUG;BOX_RELEASE_BUILD;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions) - 4521 - MultiThreaded - - - true - true - true - - - - - - \ 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 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {97D89AEF-2BE4-4E34-8703-03BA67BF4494} - libbackupstore - - - - StaticLibrary - true - MultiByte - v120 - - - StaticLibrary - false - true - MultiByte - v120 - - - - - - - - - - - - - $(ProjectDir)..\..\..\$(Configuration)\ - - - .lib - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - - - $(ProjectDir)..\..\..\$(Configuration)\ - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - - - - Level3 - Disabled - $(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) - MultiThreadedDebug - WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions) - 4521 - - - true - 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) - - - - - - Level3 - MaxSpeed - true - true - $(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) - WIN32;NDEBUG;BOX_RELEASE_BUILD;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions) - 4521 - MultiThreaded - - - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {a089cee6-ebf0-4232-a0c0-74850a8127a6} - - - - - - \ 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 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D} - qdbm - - - - StaticLibrary - true - MultiByte - v120 - - - StaticLibrary - false - true - MultiByte - v120 - - - - - - - - - - - - - .lib - $(ProjectDir)..\..\..\$(Configuration)\ - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - - - $(ProjectDir)..\..\..\$(Configuration)\ - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - - - - Level3 - Disabled - false - MultiThreadedDebug - QDBM_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - - - true - - - - - - Level3 - MaxSpeed - true - true - 4996 - MultiThreaded - false - - - true - true - true - - - - - - - - - - - - - - \ 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 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {28C29E72-76A2-4D0C-B35B-12D446733D2E} - win32test - Win32Proj - - - - Application - MultiByte - true - v120 - - - Application - MultiByte - v120 - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(ProjectDir)..\..\..\$(Configuration)\ - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - $(ProjectDir)..\..\..\$(Configuration)\ - $(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\ - false - - - - Disabled - $(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) - WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;QDBM_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - 4521 - - - true - $(OutDir)$(TargetName).pdb - Console - MachineX86 - NotSet - false - 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) - - - - - true - $(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) - WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level3 - ProgramDatabase - - - 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) - $(OutDir)$(TargetName)$(TargetExt) - - - true - Console - true - true - MachineX86 - false - - - - - - - - - - - - {a089cee6-ebf0-4232-a0c0-74850a8127a6} - false - - - - - - \ 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 = ; - 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 -- cgit v1.2.3 From 091519cf5f628c79c9af08189f71bd60af924d60 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 19 Sep 2016 23:54:38 +0100 Subject: Reduce test timeout for testbackupstorefix. The longer timeout should not be necessary as it runs in 35 seconds on my VM. --- infrastructure/cmake/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'infrastructure') diff --git a/infrastructure/cmake/CMakeLists.txt b/infrastructure/cmake/CMakeLists.txt index d4884875..22c21553 100644 --- a/infrastructure/cmake/CMakeLists.txt +++ b/infrastructure/cmake/CMakeLists.txt @@ -680,7 +680,7 @@ 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 560) -set_tests_properties(backupstorefix PROPERTIES TIMEOUT 300) +set_tests_properties(backupstorefix PROPERTIES TIMEOUT 140) set_tests_properties(backupstorepatch PROPERTIES TIMEOUT 320) set_tests_properties(backupdiff PROPERTIES TIMEOUT 32) set_tests_properties(bbackupd PROPERTIES TIMEOUT 1200) -- cgit v1.2.3 From 85ab71011214a66f274626caa3b09e588e620aae Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 20 Sep 2016 22:04:34 +0100 Subject: Detect whether -Werror=return-type is supported by compiler. Fixes compilation on CentOS 5. --- infrastructure/m4/boxbackup_tests.m4 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'infrastructure') diff --git a/infrastructure/m4/boxbackup_tests.m4 b/infrastructure/m4/boxbackup_tests.m4 index 0c1e2107..c7838a7f 100644 --- a/infrastructure/m4/boxbackup_tests.m4 +++ b/infrastructure/m4/boxbackup_tests.m4 @@ -12,7 +12,19 @@ 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']) + CXXFLAGS_STRICT='-Wall -Wundef' + + # Check whether gcc accepts -Werror=return-type, and if so add it to CXXFLAGS_STRICT + my_save_cflags="$CXXFLAGS" + CXXFLAGS="-Werror=return-type" + AC_MSG_CHECKING([whether $CXX accepts $CXXFLAGS]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], + [AC_MSG_RESULT([yes])] + [CXXFLAGS_STRICT="$CXXFLAGS_STRICT $CXXFLAGS"], + [AC_MSG_RESULT([no])] + ) + CXXFLAGS="$my_save_cflags" + AC_SUBST([CXXFLAGS_STRICT]) # 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. -- cgit v1.2.3 From 65a8cf6577d36ad419f7313800a6fbaf93aaa097 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 29 Sep 2016 19:40:17 +0100 Subject: Fix line endings of .vcxproj.user files to CRLF always. --- infrastructure/cmake/msvc/bin_bbackupd.vcxproj.user | 14 +++++++------- infrastructure/cmake/msvc/bin_bbstored.vcxproj.user | 14 +++++++------- infrastructure/cmake/msvc/test_backupstore.vcxproj.user | 16 ++++++++-------- .../cmake/msvc/test_backupstorefix.vcxproj.user | 12 ++++++------ infrastructure/cmake/msvc/test_bbackupd.vcxproj.user | 14 +++++++------- infrastructure/cmake/msvc/test_common.vcxproj.user | 12 ++++++------ infrastructure/cmake/msvc/test_httpserver.vcxproj.user | 12 ++++++------ infrastructure/cmake/msvc/test_raidfile.vcxproj.user | 12 ++++++------ 8 files changed, 53 insertions(+), 53 deletions(-) (limited to 'infrastructure') diff --git a/infrastructure/cmake/msvc/bin_bbackupd.vcxproj.user b/infrastructure/cmake/msvc/bin_bbackupd.vcxproj.user index 51928554..fa1f3d34 100755 --- a/infrastructure/cmake/msvc/bin_bbackupd.vcxproj.user +++ b/infrastructure/cmake/msvc/bin_bbackupd.vcxproj.user @@ -1,8 +1,8 @@ - - - - testfiles\bbackupd.conf - $(ProjectDir)\..\..\..\debug\test\bbackupd - WindowsLocalDebugger - + + + + testfiles\bbackupd.conf + $(ProjectDir)\..\..\..\debug\test\bbackupd + WindowsLocalDebugger + \ No newline at end of file diff --git a/infrastructure/cmake/msvc/bin_bbstored.vcxproj.user b/infrastructure/cmake/msvc/bin_bbstored.vcxproj.user index e48b8383..339cddee 100755 --- a/infrastructure/cmake/msvc/bin_bbstored.vcxproj.user +++ b/infrastructure/cmake/msvc/bin_bbstored.vcxproj.user @@ -1,8 +1,8 @@ - - - - testfiles/bbstored.conf - $(ProjectDir)\..\..\..\debug\test\backupstorefix - WindowsLocalDebugger - + + + + testfiles/bbstored.conf + $(ProjectDir)\..\..\..\debug\test\backupstorefix + WindowsLocalDebugger + \ No newline at end of file diff --git a/infrastructure/cmake/msvc/test_backupstore.vcxproj.user b/infrastructure/cmake/msvc/test_backupstore.vcxproj.user index 79ef7571..7d7b3158 100755 --- a/infrastructure/cmake/msvc/test_backupstore.vcxproj.user +++ b/infrastructure/cmake/msvc/test_backupstore.vcxproj.user @@ -1,9 +1,9 @@ - - - - $(ProjectDir)\..\..\..\debug\test\backupstore - WindowsLocalDebugger - - - + + + + $(ProjectDir)\..\..\..\debug\test\backupstore + WindowsLocalDebugger + + + \ No newline at end of file diff --git a/infrastructure/cmake/msvc/test_backupstorefix.vcxproj.user b/infrastructure/cmake/msvc/test_backupstorefix.vcxproj.user index c0895191..170fb496 100755 --- a/infrastructure/cmake/msvc/test_backupstorefix.vcxproj.user +++ b/infrastructure/cmake/msvc/test_backupstorefix.vcxproj.user @@ -1,7 +1,7 @@ - - - - $(ProjectDir)\..\..\..\debug\test\backupstorefix - WindowsLocalDebugger - + + + + $(ProjectDir)\..\..\..\debug\test\backupstorefix + WindowsLocalDebugger + \ No newline at end of file diff --git a/infrastructure/cmake/msvc/test_bbackupd.vcxproj.user b/infrastructure/cmake/msvc/test_bbackupd.vcxproj.user index 9ca2b5e9..ebf8c6a3 100755 --- a/infrastructure/cmake/msvc/test_bbackupd.vcxproj.user +++ b/infrastructure/cmake/msvc/test_bbackupd.vcxproj.user @@ -1,8 +1,8 @@ - - - - -e test_basics - $(ProjectDir)\..\..\..\debug\test\bbackupd - WindowsLocalDebugger - + + + + -e test_basics + $(ProjectDir)\..\..\..\debug\test\bbackupd + WindowsLocalDebugger + \ No newline at end of file diff --git a/infrastructure/cmake/msvc/test_common.vcxproj.user b/infrastructure/cmake/msvc/test_common.vcxproj.user index 7a375f10..e5854a80 100755 --- a/infrastructure/cmake/msvc/test_common.vcxproj.user +++ b/infrastructure/cmake/msvc/test_common.vcxproj.user @@ -1,7 +1,7 @@ - - - - $(ProjectDir)\..\..\..\debug\test\common - WindowsLocalDebugger - + + + + $(ProjectDir)\..\..\..\debug\test\common + WindowsLocalDebugger + \ No newline at end of file diff --git a/infrastructure/cmake/msvc/test_httpserver.vcxproj.user b/infrastructure/cmake/msvc/test_httpserver.vcxproj.user index b2da015c..ac1512a8 100755 --- a/infrastructure/cmake/msvc/test_httpserver.vcxproj.user +++ b/infrastructure/cmake/msvc/test_httpserver.vcxproj.user @@ -1,7 +1,7 @@ - - - - $(ProjectDir)\..\..\..\debug\test\httpserver - WindowsLocalDebugger - + + + + $(ProjectDir)\..\..\..\debug\test\httpserver + WindowsLocalDebugger + \ No newline at end of file diff --git a/infrastructure/cmake/msvc/test_raidfile.vcxproj.user b/infrastructure/cmake/msvc/test_raidfile.vcxproj.user index d2c2fc34..620aa4bb 100755 --- a/infrastructure/cmake/msvc/test_raidfile.vcxproj.user +++ b/infrastructure/cmake/msvc/test_raidfile.vcxproj.user @@ -1,7 +1,7 @@ - - - - $(ProjectDir)\..\..\..\debug\test\raidfile - WindowsLocalDebugger - + + + + $(ProjectDir)\..\..\..\debug\test\raidfile + WindowsLocalDebugger + \ No newline at end of file -- cgit v1.2.3