Merge branch 'master' of github.com:kentonv/capnproto

CMakeLists.txt

+project("Cap'n Proto" CXX)
+cmake_minimum_required(VERSION 2.8)
+
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+
+add_subdirectory(c++)

c++/CMakeLists.txt

-project(Private)
-cmake_minimum_required(VERSION 2.8)
 
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+option(BUILD_TOOLS "Build command-line tools and compiler." ON)
+option(BUILD_TESTING "Build unit tests and enable CTest 'check' target." ON)
+option(EXTERNAL_CAPNP "Use the system capnp binary, or the one specified in $CAPNP, instead of using the compiled one." OFF)
 
-set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-parameter -std=c++11")
-
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/gtest" AND IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/gtest")
-  add_subdirectory(gtest)
-  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/gtest/include)
-else()
-  message(FATAL_ERROR "Please use setup-cmake.sh to download gtest before running the cmake build")
+if (NOT BUILD_TOOLS AND BUILD_TESTING AND NOT EXTERNAL_CAPNP)
+  message(WARNING "Forcing BUILD_TOOLS to ON; required by BUILD_TESTING without EXTERNAL_CAPNP.")
+  set(BUILD_TOOLS TRUE)
 endif()
 
-include(CTest)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter -std=c++11 -pthread")
 
 add_subdirectory(src)

c++/setup-cmake.sh

-#! /usr/bin/env bash
-
-set -euo pipefail
-
-if [ ! -e gtest ]; then
-  echo "================================================================================"
-  echo "Fetching Google Test code..."
-  echo "================================================================================"
-  svn checkout http://googletest.googlecode.com/svn/tags/release-1.7.0 gtest
-fi
-
-echo "================================================================================"
-echo "Done"
-echo "================================================================================"
-echo
-echo "Ready to run cmake (no support for installing yet).  For example:"
-echo "  mkdir build && cd build && cmake .. -G 'Unix Makefiles' && make -j6 check"

c++/src/kj/debug.c++

@@ -25,6 +25,10 @@
 #include <string.h>
 #include <errno.h>
 
+#if _WIN32
+#define strerror_r(errno,buf,len) strerror_s(buf,len,errno)
+#endif
+
 namespace kj {
 namespace _ {  // private
 

c++/src/kj/debug.h

@@ -110,6 +110,11 @@
 #include "string.h"
 #include "exception.h"
 
+#ifdef ERROR
+// This is problematic because windows.h #defines ERROR, which we use in an enum here.
+#error "Make sure to to undefine ERROR (or just #include <kj/windows-sanity.h>) before this file"
+#endif
+
 namespace kj {
 
 #define KJ_LOG(severity, ...) \

c++/src/kj/exception.c++

@@ -83,7 +83,7 @@ String getStackSymbols(ArrayPtr<void* const> trace) {
 #elif __APPLE__
   // The Mac OS X equivalent of addr2line is atos.
   // (Internally, it uses the private CoreSymbolication.framework library.)
-  p = popen(str("atos -d -p ", getpid(), ' ', strArray(trace, " ")).cStr(), "r");
+  p = popen(str("xcrun atos -p ", getpid(), ' ', strArray(trace, " ")).cStr(), "r");
 #endif
 
   if (p == nullptr) {

c++/src/kj/main.c++

@@ -28,7 +28,13 @@
 #include <unistd.h>
 #include <errno.h>
 #include <limits.h>
+
+#if _WIN32
+#include <windows.h>
+#include <io.h>
+#else
 #include <sys/uio.h>
+#endif
 
 namespace kj {
 
@@ -60,12 +66,53 @@ void TopLevelProcessContext::exit() {
 static void writeLineToFd(int fd, StringPtr message) {
   // Write the given message to the given file descriptor with a trailing newline iff the message
   // is non-empty and doesn't already have a trailing newline.  We use writev() to do this in a
-  // single system call without any copying.
+  // single system call without any copying (OS permitting).
 
   if (message.size() == 0) {
     return;
   }
 
+#if _WIN32
+  KJ_STACK_ARRAY(char, newlineExpansionBuffer, 2 * (message.size() + 1), 128, 512);
+  char* p = newlineExpansionBuffer.begin();
+  for(char ch : message) {
+    if(ch == '\n') {
+      *(p++) = '\r';
+    }
+    *(p++) = ch;
+  }
+  if(!message.endsWith("\n")) {
+    *(p++) = '\r';
+    *(p++) = '\n';
+  }
+
+  size_t newlineExpandedSize = p - newlineExpansionBuffer.begin();
+
+  KJ_ASSERT(newlineExpandedSize <= newlineExpansionBuffer.size());
+
+  HANDLE handle = reinterpret_cast<HANDLE>(_get_osfhandle(fd));
+  DWORD consoleMode;
+  bool redirectedToFile = !GetConsoleMode(handle, &consoleMode);
+
+  DWORD writtenSize;
+  if(redirectedToFile) {
+    WriteFile(handle, newlineExpansionBuffer.begin(), newlineExpandedSize, &writtenSize, nullptr);
+  } else {
+    KJ_STACK_ARRAY(wchar_t, buffer, newlineExpandedSize, 128, 512);
+
+    size_t finalSize = MultiByteToWideChar(
+      CP_UTF8,
+      0,
+      newlineExpansionBuffer.begin(),
+      newlineExpandedSize,
+      buffer.begin(),
+      buffer.size());
+
+    KJ_ASSERT(finalSize <= buffer.size());
+
+    WriteConsoleW(handle, buffer.begin(), finalSize, &writtenSize, nullptr);
+  }
+#else
   // Unfortunately the writev interface requires non-const pointers even though it won't modify
   // the data.
   struct iovec vec[2];
@@ -109,6 +156,7 @@ static void writeLineToFd(int fd, StringPtr message) {
       }
     }
   }
+#endif
 }
 
 void TopLevelProcessContext::warning(StringPtr message) {

c++/src/kj/windows-sanity.h

+// Copyright (c) 2013-2014 Sandstorm Development Group, Inc. and contributors
+// Licensed under the MIT License:
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#ifndef KJ_WINDOWS_SANITY_H_
+#define KJ_WINDOWS_SANITY_H_
+
+#ifndef _INC_WINDOWS
+#error "windows.h needs to be included before kj/windows-sanity.h (or perhaps you don't need either?)"
+#endif
+
+namespace win32 {
+  const auto ERROR_ = ERROR;
+#undef ERROR
+  const auto ERROR = ERROR_;
+}
+
+using win32::ERROR;
+
+#endif  // KJ_WINDOWS_SANITY_H_

cmake/FindCapnProto.cmake

+#
+# Finds the Cap'n Proto libraries, and compiles schema files.
+#
+# Configuration variables (optional):
+#   CAPNPC_OUTPUT_DIR
+#       Directory to place compiled schema sources (default: the same directory as the schema file).
+#   CAPNPC_IMPORT_DIRS
+#       List of additional include directories for the schema compiler.
+#       (CMAKE_CURRENT_SOURCE_DIR and CAPNP_INCLUDE_DIRS are always included.)
+#   CAPNPC_SRC_PREFIX
+#       Schema file source prefix (default: CMAKE_CURRENT_SOURCE_DIR).
+#   CAPNPC_FLAGS
+#       Additional flags to pass to the schema compiler.
+#
+# Variables that are discovered:
+#   CAPNP_EXECUTABLE
+#       Path to the `capnp` tool (can be set to override).
+#   CAPNPC_CXX_EXECUTABLE
+#       Path to the `capnpc-c++` tool (can be set to override).
+#   CAPNP_INCLUDE_DIRS
+#       Include directories for the library's headers (can be set to override).
+#   CAPNP_LIBRARIES
+#       The necessary library paths to link with.
+#   CAPNP_FOUND
+#       Set if the libraries have been located.
+#
+# Example usage:
+#
+#   find_package(CapnProto REQUIRED)
+#   include_directories(${CAPNP_INCLUDE_DIRS})
+#
+#   capnp_generate_cpp(CAPNP_SRCS CAPNP_HDRS schema.capnp)
+#   add_executable(a a.cc ${CAPNP_SRCS} ${CAPNP_HDRS})
+#   target_link_library(a ${CAPNP_LIBRARIES})
+#
+# For out-of-source builds:
+#
+#   set(CAPNPC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
+#   include_directories(${CAPNPC_OUTPUT_DIR})
+#   capnp_generate_cpp(...)
+#
+
+function(CAPNP_GENERATE_CPP SOURCES HEADERS)
+  if(NOT ARGN)
+    message(SEND_ERROR "CAPNP_GENERATE_CPP() called without any source files.")
+  endif()
+  if(NOT CAPNP_EXECUTABLE)
+    message(SEND_ERROR "Could not locate capnp executable (CAPNP_EXECUTABLE).")
+  endif()
+  if(NOT CAPNPC_CXX_EXECUTABLE)
+    message(SEND_ERROR "Could not locate capnpc-c++ executable (CAPNPC_CXX_EXECUTABLE).")
+  endif()
+  if(NOT CAPNP_INCLUDE_DIRS)
+    message(SEND_ERROR "Could not locate capnp header files (CAPNP_INCLUDE_DIRS).")
+  endif()
+
+  # Default compiler includes
+  set(include_path -I ${CMAKE_CURRENT_SOURCE_DIR} -I ${CAPNP_INCLUDE_DIRS})
+
+  if(DEFINED CAPNPC_IMPORT_DIRS)
+    # Append each directory as a series of '-I' flags in ${include_path}
+    foreach(directory ${CAPNPC_IMPORT_DIRS})
+      get_filename_component(absolute_path ${directory} ABSOLUTE)
+      list(APPEND include_path -I ${absolute_path})
+    endforeach()
+  endif()
+
+  if(DEFINED CAPNPC_OUTPUT_DIR)
+    # Prepend a ':' to get the format for the '-o' flag right
+    set(output_dir ":${CAPNPC_OUTPUT_DIR}")
+  else()
+    set(output_dir)
+  endif()
+
+  if(NOT DEFINED CAPNPC_SRC_PREFIX)
+    set(CAPNPC_SRC_PREFIX ${CMAKE_CURRENT_SOURCE_DIR})
+  endif()
+  get_filename_component(CAPNPC_SRC_PREFIX ${CAPNPC_SRC_PREFIX} ABSOLUTE)
+
+  set(${SOURCES})
+  set(${HEADERS})
+  foreach(schema_file ${ARGN})
+    get_filename_component(file_path ${schema_file} ABSOLUTE)
+    get_filename_component(file_dir ${file_path} DIRECTORY)
+
+    # Figure out where the output files will go
+    if (NOT DEFINED CAPNPC_OUTPUT_DIR)
+      set(output_base ${file_path})
+    else()
+      # Output files are placed in CAPNPC_OUTPUT_DIR, at a location as if they were
+      # relative to CAPNPC_SRC_PREFIX.
+      string(LENGTH ${CAPNPC_SRC_PREFIX} prefix_len)
+      string(SUBSTRING ${file_path} 0 ${prefix_len} output_prefix)
+      if(NOT ${CAPNPC_SRC_PREFIX} STREQUAL ${output_prefix})
+        message(SEND_ERROR "Could not determine output path for '${schema_file}' ('${file_path}') with source prefix '${CAPNPC_SRC_PREFIX}' into '${CAPNPC_OUTPUT_DIR}'.")
+      endif()
+
+      string(SUBSTRING ${file_path} ${prefix_len} -1 output_path)
+      set(output_base ${CAPNPC_OUTPUT_DIR}${output_path})
+    endif()
+
+    add_custom_command(
+      OUTPUT "${output_base}.c++" "${output_base}.h"
+      COMMAND ${CAPNP_EXECUTABLE}
+      ARGS compile 
+          -o ${CAPNPC_CXX_EXECUTABLE}${output_dir}
+          --src-prefix ${CAPNPC_SRC_PREFIX}
+          ${include_path}
+          ${CAPNPC_FLAGS}
+          ${file_path}
+      DEPENDS ${schema_file}
+      COMMENT "Compiling Cap'n Proto schema ${schema_file}"
+      VERBATIM
+    )
+    list(APPEND ${SOURCES} "${output_base}.c++")
+    list(APPEND ${HEADERS} "${output_base}.h")
+  endforeach()
+
+  set_source_files_properties(${${SOURCES}} ${${HEADERS}} PROPERTIES GENERATED TRUE)
+  set(${SOURCES} ${${SOURCES}} PARENT_SCOPE)
+  set(${HEADERS} ${${HEADERS}} PARENT_SCOPE)
+endfunction()
+
+find_library(CAPNP_LIB_KJ kj)
+find_library(CAPNP_LIB_KJ-ASYNC kj-async)
+find_library(CAPNP_LIB_CAPNP capnp)
+find_library(CAPNP_LIB_CAPNP-RPC capnp-rpc)
+find_library(CAPNP_LIB_CAPNPC capnpc)
+mark_as_advanced(CAPNP_LIB_KJ CAPNP_LIB_KJ-ASYNC CAPNP_LIB_CAPNP CAPNP_LIB_CAPNP-RPC CAPNP_LIB_CAPNPC)
+set(CAPNP_LIBRARIES
+  ${CAPNP_LIB_KJ}
+  ${CAPNP_LIB_KJ-ASYNC}
+  ${CAPNP_LIB_CAPNP}
+  ${CAPNP_LIB_CAPNP-RPC}
+  ${CAPNP_LIB_CAPNPC}
+)
+
+find_path(CAPNP_INCLUDE_DIRS capnp/generated-header-support.h)
+
+find_program(CAPNP_EXECUTABLE
+  NAMES capnp
+  DOC "Cap'n Proto Command-line Tool"
+)
+
+find_program(CAPNPC_CXX_EXECUTABLE
+  NAMES capnpc-c++
+  DOC "Capn'n Proto C++ Compiler"
+)
+