You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by om...@apache.org on 2016/06/02 22:34:04 UTC
orc git commit: ORC-62 Clean up for orc-1.1.0 release.
Repository: orc
Updated Branches:
refs/heads/master 2307ae10f -> 6d49bed4c
ORC-62 Clean up for orc-1.1.0 release.
Fixes #33
Signed-off-by: Owen O'Malley <om...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/orc/repo
Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/6d49bed4
Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/6d49bed4
Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/6d49bed4
Branch: refs/heads/master
Commit: 6d49bed4c07f2fb8f0b57a3e793b6d2652e7ddeb
Parents: 2307ae1
Author: Owen O'Malley <om...@apache.org>
Authored: Thu Jun 2 14:51:33 2016 -0700
Committer: Owen O'Malley <om...@apache.org>
Committed: Thu Jun 2 15:11:49 2016 -0700
----------------------------------------------------------------------
.travis.yml | 18 ------------------
CMakeLists.txt | 13 +++++++++++--
README.md | 44 +++++++++++++++++++++++++++++++++++++-------
appveyor.yml | 9 ---------
4 files changed, 48 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/orc/blob/6d49bed4/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index eeb1bfa..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-language: cpp
-compiler:
- - gcc
- - clang
-before_install:
- - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- - sudo apt-get -qq update
- - sudo apt-get -qq install g++-4.8
-install:
- - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi
-before_script:
- - mkdir build
- - cd build
- - cmake ..
- - make
-script:
- - env TZ=America/Los_Angeles c++/test/test-orc
- - env TZ=America/Los_Angeles tools-c++/test/tool-test
http://git-wip-us.apache.org/repos/asf/orc/blob/6d49bed4/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index be4bed2..ec9da0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,14 @@ SET(CPACK_PACKAGE_VERSION_MINOR "1")
SET(CPACK_PACKAGE_VERSION_PATCH "0")
SET(ORC_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+# Make sure that a build type is selected
+if (NOT CMAKE_BUILD_TYPE)
+ message(STATUS "No build type seelcted, default to ReleaseWithDebugInfo")
+ set (CMAKE_BUILD_TYPE "RELWITHDEBINFO")
+else ()
+ message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
+endif ()
+
# Set the package format
SET(CPACK_GENERATOR "TGZ")
@@ -56,8 +64,10 @@ set (ZLIB_LIBRARIES zlib)
#
# Compiler specific flags
#
+set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
- set (CMAKE_CXX_FLAGS "-g -O2")
set (CXX11_FLAGS "-std=c++11")
set (WARN_FLAGS "-Weverything -Wno-c++98-compat -Wno-missing-prototypes")
set (WARN_FLAGS "${WARN_FLAGS} -Wno-c++98-compat-pedantic -Wno-padded")
@@ -65,7 +75,6 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set (WARN_FLAGS "${WARN_FLAGS} -Wno-missing-noreturn -Wno-unknown-pragmas")
set (WARN_FLAGS "${WARN_FLAGS} -Wconversion -Werror")
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
- set (CMAKE_CXX_FLAGS "-g -O2")
set (WARN_FLAGS "-Wall -Wno-unknown-pragmas -Wconversion -Werror")
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.3")
set (CXX11_FLAGS "")
http://git-wip-us.apache.org/repos/asf/orc/blob/6d49bed4/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 7711d4e..2ea9a88 100644
--- a/README.md
+++ b/README.md
@@ -13,18 +13,21 @@ narrow the search to a particular set of 10,000 rows. ORC supports the
complete set of types in Hive, including the complex types: structs,
lists, maps, and unions.
-## ORC File C++ Library
+## ORC File Library
-This library allows C++ programs to read and write the
-_Optimized Row Columnar_ (ORC) file format.
-
-[![Build Status](https://travis-ci.org/hortonworks/orc.svg?branch=c%2B%2B)](https://travis-ci.org/hortonworks/orc)
-[![Build status](https://ci.appveyor.com/api/projects/status/6aoqt6c860rf6ad4/branch/c++?svg=true)](https://ci.appveyor.com/project/thanhdowisc/orc/branch/c++)
+This project includes both a Java library for reading and writing and
+a C++ library for reading the _Optimized Row Columnar_ (ORC) file
+format. The C++ and Java libraries are completely independent of each
+other and will each read all versions of ORC files.
### Building
+* Install java 1.7 or higher
+* Install maven 3 or higher
+* Install cmake
+
+To build a release version with debug information:
```shell
--To compile:
% mkdir build
% cd build
% cmake ..
@@ -32,3 +35,30 @@ _Optimized Row Columnar_ (ORC) file format.
% make test-out
```
+
+To build a debug version:
+```shell
+% mkdir build
+% cd build
+% cmake .. -DCMAKE_BUILD_TYPE=DEBUG
+% make package
+% make test-out
+
+```
+
+To build a release version without debug information:
+```shell
+% mkdir build
+% cd build
+% cmake .. -DCMAKE_BUILD_TYPE=RELEASE
+% make package
+% make test-out
+
+```
+
+To build only the Java library:
+```shell
+% cd java
+% mvn package
+
+```
http://git-wip-us.apache.org/repos/asf/orc/blob/6d49bed4/appveyor.yml
----------------------------------------------------------------------
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index d44aba6..0000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-version: 1.0.{build}
-branches:
- only:
- - c++
-build_script:
-- mkdir _vc10
-- cd _vc10
-- cmake -DCMAKE_MAKE_PROGRAM=C:/Windows/Microsoft.NET/Framework/v4.0.30319/MSBuild.exe -DC09=true -G "Visual Studio 10" ..
-- cmake --build .