Convert tabs to spaces

master
Karl Hobley 8 years ago
parent 59ddbe55bd
commit 108c9cdf61
  1. 2
      rocksdb-sys/Makefile
  2. 136
      rocksdb-sys/build.rs
  3. 4
      rocksdb-sys/snappy-stubs-public.h

@ -1,6 +1,6 @@
include rocksdb/src.mk include rocksdb/src.mk
rocksdb_lib_sources.txt: rocksdb/src.mk rocksdb_lib_sources.txt: rocksdb/src.mk
@echo -n ${LIB_SOURCES} > rocksdb_lib_sources.txt @echo -n ${LIB_SOURCES} > rocksdb_lib_sources.txt
gen_lib_sources: rocksdb_lib_sources.txt gen_lib_sources: rocksdb_lib_sources.txt

@ -14,45 +14,45 @@ fn link(name: &str, bundled: bool) {
} }
fn build_rocksdb() { fn build_rocksdb() {
let mut config = gcc::Config::new(); let mut config = gcc::Config::new();
config.include("rocksdb/include/"); config.include("rocksdb/include/");
config.include("rocksdb/"); config.include("rocksdb/");
config.include("rocksdb/third-party/gtest-1.7.0/fused-src/"); config.include("rocksdb/third-party/gtest-1.7.0/fused-src/");
config.include("snappy/"); config.include("snappy/");
config.include("."); config.include(".");
config.define("NDEBUG", Some("1")); config.define("NDEBUG", Some("1"));
config.define("SNAPPY", Some("1")); config.define("SNAPPY", Some("1"));
let mut lib_sources = include_str!("rocksdb_lib_sources.txt").split(" ").collect::<Vec<&'static str>>(); let mut lib_sources = include_str!("rocksdb_lib_sources.txt").split(" ").collect::<Vec<&'static str>>();
// We have a pregenerated a version of build_version.cc in the local directory // We have a pregenerated a version of build_version.cc in the local directory
lib_sources = lib_sources.iter().cloned().filter(|file| { lib_sources = lib_sources.iter().cloned().filter(|file| {
*file != "util/build_version.cc" *file != "util/build_version.cc"
}) })
.collect::<Vec<&'static str>>(); .collect::<Vec<&'static str>>();
if cfg!(target_os = "macos") { if cfg!(target_os = "macos") {
config.define("OS_MACOSX", Some("1")); config.define("OS_MACOSX", Some("1"));
config.define("ROCKSDB_PLATFORM_POSIX", Some("1")); config.define("ROCKSDB_PLATFORM_POSIX", Some("1"));
config.define("ROCKSDB_LIB_IO_POSIX", Some("1")); config.define("ROCKSDB_LIB_IO_POSIX", Some("1"));
} }
if cfg!(target_os = "linux") { if cfg!(target_os = "linux") {
config.define("OS_LINUX", Some("1")); config.define("OS_LINUX", Some("1"));
config.define("ROCKSDB_PLATFORM_POSIX", Some("1")); config.define("ROCKSDB_PLATFORM_POSIX", Some("1"));
config.define("ROCKSDB_LIB_IO_POSIX", Some("1")); config.define("ROCKSDB_LIB_IO_POSIX", Some("1"));
//COMMON_FLAGS="$COMMON_FLAGS -fno-builtin-memcmp" //COMMON_FLAGS="$COMMON_FLAGS -fno-builtin-memcmp"
} }
if cfg!(target_os = "freebsd") { if cfg!(target_os = "freebsd") {
config.define("OS_FREEBSD", Some("1")); config.define("OS_FREEBSD", Some("1"));
config.define("ROCKSDB_PLATFORM_POSIX", Some("1")); config.define("ROCKSDB_PLATFORM_POSIX", Some("1"));
config.define("ROCKSDB_LIB_IO_POSIX", Some("1")); config.define("ROCKSDB_LIB_IO_POSIX", Some("1"));
} }
if cfg!(windows) { if cfg!(windows) {
link("rpcrt4", false); link("rpcrt4", false);
config.define("OS_WIN", Some("1")); config.define("OS_WIN", Some("1"));
// Remove POSIX-specific sources // Remove POSIX-specific sources
lib_sources = lib_sources.iter().cloned().filter(|file| { lib_sources = lib_sources.iter().cloned().filter(|file| {
@ -66,51 +66,51 @@ fn build_rocksdb() {
.collect::<Vec<&'static str>>(); .collect::<Vec<&'static str>>();
// Add Windows-specific sources // Add Windows-specific sources
lib_sources.push("port/win/port_win.cc"); lib_sources.push("port/win/port_win.cc");
lib_sources.push("port/win/env_win.cc"); lib_sources.push("port/win/env_win.cc");
lib_sources.push("port/win/env_default.cc"); lib_sources.push("port/win/env_default.cc");
lib_sources.push("port/win/win_logger.cc"); lib_sources.push("port/win/win_logger.cc");
lib_sources.push("port/win/io_win.cc"); lib_sources.push("port/win/io_win.cc");
} }
if cfg!(target_env = "msvc") { if cfg!(target_env = "msvc") {
config.flag("-EHsc"); config.flag("-EHsc");
} else { } else {
config.flag("-std=c++11"); config.flag("-std=c++11");
} }
for file in lib_sources { for file in lib_sources {
let file = "rocksdb/".to_string() + file; let file = "rocksdb/".to_string() + file;
config.file(&file); config.file(&file);
} }
config.file("build_version.cc"); config.file("build_version.cc");
config.cpp(true); config.cpp(true);
config.compile("librocksdb.a"); config.compile("librocksdb.a");
} }
fn build_snappy() { fn build_snappy() {
let mut config = gcc::Config::new(); let mut config = gcc::Config::new();
config.include("snappy/"); config.include("snappy/");
config.include("."); config.include(".");
config.define("NDEBUG", Some("1")); config.define("NDEBUG", Some("1"));
if cfg!(target_env = "msvc") { if cfg!(target_env = "msvc") {
config.flag("-EHsc"); config.flag("-EHsc");
} else { } else {
config.flag("-std=c++11"); config.flag("-std=c++11");
} }
config.file("snappy/snappy.cc"); config.file("snappy/snappy.cc");
config.file("snappy/snappy-sinksource.cc"); config.file("snappy/snappy-sinksource.cc");
config.file("snappy/snappy-c.cc"); config.file("snappy/snappy-c.cc");
config.cpp(true); config.cpp(true);
config.compile("libsnappy.a"); config.compile("libsnappy.a");
} }
fn main() { fn main() {
build_rocksdb(); build_rocksdb();
build_snappy(); build_snappy();
} }

@ -88,8 +88,8 @@ typedef std::string string;
// Windows does not have an iovec type, yet the concept is universally useful. // Windows does not have an iovec type, yet the concept is universally useful.
// It is simple to define it ourselves, so we put it inside our own namespace. // It is simple to define it ourselves, so we put it inside our own namespace.
struct iovec { struct iovec {
void* iov_base; void* iov_base;
size_t iov_len; size_t iov_len;
}; };
} // namespace snappy } // namespace snappy

Loading…
Cancel
Save